Skip to content

[SPARK-40424][CORE][TESTS] Refactor ChromeUIHistoryServerSuite to add UTs for RocksDB #37878

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.

Sign up for GitHub

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

Closed
LuciferYang wants to merge 3 commits into from
Closed

[SPARK-40424][CORE][TESTS] Refactor ChromeUIHistoryServerSuite to add UTs for RocksDB #37878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a6732ce
support test rocksdb
LuciferYang Sep 14, 2022
52d9ba4
Merge branch 'upmaster' into SPARK-40424
LuciferYang Sep 15, 2022
c457b1d
Rename to RocksDBBackendChromeUIHistoryServerSuite
dongjoon-hyun Sep 19, 2022
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
18 changes: 15 additions & 3 deletions core/src/test/scala/org/apache/spark/deploy/history/ChromeUIHistoryServerSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,14 @@ package org.apache.spark.deploy.history
import org.openqa.selenium.WebDriver
import org.openqa.selenium.chrome.{ChromeDriver, ChromeOptions}

import org.apache.spark.tags.ChromeUITest
import org.apache.spark.internal.config.History.HybridStoreDiskBackend
import org.apache.spark.tags.{ChromeUITest, ExtendedLevelDBTest}


/**
* Tests for HistoryServer with Chrome.
*/
@ChromeUITest
class ChromeUIHistoryServerSuite
abstract class ChromeUIHistoryServerSuite
extends RealBrowserUIHistoryServerSuite("webdriver.chrome.driver") {

override var webDriver: WebDriver = _
Expand All @@ -48,3 +49,14 @@ class ChromeUIHistoryServerSuite
}
}
}

@ChromeUITest
@ExtendedLevelDBTest
class LevelDBBackendChromeUIHistoryServerSuite extends ChromeUIHistoryServerSuite {
override protected def diskBackend: HybridStoreDiskBackend.Value = HybridStoreDiskBackend.LEVELDB
}

@ChromeUITest
class RocksDBBackendChromeUIHistoryServerSuite extends ChromeUIHistoryServerSuite {
override protected def diskBackend: HybridStoreDiskBackend.Value = HybridStoreDiskBackend.ROCKSDB
}
5 changes: 4 additions & 1 deletion core/src/test/scala/org/apache/spark/deploy/history/RealBrowserUIHistoryServerSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import org.scalatestplus.selenium.WebBrowser

import org.apache.spark._
import org.apache.spark.internal.config.{EVENT_LOG_STAGE_EXECUTOR_METRICS, EXECUTOR_PROCESS_TREE_METRICS_ENABLED}
import org.apache.spark.internal.config.History.{HISTORY_LOG_DIR, LOCAL_STORE_DIR, UPDATE_INTERVAL_S}
import org.apache.spark.internal.config.History.{HISTORY_LOG_DIR, HYBRID_STORE_DISK_BACKEND, HybridStoreDiskBackend, LOCAL_STORE_DIR, UPDATE_INTERVAL_S}
import org.apache.spark.internal.config.Tests.IS_TESTING
import org.apache.spark.util.{ResetSystemProperties, Utils}

Expand All @@ -48,6 +48,8 @@ abstract class RealBrowserUIHistoryServerSuite(val driverProp: String)
private var server: HistoryServer = null
private var port: Int = -1

protected def diskBackend: HybridStoreDiskBackend.Value

override def beforeAll(): Unit = {
super.beforeAll()
assume(
Expand Down Expand Up @@ -79,6 +81,7 @@ abstract class RealBrowserUIHistoryServerSuite(val driverProp: String)
.set(LOCAL_STORE_DIR, storeDir.getAbsolutePath())
.set(EVENT_LOG_STAGE_EXECUTOR_METRICS, true)
.set(EXECUTOR_PROCESS_TREE_METRICS_ENABLED, true)
.set(HYBRID_STORE_DISK_BACKEND, diskBackend.toString)
conf.setAll(extraConf)
provider = new FsHistoryProvider(conf)
provider.checkForLogs()
Expand Down