From 9e6ec8071d7500a7a3c07b5f8f96668a13d648c3 Mon Sep 17 00:00:00 2001 From: Rong Rong Date: Tue, 15 Feb 2022 08:37:34 -0800 Subject: [PATCH 1/2] try fixing segment replace test serialize segment lineage test --- .../core/PinotHelixResourceManagerTest.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManagerTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManagerTest.java index dac54479ec2f..3ab3c7dc145d 100644 --- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManagerTest.java +++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManagerTest.java @@ -451,13 +451,20 @@ public void testLeadControllerAssignment() { @Test public void testSegmentReplacement() - throws IOException { + throws Exception { // Create broker tenant on 1 Brokers Tenant brokerTenant = new Tenant(TenantRole.BROKER, BROKER_TENANT_NAME, 1, 0, 0); PinotResourceManagerResponse response = ControllerTestUtils.getHelixResourceManager().createBrokerTenant(brokerTenant); Assert.assertTrue(response.isSuccessful()); + testSegmentReplacementRegular(); + testSegmentReplacementForRefresh(); + } + + private void testSegmentReplacementRegular() + throws IOException { + // Create the table TableConfig tableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(OFFLINE_SEGMENTS_REPLACE_TEST_TABLE_NAME) @@ -666,14 +673,8 @@ public void testSegmentReplacement() Assert.assertEquals(segmentLineage.getLineageEntry(lineageEntryId4).getState(), LineageEntryState.COMPLETED); } - @Test - public void testSegmentReplacementForRefresh() + private void testSegmentReplacementForRefresh() throws IOException, InterruptedException { - // Create broker tenant on 1 Brokers - Tenant brokerTenant = new Tenant(TenantRole.BROKER, BROKER_TENANT_NAME, 1, 0, 0); - PinotResourceManagerResponse response = - ControllerTestUtils.getHelixResourceManager().createBrokerTenant(brokerTenant); - Assert.assertTrue(response.isSuccessful()); // Create the table TableConfig tableConfig = @@ -893,6 +894,7 @@ private void waitForSegmentsToDelete(String tableNameWithType, int expectedNumSe do { if (ControllerTestUtils.getHelixResourceManager().getSegmentsFor(tableNameWithType, false).size() == expectedNumSegmentsAfterDelete) { + System.out.println("segment deleted after " + (System.currentTimeMillis() - endTimeMs + timeOutInMillis)); return; } else { Thread.sleep(500L); From 1f88d683e8aabb49563c10e2679ceea35732c6dd Mon Sep 17 00:00:00 2001 From: Rong Rong Date: Wed, 16 Feb 2022 12:17:52 -0800 Subject: [PATCH 2/2] address diff comments --- .../controller/helix/core/PinotHelixResourceManagerTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManagerTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManagerTest.java index 3ab3c7dc145d..1a1d080f1146 100644 --- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManagerTest.java +++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManagerTest.java @@ -96,7 +96,7 @@ public class PinotHelixResourceManagerTest { private static final int CONNECTION_TIMEOUT_IN_MILLISECOND = 10_000; private static final int MAXIMUM_NUMBER_OF_CONTROLLER_INSTANCES = 10; - private static final long TIMEOUT_IN_MS = 10_000L; + private static final long TIMEOUT_IN_MS = 60_000L; @BeforeClass public void setUp() @@ -894,7 +894,6 @@ private void waitForSegmentsToDelete(String tableNameWithType, int expectedNumSe do { if (ControllerTestUtils.getHelixResourceManager().getSegmentsFor(tableNameWithType, false).size() == expectedNumSegmentsAfterDelete) { - System.out.println("segment deleted after " + (System.currentTimeMillis() - endTimeMs + timeOutInMillis)); return; } else { Thread.sleep(500L);