You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2018/03/07 12:33:33 UTC
[11/11] lucene-solr:jira/solr-11670-2: Merge branch 'master' into
jira/solr-11670-2
Merge branch 'master' into jira/solr-11670-2
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/4851f43a
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/4851f43a
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/4851f43a
Branch: refs/heads/jira/solr-11670-2
Commit: 4851f43ad49f862c301b9ea62dc5d6ada8a903bc
Parents: 163df9e 498927d
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Wed Mar 7 13:33:01 2018 +0100
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Wed Mar 7 13:33:01 2018 +0100
----------------------------------------------------------------------
dev-tools/doap/lucene.rdf | 7 +
dev-tools/doap/solr.rdf | 7 +
lucene/CHANGES.txt | 7 +
.../index/TestBackwardsCompatibility.java | 4 +-
.../lucene/index/unsupported.6.6.3-cfs.zip | Bin 0 -> 15919 bytes
.../lucene/index/unsupported.6.6.3-nocfs.zip | Bin 0 -> 15900 bytes
solr/CHANGES.txt | 23 +++
.../org/apache/solr/cloud/ZkShardTerms.java | 3 +-
.../cloud/autoscaling/ScheduledTrigger.java | 4 +-
.../cloud/autoscaling/ScheduledTriggers.java | 60 +++---
.../solr/handler/admin/CollectionsHandler.java | 13 +-
.../org/apache/solr/cloud/ZkShardTermsTest.java | 19 ++
.../cloud/autoscaling/ScheduledTriggerTest.java | 1 -
solr/solr-ref-guide/src/css/ref-guide.css | 3 +-
...toring-solr-with-prometheus-and-grafana.adoc | 184 +++++++++++--------
.../solrj/request/TestV1toV2ApiMapper.java | 14 +-
16 files changed, 223 insertions(+), 126 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4851f43a/solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTrigger.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4851f43a/solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTriggers.java
----------------------------------------------------------------------
diff --cc solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTriggers.java
index d2656cf,b46fd58..e313aaa
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTriggers.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTriggers.java
@@@ -224,21 -222,20 +224,21 @@@ public class ScheduledTriggers implemen
}
IOUtils.closeQuietly(old);
newTrigger.restoreState(old.trigger);
- scheduledTrigger.setReplay(false);
- scheduledTriggers.replace(newTrigger.getName(), scheduledTrigger);
+ triggerWrapper.setReplay(false);
+ scheduledTriggerWrappers.replace(newTrigger.getName(), triggerWrapper);
}
newTrigger.setProcessor(event -> {
+ TriggerListeners triggerListeners = listeners.copy();
if (cloudManager.isClosed()) {
String msg = String.format(Locale.ROOT, "Ignoring autoscaling event %s because Solr has been shutdown.", event.toString());
log.warn(msg);
- listeners.fireListeners(event.getSource(), event, TriggerEventProcessorStage.ABORTED, msg);
+ triggerListeners.fireListeners(event.getSource(), event, TriggerEventProcessorStage.ABORTED, msg);
return false;
}
- ScheduledTrigger scheduledSource = scheduledTriggers.get(event.getSource());
+ TriggerWrapper scheduledSource = scheduledTriggerWrappers.get(event.getSource());
if (scheduledSource == null) {
String msg = String.format(Locale.ROOT, "Ignoring autoscaling event %s because the source trigger: %s doesn't exist.", event.toString(), event.getSource());
- listeners.fireListeners(event.getSource(), event, TriggerEventProcessorStage.FAILED, msg);
+ triggerListeners.fireListeners(event.getSource(), event, TriggerEventProcessorStage.FAILED, msg);
log.warn(msg);
return false;
}
@@@ -275,10 -272,10 +275,10 @@@
if (replaying) {
enqueued = false;
} else {
- enqueued = scheduledTrigger.enqueue(event);
+ enqueued = triggerWrapper.enqueue(event);
}
// fire STARTED event listeners after enqueuing the event is successful
- listeners.fireListeners(event.getSource(), event, TriggerEventProcessorStage.STARTED);
+ triggerListeners.fireListeners(event.getSource(), event, TriggerEventProcessorStage.STARTED);
List<TriggerAction> actions = source.getActions();
if (actions != null) {
if (actionExecutor.isShutdown()) {
@@@ -311,13 -307,13 +311,13 @@@
}
List<String> afterActions = (List<String>) actionContext.getProperties().computeIfAbsent(TriggerEventProcessorStage.AFTER_ACTION.toString(), k -> new ArrayList<String>());
afterActions.add(action.getName());
- listeners.fireListeners(event.getSource(), event, TriggerEventProcessorStage.AFTER_ACTION, action.getName(), actionContext);
+ triggerListeners1.fireListeners(event.getSource(), event, TriggerEventProcessorStage.AFTER_ACTION, action.getName(), actionContext);
}
if (enqueued) {
- TriggerEvent ev = scheduledTrigger.dequeue();
+ TriggerEvent ev = triggerWrapper.dequeue();
assert ev.getId().equals(event.getId());
}
- listeners.fireListeners(event.getSource(), event, TriggerEventProcessorStage.SUCCEEDED);
+ triggerListeners1.fireListeners(event.getSource(), event, TriggerEventProcessorStage.SUCCEEDED);
} catch (Exception e) {
log.warn("Exception executing actions", e);
} finally {