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.

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

Terminate refreshing job when delete index #8

Merged
merged 2 commits into from
Jul 28, 2023
Merged

Terminate refreshing job when delete index #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32ffe9b
Stop streaming job when delete index
dai-chen Jul 14, 2023
daeb545
Refactor stop job method
dai-chen Jul 17, 2023
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
11 changes: 10 additions & 1 deletion flint-spark-integration/src/main/scala/org/opensearch/flint/spark/FlintSpark.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import org.apache.spark.sql.flint.FlintDataSourceV2.FLINT_DATASOURCE
import org.apache.spark.sql.flint.config.FlintSparkConf
import org.apache.spark.sql.flint.config.FlintSparkConf.{DOC_ID_COLUMN_NAME, IGNORE_DOC_ID_COLUMN}
import org.apache.spark.sql.streaming.OutputMode.Append
import org.apache.spark.sql.streaming.StreamingQuery

/**
* Flint Spark integration API entrypoint.
Expand Down Expand Up @@ -144,7 +145,7 @@ class FlintSpark(val spark: SparkSession) {
}

/**
* Delete index.
* Delete index and refreshing job associated.
*
* @param indexName
* index name
Expand All @@ -154,6 +155,7 @@ class FlintSpark(val spark: SparkSession) {
def deleteIndex(indexName: String): Boolean = {
if (flintClient.exists(indexName)) {
flintClient.deleteIndex(indexName)
stopRefreshingJob(indexName)
true
} else {
false
Expand All @@ -163,6 +165,13 @@ class FlintSpark(val spark: SparkSession) {
private def isIncrementalRefreshing(indexName: String): Boolean =
spark.streams.active.exists(_.name == indexName)

private def stopRefreshingJob(indexName: String): Unit = {
val job = spark.streams.active.find(_.name == indexName)
if (job.isDefined) {
job.get.stop()
}
}

// TODO: Remove all parsing logic below once Flint spec finalized and FlintMetadata strong typed
private def getSourceTableName(index: FlintSparkIndex): String = {
val json = parse(index.metadata().getContent)
Expand Down
6 changes: 0 additions & 6 deletions integ-test/src/test/scala/org/opensearch/flint/spark/FlintSparkSkippingIndexITSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,6 @@ class FlintSparkSkippingIndexITSuite

// Delete all test indices
flint.deleteIndex(testIndex)

// Stop all streaming jobs if any
spark.streams.active.foreach { job =>
job.stop()
job.awaitTermination()
}
}

test("create skipping index with metadata successfully") {
Expand Down