You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2017/07/06 04:34:01 UTC
[1/3] lucene-solr:feature/autoscaling: SOLR-10396: Tweak log messages
Repository: lucene-solr
Updated Branches:
refs/heads/feature/autoscaling fd66cb317 -> 23fe3e1aa
SOLR-10396: Tweak log messages
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b452b3c4
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b452b3c4
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b452b3c4
Branch: refs/heads/feature/autoscaling
Commit: b452b3c45142b51b377f47b887c0c15b19120e20
Parents: 17d8417
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Wed Jul 5 10:03:34 2017 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Thu Jul 6 09:06:23 2017 +0530
----------------------------------------------------------------------
.../org/apache/solr/cloud/autoscaling/NodeLostTrigger.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b452b3c4/solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeLostTrigger.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeLostTrigger.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeLostTrigger.java
index 9db388d..bd9b745 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeLostTrigger.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeLostTrigger.java
@@ -224,11 +224,10 @@ public class NodeLostTrigger extends TriggerBase {
throw new RuntimeException("Trigger has been closed");
}
}
- log.debug("Running NodeLostTrigger: {}", name);
ZkStateReader reader = container.getZkController().getZkStateReader();
Set<String> newLiveNodes = reader.getClusterState().getLiveNodes();
- log.debug("Found livenodes: {}", newLiveNodes);
+ log.debug("Running NodeLostTrigger: {} with currently live nodes: {}", name, newLiveNodes);
// have any nodes that we were tracking been added to the cluster?
// if so, remove them from the tracking map
@@ -252,10 +251,12 @@ public class NodeLostTrigger extends TriggerBase {
// fire!
AutoScaling.TriggerListener listener = listenerRef.get();
if (listener != null) {
- log.debug("NodeLostTrigger firing registered listener");
+ log.debug("NodeLostTrigger firing registered listener for lost node: {}", nodeName);
if (listener.triggerFired(new NodeLostEvent(getEventType(), getName(), timeRemoved, nodeName))) {
it.remove();
removeNodeLostMarker(nodeName);
+ } else {
+ log.debug("NodeLostTrigger listener for lost node: {} is not ready, will try later", nodeName);
}
} else {
it.remove();
[2/3] lucene-solr:feature/autoscaling: SOLR-10496: Removing nocommit
Posted by sh...@apache.org.
SOLR-10496: Removing nocommit
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/17d84177
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/17d84177
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/17d84177
Branch: refs/heads/feature/autoscaling
Commit: 17d841776b8b00f407c027a1941dc3600360801f
Parents: fd66cb3
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Wed Jul 5 08:29:14 2017 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Thu Jul 6 09:06:23 2017 +0530
----------------------------------------------------------------------
.../src/java/org/apache/solr/cloud/autoscaling/TriggerAction.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/17d84177/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerAction.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerAction.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerAction.java
index e67a217..76cd5f0 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerAction.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerAction.java
@@ -25,7 +25,6 @@ import org.apache.solr.util.plugin.MapInitializedPlugin;
* Interface for actions performed in response to a trigger being activated
*/
public interface TriggerAction extends MapInitializedPlugin, Closeable {
- // todo nocommit
String getName();
void process(TriggerEvent event, ActionContext context);
[3/3] lucene-solr:feature/autoscaling: SOLR-10496: Do not cast
TriggerEvent to concrete sub-class because it might have been created from
TriggerEventQueue
Posted by sh...@apache.org.
SOLR-10496: Do not cast TriggerEvent to concrete sub-class because it might have been created from TriggerEventQueue
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/23fe3e1a
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/23fe3e1a
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/23fe3e1a
Branch: refs/heads/feature/autoscaling
Commit: 23fe3e1aa0455596a5000f42e46de33f9014d285
Parents: b452b3c
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Thu Jul 6 10:03:41 2017 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Thu Jul 6 10:03:41 2017 +0530
----------------------------------------------------------------------
.../apache/solr/cloud/autoscaling/ComputePlanAction.java | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/23fe3e1a/solr/core/src/java/org/apache/solr/cloud/autoscaling/ComputePlanAction.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/ComputePlanAction.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/ComputePlanAction.java
index cb876a5..85baf71 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/ComputePlanAction.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/ComputePlanAction.java
@@ -111,16 +111,14 @@ public class ComputePlanAction implements TriggerAction {
Policy.Suggester suggester;
switch (event.getEventType()) {
case NODEADDED:
- NodeAddedTrigger.NodeAddedEvent nodeAddedEvent = (NodeAddedTrigger.NodeAddedEvent) event;
suggester = session.getSuggester(CollectionParams.CollectionAction.MOVEREPLICA)
- .hint(Policy.Suggester.Hint.TARGET_NODE, nodeAddedEvent.getProperty(TriggerEvent.NODE_NAME));
- log.debug("Created suggester with targetNode: {}", nodeAddedEvent.getProperty(TriggerEvent.NODE_NAME));
+ .hint(Policy.Suggester.Hint.TARGET_NODE, event.getProperty(TriggerEvent.NODE_NAME));
+ log.debug("Created suggester with targetNode: {}", event.getProperty(TriggerEvent.NODE_NAME));
break;
case NODELOST:
- NodeLostTrigger.NodeLostEvent nodeLostEvent = (NodeLostTrigger.NodeLostEvent) event;
suggester = session.getSuggester(CollectionParams.CollectionAction.MOVEREPLICA)
- .hint(Policy.Suggester.Hint.SRC_NODE, nodeLostEvent.getProperty(TriggerEvent.NODE_NAME));
- log.debug("Created suggester with srcNode: {}", nodeLostEvent.getProperty(TriggerEvent.NODE_NAME));
+ .hint(Policy.Suggester.Hint.SRC_NODE, event.getProperty(TriggerEvent.NODE_NAME));
+ log.debug("Created suggester with srcNode: {}", event.getProperty(TriggerEvent.NODE_NAME));
break;
default:
throw new UnsupportedOperationException("No support for events other than nodeAdded and nodeLost, received: " + event.getEventType());