-
Notifications
You must be signed in to change notification settings - Fork 37
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 3.1.1 copy missing data #101
Closed
Rumbles
wants to merge
4
commits into
scylladb:spark-3.1.1
from
intenthq:spark-3.1.1-copyMissingData
Closed
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -139,10 +139,63 @@ object Validator { | |
|
||
val failures = runValidation(migratorConfig) | ||
|
||
if (failures.isEmpty) log.info("No comparison failures found - enjoy your day!") | ||
else { | ||
if (failures.isEmpty) { | ||
log.info("No comparison failures found - enjoy your day!") | ||
} else { | ||
log.error("Found the following comparison failures:") | ||
log.error(failures.mkString("\n")) | ||
|
||
// Copy missing data here based on the discrepancies found | ||
copyMissingData(migratorConfig, failures) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. since this doesn't partition it will work only for small / tiny amount of rows |
||
} | ||
} | ||
|
||
// Additional function to copy missing data | ||
|
||
def copyMissingData(config: MigratorConfig, failures: List[RowComparisonFailure])( | ||
implicit spark: SparkSession): Unit = { | ||
|
||
val log = LogManager.getLogger("com.scylladb.migrator") | ||
val sourceSettings = config.source.asInstanceOf[SourceSettings.Cassandra] | ||
val targetSettings = config.target.asInstanceOf[TargetSettings.Scylla] | ||
val retryMaxAttempts = 5 | ||
val retryBackoff = 10.seconds | ||
|
||
val retryPolicy = RetryPolicy() | ||
.withBackoff(retryBackoff) | ||
.withMaxRetries(retryMaxAttempts) | ||
.onRetry { | ||
case (_, _, e) => | ||
log.warn(s"Retrying due to error: ${e.getMessage}") | ||
} | ||
|
||
for (failure <- failures) { | ||
val keyColumns = failure.primaryKeyColumns // Assuming this holds the key column names | ||
|
||
val sourceRows = spark.sparkContext | ||
.cassandraTable(sourceSettings.keyspace, sourceSettings.table) | ||
.select(keyColumns: _*) | ||
.where(failure.primaryKeyFilter) // Assuming this holds the filter conditions for the missing rows | ||
|
||
Try { | ||
sourceRows.foreachPartition { partition => | ||
val retryableInsert = RetryableInsert.retryableInsert( | ||
Rumbles marked this conversation as resolved.
Show resolved
Hide resolved
|
||
partition, | ||
targetSettings.keyspace, | ||
targetSettings.table, | ||
targetSettings.columns.map(_.columnName), | ||
retryPolicy, | ||
log | ||
) | ||
|
||
retryableInsert.run() | ||
} | ||
} match { | ||
case Success(_) => | ||
log.info(s"Copied missing data for primary key: ${failure.primaryKeyValues.mkString(", ")}") | ||
case Failure(e) => | ||
log.error(s"Failed to copy missing data for primary key: ${failure.primaryKeyValues.mkString(", ")}", e) | ||
} | ||
} | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
don't forget that
config.validation.failuresToFetch
will limit above failures
so figuring out proper https://github.com/scylladb/scylla-migrator/blob/master/config.yaml.example#L217 is the limit for this list