You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hudi.apache.org by vi...@apache.org on 2021/02/23 16:06:21 UTC
[hudi] branch master updated: [MINOR] Ensure directory exists
before listing all marker files. (#2594)
This is an automated email from the ASF dual-hosted git repository.
vinoth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hudi.git
The following commit(s) were added to refs/heads/master by this push:
new d2f360f [MINOR] Ensure directory exists before listing all marker files. (#2594)
d2f360f is described below
commit d2f360f5dd80ff7f85a18225d68d684f071cc734
Author: Prashant Wason <pw...@uber.com>
AuthorDate: Tue Feb 23 08:05:59 2021 -0800
[MINOR] Ensure directory exists before listing all marker files. (#2594)
---
.../src/main/java/org/apache/hudi/table/MarkerFiles.java | 10 ++++++----
.../src/test/java/org/apache/hudi/table/TestMarkerFiles.java | 1 +
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/MarkerFiles.java b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/MarkerFiles.java
index 3611245..40be741 100644
--- a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/MarkerFiles.java
+++ b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/MarkerFiles.java
@@ -166,10 +166,12 @@ public class MarkerFiles implements Serializable {
public List<String> allMarkerFilePaths() throws IOException {
List<String> markerFiles = new ArrayList<>();
- FSUtils.processFiles(fs, markerDirPath.toString(), fileStatus -> {
- markerFiles.add(stripMarkerFolderPrefix(fileStatus.getPath().toString()));
- return true;
- }, false);
+ if (doesMarkerDirExist()) {
+ FSUtils.processFiles(fs, markerDirPath.toString(), fileStatus -> {
+ markerFiles.add(stripMarkerFolderPrefix(fileStatus.getPath().toString()));
+ return true;
+ }, false);
+ }
return markerFiles;
}
diff --git a/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/table/TestMarkerFiles.java b/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/table/TestMarkerFiles.java
index b25427b..b854abc 100644
--- a/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/table/TestMarkerFiles.java
+++ b/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/table/TestMarkerFiles.java
@@ -119,6 +119,7 @@ public class TestMarkerFiles extends HoodieCommonTestHarness {
public void testDeletionWhenMarkerDirNotExists() throws IOException {
// then
assertFalse(markerFiles.doesMarkerDirExist());
+ assertTrue(markerFiles.allMarkerFilePaths().isEmpty());
assertFalse(markerFiles.deleteMarkerDir(context, 2));
}