Fix TestOpenKeyCleanupService test failure by flipping the switch t…

…o true; misc.
apache · Aug 27, 2024 · 7449b96 · 7449b96
1 parent 3f88b2b
commit 7449b96
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/helpers/TestOzoneFsUtils.java b/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/helpers/TestOzoneFsUtils.java
@@ -52,7 +52,7 @@ public void testPaths() {
    */
   @ParameterizedTest
   @CsvSource({"false,false", "false,true", "true,false", "true,true"})
-  void testGetClientConfigConvertConfigs(boolean hbaseEnhancementsEnabled, boolean fsHsyncEnabled) {
+  void testGetClientConfigCopyConfigs(boolean hbaseEnhancementsEnabled, boolean fsHsyncEnabled) {
     OzoneConfiguration conf = new OzoneConfiguration();
     conf.setBoolean(OzoneConfigKeys.OZONE_HBASE_ENHANCEMENTS_ENABLED, hbaseEnhancementsEnabled);
     conf.setBoolean(OzoneConfigKeys.OZONE_FS_HSYNC_ENABLED, fsHsyncEnabled);

diff --git a/...-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCommitRequest.java b/...-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCommitRequest.java
@@ -378,11 +378,10 @@ public void testValidateAndUpdateCacheWithUncommittedBlocks()
   }
 
   /**
-   * All 3 scenarios below should reject key commit with HSync requested from a client.
-   *
-   * ozone.hbase.enhancements.enabled = false, ozone.fs.hsync.enabled = false
-   * ozone.hbase.enhancements.enabled = false, ozone.fs.hsync.enabled = true
-   * ozone.hbase.enhancements.enabled = true,  ozone.fs.hsync.enabled = false
+   * All 3 scenarios below should reject key commit with HSync requested from a client:
+   * 1. ozone.hbase.enhancements.enabled = false, ozone.fs.hsync.enabled = false
+   * 2. ozone.hbase.enhancements.enabled = false, ozone.fs.hsync.enabled = true
+   * 3. ozone.hbase.enhancements.enabled = true,  ozone.fs.hsync.enabled = false
    */
   @ParameterizedTest
   @CsvSource({"false,false", "false,true", "true,false"})

diff --git a/...e-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestOpenKeyCleanupService.java b/...e-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestOpenKeyCleanupService.java
@@ -118,6 +118,7 @@ void setup(@TempDir Path tempDir) throws Exception {
     conf.setTimeDuration(OZONE_OM_LEASE_HARD_LIMIT,
         EXPIRE_THRESHOLD_MS, TimeUnit.MILLISECONDS);
     conf.set(OzoneConfigKeys.OZONE_OM_LEASE_SOFT_LIMIT, "0s");
+    conf.setBoolean(OzoneConfigKeys.OZONE_HBASE_ENHANCEMENTS_ENABLED, true);
     conf.setBoolean(OzoneConfigKeys.OZONE_FS_HSYNC_ENABLED, true);
     conf.setQuietMode(false);
     OmTestManagers omTestManagers = new OmTestManagers(conf);