[KYUUBI #7708][SERVER] Reconcile zero-count metadata updates #7709
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,7 +34,7 @@ import com.zaxxer.hikari.{HikariConfig, HikariDataSource} | |
| import org.apache.kyuubi.{KyuubiException, Logging, Utils} | ||
| import org.apache.kyuubi.config.KyuubiConf | ||
| import org.apache.kyuubi.operation.OperationState | ||
| import org.apache.kyuubi.server.metadata.{MetadataRowNotFoundException, MetadataStore, MetadataUpdateMismatchException} | ||
| import org.apache.kyuubi.server.metadata.api.{KubernetesEngineInfo, Metadata, MetadataFilter} | ||
| import org.apache.kyuubi.server.metadata.jdbc.DatabaseType._ | ||
| import org.apache.kyuubi.server.metadata.jdbc.JDBCMetadataStoreConf._ | ||
|
|
@@ -332,76 +332,97 @@ class JDBCMetadataStore(conf: KyuubiConf) extends MetadataStore with Logging { | |
|
|
||
| override def updateMetadata(metadata: Metadata): Unit = { | ||
| val queryBuilder = new StringBuilder | ||
| val updateFields = ListBuffer[(String, Any)]() | ||
|
|
||
| queryBuilder.append(s"UPDATE $METADATA_TABLE") | ||
| Option(metadata.kyuubiInstance).foreach { _ => | ||
| updateFields += (("kyuubi_instance", metadata.kyuubiInstance)) | ||
| } | ||
| Option(metadata.state).foreach { _ => | ||
| updateFields += (("state", metadata.state)) | ||
| } | ||
| Option(metadata.requestConf).filter(_.nonEmpty).foreach { _ => | ||
| updateFields += (("request_conf", valueAsString(metadata.requestConf))) | ||
| } | ||
| metadata.clusterManager.foreach { cm => | ||
| updateFields += (("cluster_manager", cm)) | ||
| } | ||
| if (metadata.endTime > 0) { | ||
| updateFields += (("end_time", metadata.endTime)) | ||
| } | ||
| if (metadata.engineOpenTime > 0) { | ||
| updateFields += (("engine_open_time", metadata.engineOpenTime)) | ||
| } | ||
| Option(metadata.engineId).foreach { _ => | ||
| updateFields += (("engine_id", metadata.engineId)) | ||
| } | ||
| Option(metadata.engineName).foreach { _ => | ||
| updateFields += (("engine_name", metadata.engineName)) | ||
| } | ||
| Option(metadata.engineUrl).foreach { _ => | ||
| updateFields += (("engine_url", metadata.engineUrl)) | ||
| } | ||
| Option(metadata.engineState).foreach { _ => | ||
| updateFields += (("engine_state", metadata.engineState)) | ||
| } | ||
| metadata.engineError.foreach { error => | ||
| updateFields += (("engine_error", error)) | ||
| } | ||
| if (metadata.peerInstanceClosed) { | ||
| updateFields += (("peer_instance_closed", metadata.peerInstanceClosed)) | ||
| } | ||
| if (updateFields.nonEmpty) { | ||
| queryBuilder.append(updateFields.map { case (column, _) => | ||
| s"$column = ?" | ||
| }.mkString(" SET ", ", ", "")) | ||
| } | ||
| queryBuilder.append(" WHERE identifier = ?") | ||
| val params = updateFields.map(_._2) :+ metadata.identifier | ||
|
|
||
| val query = queryBuilder.toString() | ||
| JdbcUtils.withConnection { connection => | ||
| withUpdateCount(connection, query, params.toSeq: _*) { updateCount => | ||
| if (updateCount == 0) { | ||
| verifyMetadataUpdatePostcondition(connection, metadata.identifier, updateFields.toSeq) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private def verifyMetadataUpdatePostcondition( | ||
|
Member
There was a problem hiding this comment. Since #7708 says the original cause of the zero update count is still under investigation, please log a |
||
| connection: Connection, | ||
| identifier: String, | ||
| updateFields: Seq[(String, Any)]): Unit = { | ||
| val query = s"SELECT ${updateFields.map(_._1).mkString(", ")} " + | ||
| s"FROM $METADATA_TABLE WHERE identifier = ?" | ||
| withResultSet(connection, query, identifier) { resultSet => | ||
| if (!resultSet.next()) { | ||
| throw new MetadataRowNotFoundException(identifier) | ||
| } | ||
|
|
||
| val mismatchedColumns = updateFields.zipWithIndex.collect { | ||
| case ((column, expected), index) | ||
| if getResultSetValue(resultSet, index + 1, expected) != expected => column | ||
| } | ||
| if (mismatchedColumns.nonEmpty) { | ||
| throw new MetadataUpdateMismatchException(identifier, mismatchedColumns) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private def getResultSetValue(resultSet: ResultSet, index: Int, expected: Any): Any = { | ||
| val value = expected match { | ||
| case _: String => resultSet.getString(index) | ||
| case _: Int => resultSet.getInt(index) | ||
| case _: Long => resultSet.getLong(index) | ||
| case _: Double => resultSet.getDouble(index) | ||
| case _: Float => resultSet.getFloat(index) | ||
| case _: Boolean => resultSet.getBoolean(index) | ||
| case _ => resultSet.getObject(index) | ||
| } | ||
| if (resultSet.wasNull()) null else value | ||
| } | ||
|
|
||
| override def cleanupMetadataByIdentifier(identifier: String): Unit = { | ||
| val query = s"DELETE FROM $METADATA_TABLE WHERE identifier = ?" | ||
| JdbcUtils.withConnection { connection => | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit: consider including expected vs actual values in the message, not just column names. When the discard is logged in
MetadataManager, that makes the error actionable without reproducing the DB state.