You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by ja...@apache.org on 2023/11/14 23:32:19 UTC
(pinot) branch master updated: Fix the test failures caused by instance drop failure (#12002)
This is an automated email from the ASF dual-hosted git repository.
jackie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git
The following commit(s) were added to refs/heads/master by this push:
new 62abf1fb22 Fix the test failures caused by instance drop failure (#12002)
62abf1fb22 is described below
commit 62abf1fb222e901f658c067bcda410dc44520c4e
Author: Xiaotian (Jackie) Jiang <17...@users.noreply.github.com>
AuthorDate: Tue Nov 14 15:32:10 2023 -0800
Fix the test failures caused by instance drop failure (#12002)
---
.../java/org/apache/pinot/controller/helix/ControllerTest.java | 3 ++-
.../helix/core/PinotHelixResourceManagerStatelessTest.java | 4 ++--
.../tests/PartialUpsertTableRebalanceIntegrationTest.java | 9 +++------
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerTest.java
index 2cd41d987d..13d0a4695a 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerTest.java
@@ -608,7 +608,8 @@ public class ControllerTest {
public void stopAndDropFakeInstance(String instanceId) {
stopFakeInstance(instanceId);
- _helixResourceManager.dropInstance(instanceId);
+ TestUtils.waitForCondition(aVoid -> _helixResourceManager.dropInstance(instanceId).isSuccessful(), 60_000L,
+ "Failed to drop fake instance: " + instanceId);
}
public static Schema createDummySchema(String tableName) {
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManagerStatelessTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManagerStatelessTest.java
index ba4f061c39..ecfd025d17 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManagerStatelessTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManagerStatelessTest.java
@@ -187,7 +187,7 @@ public class PinotHelixResourceManagerStatelessTest extends ControllerTest {
}, 60_000L, "Failed to update the admin port");
// Remove the new added server
- _helixResourceManager.dropInstance(serverName);
+ assertTrue(_helixResourceManager.dropInstance(serverName).isSuccessful());
TestUtils.waitForCondition(aVoid -> {
try {
_helixResourceManager.getDataInstanceAdminEndpoints(Collections.singleton(serverName));
@@ -220,7 +220,7 @@ public class PinotHelixResourceManagerStatelessTest extends ControllerTest {
assertTrue(allInstances.contains(instanceName));
// Remove the added instance
- _helixResourceManager.dropInstance(instanceName);
+ assertTrue(_helixResourceManager.dropInstance(instanceName).isSuccessful());
allInstances = _helixResourceManager.getAllInstances();
assertFalse(allInstances.contains(instanceName));
}
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/PartialUpsertTableRebalanceIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/PartialUpsertTableRebalanceIntegrationTest.java
index caf3dfbce8..8afcbe9177 100644
--- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/PartialUpsertTableRebalanceIntegrationTest.java
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/PartialUpsertTableRebalanceIntegrationTest.java
@@ -155,14 +155,11 @@ public class PartialUpsertTableRebalanceIntegrationTest extends BaseClusterInteg
waitForRebalanceToComplete(rebalanceResult, 600_000L);
waitForAllDocsLoaded(600_000L);
- _resourceManager.disableInstance(serverStarter1.getInstanceId());
- _resourceManager.disableInstance(serverStarter2.getInstanceId());
-
- _resourceManager.dropInstance(serverStarter1.getInstanceId());
- _resourceManager.dropInstance(serverStarter2.getInstanceId());
-
serverStarter1.stop();
serverStarter2.stop();
+ TestUtils.waitForCondition(aVoid -> _resourceManager.dropInstance(serverStarter1.getInstanceId()).isSuccessful()
+ && _resourceManager.dropInstance(serverStarter2.getInstanceId()).isSuccessful(), 60_000L,
+ "Failed to drop servers");
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org