From 6d63529da3e8cd1c0dbc9f2cd1e3a91a90eb1c41 Mon Sep 17 00:00:00 2001 From: Anish Shrigondekar Date: Sun, 14 Jan 2024 11:24:59 +0530 Subject: [PATCH 1/2] [SPARK-46711] Fix RocksDB state provider race condition during rollback --- .../org/apache/spark/sql/execution/streaming/state/RocksDB.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/state/RocksDB.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/state/RocksDB.scala index 101a9e6b9199..0284d4c9d303 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/state/RocksDB.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/state/RocksDB.scala @@ -452,6 +452,7 @@ class RocksDB( * Drop uncommitted changes, and roll back to previous version. */ def rollback(): Unit = { + acquire() numKeysOnWritingVersion = numKeysOnLoadedVersion loadedVersion = -1L changelogWriter.foreach(_.abort()) From 9148ddc8565983151deeeaa412c1cd502fbd9eb7 Mon Sep 17 00:00:00 2001 From: Anish Shrigondekar Date: Sun, 14 Jan 2024 11:41:16 +0530 Subject: [PATCH 2/2] Empty-Commit