[hudi] branch master updated: [HUDI-6385] Fixing archival tests after RLI base patch (#9043)

[codope]

This is an automated email from the ASF dual-hosted git repository.

codope 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 8a5288202e5 [HUDI-6385] Fixing archival tests after RLI base patch 
(#9043)
8a5288202e5 is described below

commit 8a5288202e510e9d4d551b5cb588af62677496ba
Author: Sivabalan Narayanan <n.siv...@gmail.com>
AuthorDate: Sat Jun 24 02:04:22 2023 -0400

    [HUDI-6385] Fixing archival tests after RLI base patch (#9043)
---
 .../java/org/apache/hudi/io/TestHoodieTimelineArchiver.java    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/io/TestHoodieTimelineArchiver.java
 
b/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/io/TestHoodieTimelineArchiver.java
index ea90bf38c29..7e6aaa8fe8b 100644
--- 
a/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/io/TestHoodieTimelineArchiver.java
+++ 
b/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/io/TestHoodieTimelineArchiver.java
@@ -323,7 +323,7 @@ public class TestHoodieTimelineArchiver extends 
HoodieClientTestHarness {
     }
   }
 
-  @Disabled("HUDI-6385")
+  // @Disabled("HUDI-6385")
   @ParameterizedTest
   @ValueSource(strings = {"KEEP_LATEST_BY_HOURS", "KEEP_LATEST_COMMITS"})
   public void testArchivalWithAutoAdjustmentBasedOnCleanConfigs(String 
cleaningPolicy) throws Exception {
@@ -334,7 +334,7 @@ public class TestHoodieTimelineArchiver extends 
HoodieClientTestHarness {
     HoodieWriteConfig config = 
HoodieWriteConfig.newBuilder().withPath(basePath)
         .withFileSystemViewConfig(FileSystemViewStorageConfig.newBuilder()
             .withRemoteServerPort(timelineServicePort).build())
-        
.withMetadataConfig(HoodieMetadataConfig.newBuilder().withAssumeDatePartitioning(true).build())
+        
.withMetadataConfig(HoodieMetadataConfig.newBuilder().withAssumeDatePartitioning(true).withMaxNumDeltaCommitsBeforeCompaction(5).build())
         .withCleanConfig(HoodieCleanConfig.newBuilder()
             
.withFailedWritesCleaningPolicy(HoodieFailedWritesCleaningPolicy.EAGER)
             .withCleanerPolicy(HoodieCleaningPolicy.valueOf(cleaningPolicy))
@@ -421,12 +421,12 @@ public class TestHoodieTimelineArchiver extends 
HoodieClientTestHarness {
       commitMeta = generateCommitMetadata(instantTime, partToFileIds);
       metadataWriter.performTableServices(Option.of(instantTime));
       metadataWriter.update(commitMeta, context.emptyHoodieData(), 
instantTime);
+      metaClient.getActiveTimeline().saveAsComplete(
+          new HoodieInstant(State.INFLIGHT, HoodieTimeline.COMMIT_ACTION, 
instantTime),
+          
Option.of(commitMeta.toJsonString().getBytes(StandardCharsets.UTF_8)));
     } else {
       commitMeta = generateCommitMetadata(instantTime, new HashMap<>());
     }
-    metaClient.getActiveTimeline().saveAsComplete(
-        new HoodieInstant(State.INFLIGHT, HoodieTimeline.COMMIT_ACTION, 
instantTime),
-        Option.of(commitMeta.toJsonString().getBytes(StandardCharsets.UTF_8)));
     metaClient = HoodieTableMetaClient.reload(metaClient);
     return new HoodieInstant(
         isComplete ? State.COMPLETED : State.INFLIGHT, 
HoodieTimeline.COMMIT_ACTION, instantTime);