Skip to content

[HUDI-6548] Two log compaction instants can be scheduled at the same time #9246

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
lokeshj1703 wants to merge 2 commits into from
Closed

[HUDI-6548] Two log compaction instants can be scheduled at the same time #9246

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
136d780
[HUDI-6548] Two log compaction instants can be scheduled at the same …
lokeshj1703 Jul 20, 2023
c2effa1
Revert change from non relevant API
lokeshj1703 Jul 25, 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
35 changes: 35 additions & 0 deletions ...src/test/java/org/apache/hudi/client/functional/TestHoodieClientOnMergeOnReadStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,41 @@ public void testLogCompactionOnMORTableWithoutBaseFile() throws Exception {
hadoopConf, Arrays.asList(HoodieTestDataGenerator.DEFAULT_FIRST_PARTITION_PATH));
}

/**
* Test scheduling log-compaction twice. It should only create generate one plan for log compaction in the timeline.
*/
@Test
public void testSchedulingLogCompactionTwice() throws Exception {
HoodieCompactionConfig compactionConfig = HoodieCompactionConfig.newBuilder()
.withMaxNumDeltaCommitsBeforeCompaction(1)
.withLogCompactionBlocksThreshold(1)
.build();
HoodieWriteConfig config = getConfigBuilder(HoodieTestDataGenerator.TRIP_EXAMPLE_SCHEMA,
HoodieIndex.IndexType.INMEMORY).withAutoCommit(true).withCompactionConfig(compactionConfig).build();
SparkRDDWriteClient client = getHoodieWriteClient(config);

// First insert
String newCommitTime = HoodieActiveTimeline.createNewInstantTime();
insertBatch(config, client, newCommitTime, "000", 100,
SparkRDDWriteClient::insert, false, false, 100, 100,
1, Option.empty());

String prevCommitTime = newCommitTime;
// Upsert
newCommitTime = HoodieActiveTimeline.createNewInstantTime();
updateBatch(config, client, newCommitTime, prevCommitTime,
Option.of(Arrays.asList(prevCommitTime)), "000", 50, SparkRDDWriteClient::upsert,
false, false, 50, 100, 2, config.populateMetaFields());

// Schedule log compaction
Option<String> logCompactionTimeStamp = client.scheduleLogCompaction(Option.empty());
assertTrue(logCompactionTimeStamp.isPresent());

// Try scheduling log compaction, it won't succeed.
Option<String> logCompactionTimeStamp2 = client.scheduleLogCompaction(Option.empty());
assertFalse(logCompactionTimeStamp2.isPresent());
}

/**
* Test scheduling log-compaction right after scheduling compaction. This should fail.
*/
Expand Down
3 changes: 2 additions & 1 deletion hudi-common/src/main/java/org/apache/hudi/common/table/timeline/HoodieDefaultTimeline.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,8 @@ public HoodieTimeline filterCompletedInstants() {
@Override
public HoodieTimeline filterCompletedAndCompactionInstants() {
return new HoodieDefaultTimeline(getInstantsAsStream().filter(s -> s.isCompleted()
|| s.getAction().equals(HoodieTimeline.COMPACTION_ACTION)), details);
|| s.getAction().equals(HoodieTimeline.COMPACTION_ACTION)
|| s.getAction().equals(HoodieTimeline.LOG_COMPACTION_ACTION)), details);
}

@Override
Expand Down