diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/resourcemgr/RMBlobManagerTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/resourcemgr/RMBlobManagerTest.java index 79d2c54e667..e09c32eaf4e 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/resourcemgr/RMBlobManagerTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/resourcemgr/RMBlobManagerTest.java @@ -40,6 +40,7 @@ import org.apache.drill.test.ClusterFixture; import org.apache.drill.test.ClusterFixtureBuilder; import org.apache.drill.test.DrillTest; +import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -156,9 +157,10 @@ public void testSetup() throws Exception { formemanQueueUsageValues); final ClusterFixtureBuilder fixtureBuilder = ClusterFixture.builder(dirTestWatcher) - .configProperty(ExecConstants.DRILL_PORT_HUNT, true) .configProperty(ExecConstants.RM_ENABLED, false) .setOptionDefault(ExecConstants.ENABLE_QUEUE.getOptionName(), false) + .configProperty(ExecConstants.DRILL_PORT_HUNT, true) + .configProperty(ExecConstants.ALLOW_LOOPBACK_ADDRESS_BINDING, true) .withLocalZk(); // start the cluster @@ -182,6 +184,11 @@ public void testSetup() throws Exception { rmConsistentBlobStoreManager.writeAllRMBlobs(blobsToSerialize); } + @After + public void testCleanup() throws Exception { + cluster.close(); + } + private void verifyBlobs() { // Again verify the updated blob value with initial value Iterator> blobs = rmConsistentBlobStoreManager.readAllRMBlobs(); diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/resourcemgr/TestDistributedQueryRM.java b/exec/java-exec/src/test/java/org/apache/drill/exec/resourcemgr/TestDistributedQueryRM.java index cef1bf7d445..c9c76100cbc 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/resourcemgr/TestDistributedQueryRM.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/resourcemgr/TestDistributedQueryRM.java @@ -64,6 +64,7 @@ public static void setupTestSuite() throws Exception { .configProperty(ExecConstants.RM_ENABLED, true) .setOptionDefault(ExecConstants.ENABLE_QUEUE.getOptionName(), false) .configProperty(ExecConstants.DRILL_PORT_HUNT, true) + .configProperty(ExecConstants.ALLOW_LOOPBACK_ADDRESS_BINDING, true) .withLocalZk(); startCluster(fixtureBuilder); context = cluster.drillbit().getContext(); diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/resourcemgr/TestE2EWithDistributedRM.java b/exec/java-exec/src/test/java/org/apache/drill/exec/resourcemgr/TestE2EWithDistributedRM.java index 1479b55a947..80b0dfe9526 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/resourcemgr/TestE2EWithDistributedRM.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/resourcemgr/TestE2EWithDistributedRM.java @@ -32,8 +32,9 @@ public class TestE2EWithDistributedRM extends ClusterTest { public static void setupTestSuite() throws Exception { final ClusterFixtureBuilder fixtureBuilder = ClusterFixture.builder(dirTestWatcher) .configProperty(ExecConstants.RM_ENABLED, true) - .configProperty(ExecConstants.DRILL_PORT_HUNT, true) .setOptionDefault(ExecConstants.ENABLE_QUEUE.getOptionName(), false) + .configProperty(ExecConstants.DRILL_PORT_HUNT, true) + .configProperty(ExecConstants.ALLOW_LOOPBACK_ADDRESS_BINDING, true) .withLocalZk(); startCluster(fixtureBuilder); } diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/resourcemgr/TestRMConfigLoad.java b/exec/java-exec/src/test/java/org/apache/drill/exec/resourcemgr/TestRMConfigLoad.java index 4b83a5f4321..a58e86f40b6 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/resourcemgr/TestRMConfigLoad.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/resourcemgr/TestRMConfigLoad.java @@ -32,7 +32,6 @@ import org.apache.drill.test.ClusterFixture; import org.apache.drill.test.ClusterFixtureBuilder; import org.apache.drill.test.DrillTest; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -40,7 +39,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -@Ignore("These tests will be ignored until integration with new DistributedResourceManager is done") @Category(ResourceManagerTest.class) public final class TestRMConfigLoad extends DrillTest { @@ -51,8 +49,9 @@ public final class TestRMConfigLoad extends DrillTest { public void testDefaultRMConfig() throws Exception { ClusterFixtureBuilder fixtureBuilder = ClusterFixture.builder(dirTestWatcher) .configProperty(ExecConstants.RM_ENABLED, true) - .configProperty(ExecConstants.DRILL_PORT_HUNT, true) .setOptionDefault(ExecConstants.ENABLE_QUEUE.getOptionName(), false) + .configProperty(ExecConstants.ALLOW_LOOPBACK_ADDRESS_BINDING, true) + .configProperty(ExecConstants.DRILL_PORT_HUNT, true) .withLocalZk(); try(ClusterFixture cluster = fixtureBuilder.build()) { @@ -111,8 +110,9 @@ public void testDefaultRMWithLocalCoordinatorAndRMDisabled() throws Exception { public void testDefaultRMOnlyRMDisabled() throws Exception { ClusterFixtureBuilder fixtureBuilder = ClusterFixture.builder(dirTestWatcher) .configProperty(ExecConstants.RM_ENABLED, false) - .configProperty(ExecConstants.DRILL_PORT_HUNT, true) .setOptionDefault(ExecConstants.ENABLE_QUEUE.getOptionName(), false) + .configProperty(ExecConstants.ALLOW_LOOPBACK_ADDRESS_BINDING, true) + .configProperty(ExecConstants.DRILL_PORT_HUNT, true) .withLocalZk(); try (ClusterFixture cluster = fixtureBuilder.build()) { @@ -126,8 +126,9 @@ public void testDefaultRMOnlyRMDisabled() throws Exception { public void testThrottleRMOnlyRMDisabled() throws Exception { ClusterFixtureBuilder fixtureBuilder = ClusterFixture.builder(dirTestWatcher) .configProperty(ExecConstants.RM_ENABLED, false) - .configProperty(ExecConstants.DRILL_PORT_HUNT, true) .setOptionDefault(ExecConstants.ENABLE_QUEUE.getOptionName(), true) + .configProperty(ExecConstants.DRILL_PORT_HUNT, true) + .configProperty(ExecConstants.ALLOW_LOOPBACK_ADDRESS_BINDING, true) .withLocalZk(); try (ClusterFixture cluster = fixtureBuilder.build()) {