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

Use applied cluster state in cluster health (#44426) 

In #44348 we changed the cluster health action so that it sometimes uses the
cluster state directly from the master service rather than from the cluster
applier. If the state is not recovered then this is inappropriate, because
prior to state recovery the state available to the cluster applier contains no
indices. This commit moves us back to using the state from the applier.

Fixes #44416.
This commit is contained in:
David Turner 2019-07-17 08:34:56 +01:00
parent 0fd33b089f
commit dca8a918f3
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java
View File

@ -145,7 +145,13 @@ public class TransportClusterHealthAction extends StreamableTransportMasterNodeR
final long timeoutInMillis = Math.max(0, endTimeRelativeMillis - threadPool.relativeTimeInMillis()); final long timeoutInMillis = Math.max(0, endTimeRelativeMillis - threadPool.relativeTimeInMillis());
final TimeValue newTimeout = TimeValue.timeValueMillis(timeoutInMillis); final TimeValue newTimeout = TimeValue.timeValueMillis(timeoutInMillis);
request.timeout(newTimeout); request.timeout(newTimeout);
executeHealth(request, newState, listener, waitCount,
// we must use the state from the applier service, because if the state-not-recovered block is in place then the
// applier service has a different view of the cluster state from the one supplied here
final ClusterState appliedState = clusterService.state();
assert newState.stateUUID().equals(appliedState.stateUUID())
: newState.stateUUID() + " vs " + appliedState.stateUUID();
executeHealth(request, appliedState, listener, waitCount,
observedState -> waitForEventsAndExecuteHealth(request, listener, waitCount, endTimeRelativeMillis)); observedState -> waitForEventsAndExecuteHealth(request, listener, waitCount, endTimeRelativeMillis));
} }

15
server/src/test/java/org/elasticsearch/gateway/GatewayIndexStateIT.java
View File

@ -211,7 +211,6 @@ public class GatewayIndexStateIT extends ESIntegTestCase {
client().prepareIndex("test", "type1", "2").setSource("field1", "value1").execute().actionGet(); client().prepareIndex("test", "type1", "2").setSource("field1", "value1").execute().actionGet();
} }
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/44416")
public void testJustMasterNode() throws Exception { public void testJustMasterNode() throws Exception {
logger.info("--> cleaning nodes"); logger.info("--> cleaning nodes");
@ -221,11 +220,13 @@ public class GatewayIndexStateIT extends ESIntegTestCase {
logger.info("--> create an index"); logger.info("--> create an index");
client().admin().indices().prepareCreate("test").setWaitForActiveShards(ActiveShardCount.NONE).execute().actionGet(); client().admin().indices().prepareCreate("test").setWaitForActiveShards(ActiveShardCount.NONE).execute().actionGet();
logger.info("--> closing master node"); logger.info("--> restarting master node");
internalCluster().closeNonSharedNodes(false); internalCluster().fullRestart(new RestartCallback(){
@Override
logger.info("--> starting 1 master node non data again"); public Settings onNodeStopped(String nodeName) {
internalCluster().startNode(Settings.builder().put(Node.NODE_DATA_SETTING.getKey(), false).build()); return Settings.builder().put(Node.NODE_DATA_SETTING.getKey(), false).build();
}
});
logger.info("--> waiting for test index to be created"); logger.info("--> waiting for test index to be created");
ClusterHealthResponse health = client().admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setIndices("test") ClusterHealthResponse health = client().admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setIndices("test")
@ -237,7 +238,7 @@ public class GatewayIndexStateIT extends ESIntegTestCase {
assertThat(clusterStateResponse.getState().metaData().hasIndex("test"), equalTo(true)); assertThat(clusterStateResponse.getState().metaData().hasIndex("test"), equalTo(true));
} }
public void testJustMasterNodeAndJustDataNode() throws Exception { public void testJustMasterNodeAndJustDataNode() {
logger.info("--> cleaning nodes"); logger.info("--> cleaning nodes");
logger.info("--> starting 1 master node non data"); logger.info("--> starting 1 master node non data");