disable test that do not work with Ratis OM

adoroszlai · Dec 6, 2024 · 34df4ed · 34df4ed
1 parent 379056f
commit 34df4ed
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestHSync.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestHSync.java
@@ -103,6 +103,7 @@
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.util.Time;
 import org.apache.ozone.test.GenericTestUtils;
+import org.apache.ozone.test.tag.Unhealthy;
 import org.apache.ratis.protocol.ClientId;
 import org.apache.ratis.protocol.Message;
 import org.apache.ratis.protocol.RaftClientReply;
@@ -1321,6 +1322,7 @@ public void testNormalKeyOverwriteHSyncKey() throws Exception {
   }
 
   @Test
+  @Unhealthy("HDDS-11870")
   public void testHSyncKeyOverwriteNormalKey() throws Exception {
     // Set the fs.defaultFS
     final String rootPath = String.format("%s://%s/",
@@ -1392,6 +1394,7 @@ public void testHSyncKeyOverwriteNormalKey() throws Exception {
   }
 
   @Test
+  @Unhealthy("HDDS-11870")
   public void testHSyncKeyOverwriteHSyncKey() throws Exception {
     // Set the fs.defaultFS
     final String rootPath = String.format("%s://%s/",

diff --git a/...e/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestQuotaRepairTask.java b/...e/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestQuotaRepairTask.java
@@ -46,13 +46,15 @@
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
 import org.apache.hadoop.ozone.protocolPB.OzoneManagerProtocolServerSideTranslatorPB;
 import org.apache.hadoop.util.Time;
+import org.apache.ozone.test.tag.Unhealthy;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 
 /**
  * Test class for quota repair.
  */
+@Unhealthy("HDDS-11868")
 public class TestQuotaRepairTask extends TestOMKeyRequest {
 
   @Test

diff --git a/...src/test/java/org/apache/hadoop/ozone/security/TestOzoneDelegationTokenSecretManager.java b/...src/test/java/org/apache/hadoop/ozone/security/TestOzoneDelegationTokenSecretManager.java
@@ -59,7 +59,6 @@
 import org.apache.hadoop.security.token.Token;
 import org.apache.hadoop.util.Time;
 
-import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_RATIS_ENABLE_KEY;
 import static org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMTokenProto.Type.S3AUTHINFO;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -75,6 +74,7 @@
 
 import org.slf4j.event.Level;
 import org.apache.ozone.test.GenericTestUtils;
+import org.apache.ozone.test.tag.Unhealthy;
 import org.apache.ratis.protocol.RaftPeerId;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -132,14 +132,6 @@ public void setUp() throws Exception {
 
   private OzoneConfiguration createNewTestPath() throws IOException {
     OzoneConfiguration config = new OzoneConfiguration();
-    // When ratis is enabled, tokens are not updated to the store directly by
-    // OzoneDelegationTokenSecretManager. Tokens are updated via Ratis
-    // through the DoubleBuffer. Hence, to test
-    // OzoneDelegationTokenSecretManager, we should disable OM Ratis.
-    // TODO: Once HA and non-HA code paths are merged in
-    //  OzoneDelegationTokenSecretManager, this test should be updated to
-    //  test both ratis enabled and disabled case.
-    config.setBoolean(OZONE_OM_RATIS_ENABLE_KEY, false);
     File newFolder = folder.toFile();
     if (!newFolder.exists()) {
       assertTrue(newFolder.mkdirs());
@@ -268,11 +260,13 @@ private void testRenewTokenSuccessHelper(boolean restartSecretManager)
   }
 
   @Test
+  @Unhealthy("HDDS-11869")
   public void testReloadAndRenewToken() throws Exception {
     testRenewTokenSuccessHelper(true);
   }
 
   @Test
+  @Unhealthy("HDDS-11869")
   public void testRenewTokenSuccess() throws Exception {
     testRenewTokenSuccessHelper(false);
   }
@@ -281,6 +275,7 @@ public void testRenewTokenSuccess() throws Exception {
    * Tests failure for mismatch in renewer.
    */
   @Test
+  @Unhealthy("HDDS-11869")
   public void testRenewTokenFailure() throws Exception {
     secretManager = createSecretManager(conf, TOKEN_MAX_LIFETIME,
         expiryTime, TOKEN_REMOVER_SCAN_INTERVAL);
@@ -348,6 +343,7 @@ public void testCreateIdentifier() throws Exception {
   }
 
   @Test
+  @Unhealthy("HDDS-11869")
   public void testCancelTokenSuccess() throws Exception {
     secretManager = createSecretManager(conf, TOKEN_MAX_LIFETIME,
         expiryTime, TOKEN_REMOVER_SCAN_INTERVAL);