Apache/lucene
1
0
Fork 0
mirror of https://github.com/apache/lucene.git synced 2025-03-08 01:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

SOLR-10397: Handle interrupted event for Overseer.autoscalingTriggerCreator

Browse Source
This commit is contained in:
Cao Manh Dat 2017-07-29 10:43:37 +07:00
parent 6893699f06
commit 7ef991d642
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
solr/core/src/java/org/apache/solr/cloud/Overseer.java
View File

@ -480,6 +480,8 @@ public class Overseer implements Closeable {
private OverseerThread triggerThread;
private Thread autoscalingTriggerCreator;
private final ZkStateReader reader;
private final ShardHandler shardHandler;
@ -531,7 +533,7 @@ public class Overseer implements Closeable {
ccThread.setDaemon(true);
//TODO nocommit, autoscaling framework should start autoAddReplicas trigger automatically (implicitly)
Thread autoscalingTriggerCreator = new Thread(createAutoscalingTriggerIfNotExist(), "AutoscalingTriggerCreator");
autoscalingTriggerCreator = new Thread(createAutoscalingTriggerIfNotExist(), "AutoscalingTriggerCreator");
autoscalingTriggerCreator.setDaemon(true);
autoscalingTriggerCreator.start();
@ -584,14 +586,18 @@ public class Overseer implements Closeable {
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR,
"Failed when creating .auto_add_replicas trigger");
}
while (getZkController().getCoreContainer()
.getRequestHandler(AutoScalingHandler.HANDLER_PATH) == null) {
try {
Thread.sleep(500);
} catch (InterruptedException e) {
// expected
try {
while (getZkController().getCoreContainer().getRequestHandler(AutoScalingHandler.HANDLER_PATH) == null) {
try {
Thread.sleep(500);
} catch (InterruptedException e) {
break;
}
}
}
if (getZkController().getCoreContainer().isShutDown()) {
return;
}
} catch (Exception e) {}
String dsl = AutoScaling.AUTO_ADD_REPLICAS_TRIGGER_DSL.replace("{{waitFor}}",
String.valueOf(config.getAutoReplicaFailoverWaitAfterExpiration()/1000));
@ -626,6 +632,9 @@ public class Overseer implements Closeable {
IOUtils.closeQuietly(triggerThread);
triggerThread.interrupt();
}
if (autoscalingTriggerCreator != null) {
autoscalingTriggerCreator.interrupt();
}
if (updaterThread != null) {
try {
@ -642,10 +651,17 @@ public class Overseer implements Closeable {
triggerThread.join();
} catch (InterruptedException e) {}
}
if (autoscalingTriggerCreator != null) {
try {
log.info("Waiting for autoscaling trigger creator join");
autoscalingTriggerCreator.join();
} catch (InterruptedException e) {}
}
updaterThread = null;
ccThread = null;
triggerThread = null;
autoscalingTriggerCreator = null;
}
/**