From 054595b140e236d1a3e0fdbc93de58bb22f7d350 Mon Sep 17 00:00:00 2001 From: Owais Kazi Date: Thu, 27 Jan 2022 09:26:32 -0800 Subject: [PATCH] Added timeout to ensureGreen() for testClusterGreenAfterPartialRelocation (#1983) * Added timeout to ensureGreen() for testClusterGreenAfterPartialRelocation Signed-off-by: Owais Kazi * Fixed spotless imports Signed-off-by: Owais Kazi --- .../org/opensearch/cluster/routing/MovePrimaryFirstTests.java | 3 ++- .../java/org/opensearch/index/engine/InternalEngineTests.java | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/test/java/org/opensearch/cluster/routing/MovePrimaryFirstTests.java b/server/src/test/java/org/opensearch/cluster/routing/MovePrimaryFirstTests.java index c484d0eb759fc..3ea6762d3829e 100644 --- a/server/src/test/java/org/opensearch/cluster/routing/MovePrimaryFirstTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/MovePrimaryFirstTests.java @@ -12,6 +12,7 @@ import org.opensearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest; import org.opensearch.cluster.ClusterStateListener; import org.opensearch.common.settings.Settings; +import org.opensearch.common.unit.TimeValue; import org.opensearch.test.InternalTestCluster; import org.opensearch.test.OpenSearchIntegTestCase; @@ -112,6 +113,6 @@ public void testClusterGreenAfterPartialRelocation() throws InterruptedException internalCluster().stopRandomNode(InternalTestCluster.nameFilter(z1n1)); internalCluster().stopRandomNode(InternalTestCluster.nameFilter(z1n2)); } catch (Exception e) {} - ensureGreen(); + ensureGreen(TimeValue.timeValueSeconds(60)); } } diff --git a/server/src/test/java/org/opensearch/index/engine/InternalEngineTests.java b/server/src/test/java/org/opensearch/index/engine/InternalEngineTests.java index 1296532b0ba0d..d20b151bb69bf 100644 --- a/server/src/test/java/org/opensearch/index/engine/InternalEngineTests.java +++ b/server/src/test/java/org/opensearch/index/engine/InternalEngineTests.java @@ -55,7 +55,6 @@ import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.LiveIndexWriterConfig; -import org.apache.lucene.index.LogByteSizeMergePolicy; import org.apache.lucene.index.LogDocMergePolicy; import org.apache.lucene.index.MergePolicy; import org.apache.lucene.index.NoMergePolicy;