Skip to content

Handle flint index corruption #1153

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

Draft
noCharger wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Handle flint index corruption #1153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions ...mmons/src/main/scala/org/opensearch/flint/common/metadata/log/FlintMetadataLogEntry.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ object FlintMetadataLogEntry {
val FAILED: IndexState.Value = Value("failed")
val RECOVERING: IndexState.Value = Value("recovering")
val VACUUMING: IndexState.Value = Value("vacuuming")
val CORRUPTED: IndexState.Value = Value("corrupted")
val UNKNOWN: IndexState.Value = Value("unknown")

def from(s: String): IndexState.Value = {
Expand Down
29 changes: 23 additions & 6 deletions ...-integration/src/main/scala/org/opensearch/flint/spark/FlintSparkTransactionSupport.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@
package org.opensearch.flint.spark

import org.opensearch.flint.common.metadata.log.{FlintMetadataLogService, OptimisticTransaction}
import org.opensearch.flint.common.metadata.log.FlintMetadataLogEntry.IndexState.{CREATING, EMPTY, VACUUMING}
import org.opensearch.flint.common.metadata.log.FlintMetadataLogEntry.IndexState.{CORRUPTED, CREATING, EMPTY, VACUUMING}
import org.opensearch.flint.common.metadata.log.OptimisticTransaction.NO_LOG_ENTRY
import org.opensearch.flint.core.FlintClient
import org.opensearch.flint.spark.scheduler.FlintSparkJobSchedulingService

import org.apache.spark.internal.Logging

Expand Down Expand Up @@ -111,10 +112,26 @@ trait FlintSparkTransactionSupport extends Logging {
}

private def cleanupCorruptedIndex(indexName: String): Unit = {
flintMetadataLogService
.startTransaction(indexName)
.initialLog(_ => true)
.finalLog(_ => NO_LOG_ENTRY)
.commit(_ => {})
val logEntry = flintMetadataLogService
.getIndexMetadataLog(indexName)
.flatMap(_.getLatest)

if (logEntry.isPresent && logEntry.get().state == CORRUPTED) {
// If already in CORRUPTED state (logically corrupted), purge the log entry
flintMetadataLogService
.startTransaction(indexName)
.initialLog(_ => true)
.finalLog(_ => NO_LOG_ENTRY)
.commit(_ => {})
logInfo(s"Purged log entry for logically corrupted index: $indexName")
} else {
// If not already in CORRUPTED state (physically corrupted), update to CORRUPTED'
flintMetadataLogService
.startTransaction(indexName)
.initialLog(_ => true)
.finalLog(latest => latest.copy(state = CORRUPTED))
.commit(_ => {})
logInfo(s"Marked physically corrupted index as CORRUPTED: $indexName")
}
}
}
Loading