Skip to content

Commit ab65f4b

Browse files
committed
restart random data node
1 parent c829a38 commit ab65f4b

File tree

1 file changed

+7
-15
lines changed

1 file changed

+7
-15
lines changed

server/src/test/java/org/elasticsearch/discovery/ClusterDisruptionIT.java

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -442,9 +442,9 @@ public void testIndicesDeleted() throws Exception {
442442
assertFalse(client().admin().indices().prepareExists(idxName).get().isExists());
443443
}
444444

445-
public void testRestartPrimaryNodeWhileIndexing() throws Exception {
445+
public void testRestartNodeWhileIndexing() throws Exception {
446446
startCluster(3);
447-
String index = "failover_index";
447+
String index = "restart_while_indexing";
448448
assertAcked(client().admin().indices().prepareCreate(index).setSettings(Settings.builder()
449449
.put(IndexMetaData.SETTING_NUMBER_OF_SHARDS, 1).put(IndexMetaData.SETTING_NUMBER_OF_REPLICAS, between(1, 2))));
450450
AtomicBoolean stopped = new AtomicBoolean();
@@ -454,37 +454,29 @@ public void testRestartPrimaryNodeWhileIndexing() throws Exception {
454454
for (int i = 0; i < threads.length; i++) {
455455
threads[i] = new Thread(() -> {
456456
while (stopped.get() == false && docID.get() < 5000) {
457-
int docId = frequently() ? docID.getAndIncrement() : between(0, docID.getAndIncrement());
457+
String id = Integer.toString(docID.incrementAndGet());
458458
try {
459-
IndexResponse response = client().prepareIndex(index, "_doc", Integer.toString(docId))
460-
.setSource("{\"f\":" + docId + "}", XContentType.JSON).get();
459+
IndexResponse response = client().prepareIndex(index, "_doc", id).setSource("{}", XContentType.JSON).get();
461460
assertThat(response.getResult(), isOneOf(CREATED, UPDATED));
462461
logger.info("--> index id={} seq_no={}", response.getId(), response.getSeqNo());
463462
ackedDocs.add(response.getId());
464463
} catch (ElasticsearchException ignore) {
465-
logger.info("--> fail to index id={}", docId);
464+
logger.info("--> fail to index id={}", id);
466465
}
467466
}
468467
});
469468
threads[i].start();
470469
}
471470
ensureGreen(index);
472471
assertBusy(() -> assertThat(docID.get(), greaterThanOrEqualTo(100)));
473-
ClusterState clusterState = internalCluster().clusterService().state();
474-
for (ShardRouting shardRouting : clusterState.routingTable().allShards(index)) {
475-
if (shardRouting.primary()) {
476-
String nodeName = clusterState.nodes().get(shardRouting.currentNodeId()).getName();
477-
internalCluster().restartNode(nodeName, new InternalTestCluster.RestartCallback());
478-
break;
479-
}
480-
}
472+
internalCluster().restartRandomDataNode(new InternalTestCluster.RestartCallback());
481473
ensureGreen(index);
482474
assertBusy(() -> assertThat(docID.get(), greaterThanOrEqualTo(200)));
483475
stopped.set(true);
484476
for (Thread thread : threads) {
485477
thread.join();
486478
}
487-
clusterState = internalCluster().clusterService().state();
479+
ClusterState clusterState = internalCluster().clusterService().state();
488480
for (ShardRouting shardRouting : clusterState.routingTable().allShards(index)) {
489481
String nodeName = clusterState.nodes().get(shardRouting.currentNodeId()).getName();
490482
IndicesService indicesService = internalCluster().getInstance(IndicesService.class, nodeName);

0 commit comments

Comments
 (0)