This is an automated email from the ASF dual-hosted git repository. danny0405 pushed a commit to branch release-0.10.0 in repository https://gitbox.apache.org/repos/asf/hudi.git
commit e8de211f5331c47b81b633992e33c9387098832d Author: Sivabalan Narayanan <[email protected]> AuthorDate: Sun Nov 28 20:11:50 2021 -0500 [MINOR] Fixing integ test suite for hudi-aws and archival validation (#4142) (cherry picked from commit 52aae36b53e22bd7dab8c024ca64f40a1ade13be) --- .../dag/nodes/ValidateAsyncOperations.java | 26 +++++++++------------- packaging/hudi-integ-test-bundle/pom.xml | 1 + 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/dag/nodes/ValidateAsyncOperations.java b/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/dag/nodes/ValidateAsyncOperations.java index c94b5de..a7c3245 100644 --- a/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/dag/nodes/ValidateAsyncOperations.java +++ b/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/dag/nodes/ValidateAsyncOperations.java @@ -84,29 +84,25 @@ public class ValidateAsyncOperations extends DagNode<Option<String>> { String metadataPath = executionContext.getHoodieTestSuiteWriter().getCfg().targetBasePath + "/.hoodie"; FileStatus[] metaFileStatuses = fs.listStatus(new Path(metadataPath)); - boolean archFound = false; boolean cleanFound = false; for (FileStatus fileStatus : metaFileStatuses) { - Matcher archFileMatcher = ARCHIVE_FILE_PATTERN.matcher(fileStatus.getPath().getName()); - if (archFileMatcher.matches()) { - archFound = true; - if (config.validateArchival() && !config.validateClean()) { - break; - } - } Matcher cleanFileMatcher = CLEAN_FILE_PATTERN.matcher(fileStatus.getPath().getName()); if (cleanFileMatcher.matches()) { cleanFound = true; - if (!config.validateArchival() && config.validateClean()) { - break; - } + break; } - if (config.validateClean() && config.validateArchival()) { - if (archFound && cleanFound) { - break; - } + } + + String archivalPath = executionContext.getHoodieTestSuiteWriter().getCfg().targetBasePath + "/.hoodie/archived"; + metaFileStatuses = fs.listStatus(new Path(archivalPath)); + boolean archFound = false; + for (FileStatus fileStatus : metaFileStatuses) { + Matcher archFileMatcher = ARCHIVE_FILE_PATTERN.matcher(fileStatus.getPath().getName()); + if (archFileMatcher.matches()) { + archFound = true; } } + if (config.validateArchival() && !archFound) { throw new AssertionError("Archival NotFound in " + metadataPath); } diff --git a/packaging/hudi-integ-test-bundle/pom.xml b/packaging/hudi-integ-test-bundle/pom.xml index 826278c..cf9a9cc 100644 --- a/packaging/hudi-integ-test-bundle/pom.xml +++ b/packaging/hudi-integ-test-bundle/pom.xml @@ -78,6 +78,7 @@ <include>org.apache.hudi:hudi-sync-common</include> <include>org.apache.hudi:hudi-hadoop-mr</include> <include>org.apache.hudi:hudi-timeline-service</include> + <include>org.apache.hudi:hudi-aws</include> <include>org.apache.hudi:hudi-integ-test</include> <include>org.jetbrains.kotlin:kotlin-stdlib-jdk8</include>
