You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2014/11/23 17:40:30 UTC
svn commit: r1641218 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/java/org/apache/solr/cloud/DistributedQueue.java
core/src/java/org/apache/solr/cloud/Overseer.java
Author: markrmiller
Date: Sun Nov 23 16:40:30 2014
New Revision: 1641218
URL: http://svn.apache.org/r1641218
Log:
SOLR-6459: Normalize logging of operations in Overseer and log current queue size.
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/DistributedQueue.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/Overseer.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1641218&r1=1641217&r2=1641218&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Sun Nov 23 16:40:30 2014
@@ -411,6 +411,9 @@ Other Changes
* SOLR-6747: Add an optional caching option as a workaround for SOLR-6586.
(Mark Miller, Gregory Chanan)
+* SOLR-6459: Normalize logging of operations in Overseer and log current queue size.
+ (Ramkumar Aiyengar via Mark Miller)
+
================== 4.10.3 ==================
Bug Fixes
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/DistributedQueue.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/DistributedQueue.java?rev=1641218&r1=1641217&r2=1641218&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/DistributedQueue.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/DistributedQueue.java Sun Nov 23 16:40:30 2014
@@ -90,6 +90,7 @@ public class DistributedQueue {
TreeMap<Long,String> orderedChildren = new TreeMap<>();
List<String> childNames = zookeeper.getChildren(dir, watcher, true);
+ stats.setQueueLength(childNames.size());
for (String childName : childNames) {
try {
// Check format
@@ -117,6 +118,7 @@ public class DistributedQueue {
throws KeeperException, InterruptedException {
List<String> childNames = zookeeper.getChildren(dir, null, true);
+ stats.setQueueLength(childNames.size());
for (String childName : childNames) {
if (childName != null) {
try {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/Overseer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/Overseer.java?rev=1641218&r1=1641217&r2=1641218&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/Overseer.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/Overseer.java Sun Nov 23 16:40:30 2014
@@ -216,7 +216,7 @@ public class Overseer implements Closeab
final String operation = message.getStr(QUEUE_OPERATION);
final TimerContext timerContext = stats.time(operation);
try {
- clusterState = processMessage(clusterState, message, operation);
+ clusterState = processMessage(clusterState, message, operation, workQueue.getStats().getQueueLength());
stats.success(operation);
} catch (Exception e) {
// generally there is nothing we can do - in most cases, we have
@@ -314,7 +314,7 @@ public class Overseer implements Closeab
final TimerContext timerContext = stats.time(operation);
try {
- clusterState = processMessage(clusterState, message, operation);
+ clusterState = processMessage(clusterState, message, operation, workQueue.getStats().getQueueLength());
stats.success(operation);
} catch (Exception e) {
// generally there is nothing we can do - in most cases, we have
@@ -461,8 +461,8 @@ public class Overseer implements Closeab
}
private ClusterState processMessage(ClusterState clusterState,
- final ZkNodeProps message, final String operation) {
-
+ final ZkNodeProps message, final String operation, int queueSize) {
+ log.info("processMessage: queueSize: {}, message = {}", queueSize, message);
CollectionParams.CollectionAction collectionAction = CollectionParams.CollectionAction.get(operation);
if (collectionAction != null) {
switch (collectionAction) {
@@ -701,7 +701,6 @@ public class Overseer implements Closeab
}
private ClusterState createReplica(ClusterState clusterState, ZkNodeProps message) {
- log.info("createReplica() {} ", message);
String coll = message.getStr(ZkStateReader.COLLECTION_PROP);
if (!checkCollectionKeyExistence(message)) return clusterState;
String slice = message.getStr(ZkStateReader.SHARD_ID_PROP);
@@ -724,7 +723,7 @@ public class Overseer implements Closeab
private ClusterState buildCollection(ClusterState clusterState, ZkNodeProps message) {
String collection = message.getStr("name");
- log.info("building a new collection: " + collection);
+ log.info("Building a new collection: {}", collection);
if(clusterState.hasCollection(collection) ){
log.warn("Collection {} already exists. exit" ,collection);
return clusterState;
@@ -746,7 +745,7 @@ public class Overseer implements Closeab
private ClusterState updateShardState(ClusterState clusterState, ZkNodeProps message) {
String collection = message.getStr(ZkStateReader.COLLECTION_PROP);
if (!checkCollectionKeyExistence(message)) return clusterState;
- log.info("Update shard state invoked for collection: " + collection + " with message: " + message);
+ log.info("Updating shard state for collection: {}", collection);
for (String key : message.keySet()) {
if (ZkStateReader.COLLECTION_PROP.equals(key)) continue;
if (QUEUE_OPERATION.equals(key)) continue;
@@ -932,7 +931,6 @@ public class Overseer implements Closeab
final String collection = message.getStr(ZkStateReader.COLLECTION_PROP);
if (!checkCollectionKeyExistence(message)) return clusterState;
Integer numShards = message.getInt(ZkStateReader.NUM_SHARDS_PROP, null);
- log.info("Update state numShards={} message={}", numShards, message);
List<String> shardNames = new ArrayList<>();
@@ -1336,7 +1334,7 @@ public class Overseer implements Closeab
final String collection = message.getStr(ZkStateReader.COLLECTION_PROP);
if (!checkCollectionKeyExistence(message)) return clusterState;
- log.info("Removing collection: " + collection + " shard: " + sliceId + " from clusterstate");
+ log.info("Removing collection: {}, shard: {} from cluster state", collection, sliceId);
DocCollection coll = clusterState.getCollection(collection);
@@ -1964,6 +1962,7 @@ public class Overseer implements Closeab
static final int MAX_STORED_FAILURES = 10;
final Map<String, Stat> stats = new ConcurrentHashMap<>();
+ private volatile int queueLength;
public Map<String, Stat> getStats() {
return stats;
@@ -2034,6 +2033,14 @@ public class Overseer implements Closeab
return ret;
}
}
+
+ public int getQueueLength() {
+ return queueLength;
+ }
+
+ public void setQueueLength(int queueLength) {
+ this.queueLength = queueLength;
+ }
}
public static class Stat {