Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SPARK-38678][TESTS][FOLLOWUP] Enable RocksDB tests in AppStatusStoreSuite and StreamingQueryStatusListenerSuite on Apple Silicon on MacOS #36156

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,6 @@ class AppStatusStoreSuite extends SparkFunSuite {
if (live) {
return AppStatusStore.createLiveStore(conf)
}
// LevelDB doesn't support Apple Silicon yet
if (Utils.isMacOnAppleSilicon && disk) {
return null
}

val store: KVStore = if (disk) {
conf.set(HYBRID_STORE_DISK_BACKEND, diskStoreType.toString)
Expand All @@ -106,12 +102,22 @@ class AppStatusStoreSuite extends SparkFunSuite {
new AppStatusStore(store)
}

Seq(
"disk leveldb" -> createAppStore(disk = true, HybridStoreDiskBackend.LEVELDB, live = false),
"disk rocksdb" -> createAppStore(disk = true, HybridStoreDiskBackend.ROCKSDB, live = false),
"in memory" -> createAppStore(disk = false, live = false),
"in memory live" -> createAppStore(disk = false, live = true)
).foreach { case (hint, appStore) =>
private val cases = {
val baseCases = Seq(
"disk rocksdb" -> createAppStore(disk = true, HybridStoreDiskBackend.ROCKSDB, live = false),
"in memory" -> createAppStore(disk = false, live = false),
"in memory live" -> createAppStore(disk = false, live = true)
)
if (Utils.isMacOnAppleSilicon) {
baseCases
} else {
Seq(
"disk leveldb" -> createAppStore(disk = true, HybridStoreDiskBackend.LEVELDB, live = false)
) ++ baseCases
}
}

cases.foreach { case (hint, appStore) =>
test(s"SPARK-26260: summary should contain only successful tasks' metrics (store = $hint)") {
assume(appStore != null)
val store = appStore.store
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,6 @@ class StreamingQueryStatusListenerSuite extends StreamTest {
}

test("SPARK-38056: test writing StreamingQueryData to a RocksDB store") {
assume(!Utils.isMacOnAppleSilicon)
val conf = new SparkConf()
.set(HYBRID_STORE_DISK_BACKEND, HybridStoreDiskBackend.ROCKSDB.toString)
val testDir = Utils.createTempDir()
Expand Down