honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clear up some confusing code in IndexShardHotSpotTests (#1534) 

* clear up some useless but confusing test code

Signed-off-by: Weiguo Chen <viggoc96@gmail.com>

* remove useless comment

Signed-off-by: Weiguo Chen <viggoc96@gmail.com>
This commit is contained in:
Viggo 2022-03-22 02:36:52 +08:00 committed by GitHub
parent 84cba7b0f6
commit 5dfd05c713
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
server/src/test/java/org/opensearch/cluster/routing/allocation/IndexShardHotSpotTests.java
View File

@ -20,14 +20,7 @@ public class IndexShardHotSpotTests extends OpenSearchAllocationWithConstraintsT
terminateNodes("node_1"); terminateNodes("node_1");
assertForIndexShardHotSpots(false, 4); assertForIndexShardHotSpots(false, 4);
addNodesWithoutIndexing(1, "new_node_"); addNodesWithoutIndexing(1, "new_node_");
int movesForModeNone = allocateAndCheckIndexShardHotSpots(false, 5, "new_node_0"); allocateAndCheckIndexShardHotSpots(false, 5, "new_node_0");
setupInitialCluster(5, 1, 5, 1);
terminateNodes("node_1");
assertForIndexShardHotSpots(false, 4);
addNodesWithoutIndexing(1, "new_node_");
int movesForModeUnassigned = allocateAndCheckIndexShardHotSpots(false, 5, "new_node_0");
assertTrue(movesForModeUnassigned <= movesForModeNone);
} }
/** /**
@ -39,15 +32,7 @@ public class IndexShardHotSpotTests extends OpenSearchAllocationWithConstraintsT
terminateNodes("node_1"); terminateNodes("node_1");
assertForIndexShardHotSpots(false, 4); assertForIndexShardHotSpots(false, 4);
addNodesWithIndexing(1, "new_node_", 3, 20, 1); addNodesWithIndexing(1, "new_node_", 3, 20, 1);
int movesForModeNone = allocateAndCheckIndexShardHotSpots(false, 5, "new_node_0"); allocateAndCheckIndexShardHotSpots(false, 5, "new_node_0");
resetCluster();
buildAllocationService();
terminateNodes("node_1");
assertForIndexShardHotSpots(false, 4);
addNodesWithIndexing(1, "new_node_", 3, 20, 1);
int movesForModeUnassigned = allocateAndCheckIndexShardHotSpots(false, 5, "new_node_0");
assertTrue(movesForModeUnassigned <= movesForModeNone);
} }
/** /**
@ -57,32 +42,17 @@ public class IndexShardHotSpotTests extends OpenSearchAllocationWithConstraintsT
setupInitialCluster(3, 30, 10, 1); setupInitialCluster(3, 30, 10, 1);
buildAllocationService(); buildAllocationService();
addNodesWithIndexing(1, "new_node_", 8, 10, 1); addNodesWithIndexing(1, "new_node_", 8, 10, 1);
int movesForModeNone = allocateAndCheckIndexShardHotSpots(false, 4, "new_node_0"); allocateAndCheckIndexShardHotSpots(false, 4, "new_node_0");
resetCluster();
buildAllocationService();
addNodesWithIndexing(1, "new_node_", 8, 10, 1);
int movesForModeUnassigned = allocateAndCheckIndexShardHotSpots(false, 4, "new_node_0");
assertTrue(movesForModeUnassigned <= movesForModeNone);
} }
/** /**
* Test under replicated yellow cluster scale out to green. * Test under replicated yellow cluster scale out to green.
*
* This scenario is not expected to create hotspots even without constraints enabled. The
* test is a sanity check to ensure allocation constraints don't worsen the situation.
*/ */
public void testUnderReplicatedClusterScaleOut() { public void testUnderReplicatedClusterScaleOut() {
setupInitialCluster(3, 30, 10, 3); setupInitialCluster(3, 30, 10, 3);
buildAllocationService(); buildAllocationService();
addNodesWithoutIndexing(1, "new_node_"); addNodesWithoutIndexing(1, "new_node_");
int movesForModeNone = allocateAndCheckIndexShardHotSpots(false, 4, "new_node_0"); allocateAndCheckIndexShardHotSpots(false, 4, "new_node_0");
resetCluster();
buildAllocationService();
addNodesWithoutIndexing(1, "new_node_");
int movesForModeUnassigned = allocateAndCheckIndexShardHotSpots(false, 4, "new_node_0");
assertTrue(movesForModeUnassigned <= movesForModeNone);
} }
/** /**
@ -91,19 +61,12 @@ public class IndexShardHotSpotTests extends OpenSearchAllocationWithConstraintsT
* *
* During moveShards(), shards are picked from across indexes in an interleaved manner. * During moveShards(), shards are picked from across indexes in an interleaved manner.
* This prevents hot spots by evenly picking up shards. Since shard order can change * This prevents hot spots by evenly picking up shards. Since shard order can change
* in subsequent runs, we are not guaranteed to less moves than no allocation constraint run. * in subsequent runs.
*
* Move tests are hence just a sanity test, to ensure we don't create any unexpected hot spots with
* allocation settings.
*/ */
public void testClusterScaleIn() { public void testClusterScaleIn() {
setupInitialCluster(4, 30, 10, 1); setupInitialCluster(4, 30, 10, 1);
buildAllocationService("node_0,node_1"); buildAllocationService("node_0,node_1");
allocateAndCheckIndexShardHotSpots(false, 2, "node_2", "node_3"); allocateAndCheckIndexShardHotSpots(false, 2, "node_2", "node_3");
resetCluster();
buildAllocationService("node_0,node_1");
allocateAndCheckIndexShardHotSpots(false, 2, "node_2", "node_3");
} }
/** /**
@ -115,10 +78,5 @@ public class IndexShardHotSpotTests extends OpenSearchAllocationWithConstraintsT
buildAllocationService("node_0,node_1"); buildAllocationService("node_0,node_1");
addNodesWithoutIndexing(1, "new_node_"); addNodesWithoutIndexing(1, "new_node_");
allocateAndCheckIndexShardHotSpots(false, 3, "node_2", "node_3", "new_node_0"); allocateAndCheckIndexShardHotSpots(false, 3, "node_2", "node_3", "new_node_0");
resetCluster();
buildAllocationService("node_0,node_1");
addNodesWithoutIndexing(1, "new_node_");
allocateAndCheckIndexShardHotSpots(false, 3, "node_2", "node_3", "new_node_0");
} }
} }