[hadoop-ozone] branch master updated: Revert "HDDS-3421. Enabling TestStorageContainerManager. (#1127)"

[ad...@apache.org]

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

adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git


The following commit(s) were added to refs/heads/master by this push:
     new 2c4e656  Revert "HDDS-3421. Enabling TestStorageContainerManager. (#1127)"
2c4e656 is described below

commit 2c4e65693bfcf600643f7ae285d7abf9e54a2e02
Author: Doroszlai, Attila <ad...@apache.org>
AuthorDate: Fri Jul 3 19:47:16 2020 +0200

    Revert "HDDS-3421. Enabling TestStorageContainerManager. (#1127)"
    
    This reverts commit f6e3ff28af67bb0f4e8bf92f7f63c5611ce41c9f.
---
 .../java/org/apache/hadoop/ozone/TestStorageContainerManager.java  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestStorageContainerManager.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestStorageContainerManager.java
index af8f69a..1320b5b 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestStorageContainerManager.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestStorageContainerManager.java
@@ -26,6 +26,7 @@ import static org.apache.hadoop.hdds.HddsConfigKeys
 import static org.apache.hadoop.hdds.HddsConfigKeys
     .HDDS_SCM_SAFEMODE_PIPELINE_CREATION;
 import static org.junit.Assert.fail;
+import org.junit.Ignore;
 import static org.mockito.Matchers.argThat;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
@@ -108,6 +109,7 @@ import com.google.common.collect.Maps;
 /**
  * Test class that exercises the StorageContainerManager.
  */
+@Ignore
 public class TestStorageContainerManager {
   private static XceiverClientManager xceiverClientManager;
   private static final Logger LOG = LoggerFactory.getLogger(
@@ -117,7 +119,7 @@ public class TestStorageContainerManager {
    * Set the timeout for every test.
    */
   @Rule
-  public Timeout testTimeout = new Timeout(900000);
+  public Timeout testTimeout = new Timeout(300000);
 
   @Rule
   public ExpectedException thrown = ExpectedException.none();
@@ -152,7 +154,6 @@ public class TestStorageContainerManager {
         "adminUser1, adminUser2");
     // Non-admin user will get permission denied.
     testRpcPermissionWithConf(ozoneConf, "unknownUser", true);
-
     // Admin user will pass the permission check.
     testRpcPermissionWithConf(ozoneConf, "adminUser2", false);
   }
@@ -524,7 +525,7 @@ public class TestStorageContainerManager {
   /**
    * Test datanode heartbeat well processed with a 4-layer network topology.
    */
-  @Test(timeout = 180000)
+  @Test(timeout = 60000)
   public void testScmProcessDatanodeHeartbeat() throws Exception {
     OzoneConfiguration conf = new OzoneConfiguration();
     String scmId = UUID.randomUUID().toString();


---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-commits-help@hadoop.apache.org