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

[HUDI-7656] Fix a flaky test for concurrent writes #12655

Merged
merged 2 commits into from
Jan 22, 2025
Merged

[HUDI-7656] Fix a flaky test for concurrent writes #12655

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15901e2
Fix a concurrency bug
linliu-code Jan 16, 2025
4e19952
Address comments
linliu-code Jan 17, 2025
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: 13 additions & 5 deletions ...k-datasource/hudi-spark/src/test/scala/org/apache/hudi/functional/TestCOWDataSource.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,8 +669,11 @@ class TestCOWDataSource extends HoodieSparkClientTestBase with ScalaAssertionSup
assertEquals(1000, snapshotDF1.count())

val countDownLatch = new CountDownLatch(2)
val sharedUpdates = recordsToStrings(dataGen.generateUpdatesForAllRecords("300")).asScala.toList

for (x <- 1 to 2) {
val thread = new Thread(new UpdateThread(dataGen, spark, CommonOptionUtils.commonOpts, basePath, x + "00", countDownLatch, numRetries))
val thread = new Thread(new UpdateThread(
dataGen, spark, CommonOptionUtils.commonOpts, basePath, x + "00", countDownLatch, numRetries, sharedUpdates))
thread.setName(x + "00_THREAD")
thread.start()
}
Expand All @@ -687,12 +690,17 @@ class TestCOWDataSource extends HoodieSparkClientTestBase with ScalaAssertionSup
}
}

class UpdateThread(dataGen: HoodieTestDataGenerator, spark: SparkSession, commonOpts: Map[String, String], basePath: String,
instantTime: String, countDownLatch: CountDownLatch, numRetries: Integer = 0) extends Runnable {
class UpdateThread(dataGen: HoodieTestDataGenerator,
spark: SparkSession,
commonOpts: Map[String, String],
basePath: String,
instantTime: String,
countDownLatch: CountDownLatch,
numRetries: Integer = 0,
sharedUpdates: List[String]) extends Runnable {
override def run() {
val updateRecs = recordsToStrings(dataGen.generateUniqueUpdates(instantTime, 500)).asScala.toList
val insertRecs = recordsToStrings(dataGen.generateInserts(instantTime, 1000)).asScala.toList
val updateDf = spark.read.json(spark.sparkContext.parallelize(updateRecs, 2))
val updateDf = spark.read.json(spark.sparkContext.parallelize(sharedUpdates, 2))
val insertDf = spark.read.json(spark.sparkContext.parallelize(insertRecs, 2))
try {
updateDf.union(insertDf).write.format("org.apache.hudi")
Expand Down
Loading