Skip to content

[HUDI-1584] Modify maker file path, which should start with the target base path. #2539

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

Merged
yanghua merged 5 commits into from
Mar 2, 2021
Merged

[HUDI-1584] Modify maker file path, which should start with the target base path. #2539

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3400577
Modify maker file path, which should start with the target base path.
Feb 5, 2021
c6d3f71
Fix checkstyle.
Feb 5, 2021
158f245
Modify function name generateCurrentMakerPath() to generateCurrentMak…
Feb 7, 2021
4ac5d19
Modify function name generateCurrentMakerPath() to generateCurrentMak…
Feb 7, 2021
4339a60
Empty commit to trigger the CI.
Feb 8, 2021
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
13 changes: 11 additions & 2 deletions hudi-flink/src/main/java/org/apache/hudi/operator/InstantGenerateOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ public void open() throws Exception {
public void prepareSnapshotPreBarrier(long checkpointId) throws Exception {
super.prepareSnapshotPreBarrier(checkpointId);
String instantMarkerFileName = String.format("%d%s%d%s%d", indexOfThisSubtask, DELIMITER, checkpointId, DELIMITER, recordCounter.get());
Path path = new Path(new Path(HoodieTableMetaClient.AUXILIARYFOLDER_NAME, INSTANT_MARKER_FOLDER_NAME), instantMarkerFileName);
Path path = generateCurrentMakerFilePath(instantMarkerFileName);
// create marker file
fs.create(path, true);
LOG.info("Subtask [{}] at checkpoint [{}] created marker file [{}]", indexOfThisSubtask, checkpointId, instantMarkerFileName);
Expand Down Expand Up @@ -245,7 +245,7 @@ public void close() throws Exception {
private boolean checkReceivedData(long checkpointId) throws InterruptedException, IOException {
int numberOfParallelSubtasks = runtimeContext.getNumberOfParallelSubtasks();
FileStatus[] fileStatuses;
Path instantMarkerPath = new Path(HoodieTableMetaClient.AUXILIARYFOLDER_NAME, INSTANT_MARKER_FOLDER_NAME);
Path instantMarkerPath = generateCurrentMakerDirPath();
// waiting all subtask create marker file ready
while (true) {
Thread.sleep(500L);
Expand Down Expand Up @@ -297,4 +297,13 @@ private void cleanMarkerDir(Path instantMarkerFolder) throws IOException {
fs.delete(fileStatus.getPath(), true);
}
}

private Path generateCurrentMakerDirPath() {
Copy link
Member

@vinothchandar vinothchandar Mar 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we have a typo. Maker -> Marker? :) @Zhangchaoming

Path auxPath = new Path(cfg.targetBasePath, HoodieTableMetaClient.AUXILIARYFOLDER_NAME);
return new Path(auxPath, INSTANT_MARKER_FOLDER_NAME);
}

private Path generateCurrentMakerFilePath(String instantMarkerFileName) {
return new Path(generateCurrentMakerDirPath(), instantMarkerFileName);
}
}