You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by no...@apache.org on 2022/10/13 06:36:32 UTC

[solr] branch jira/solr-16640 updated: more logging 9

This is an automated email from the ASF dual-hosted git repository.

noble pushed a commit to branch jira/solr-16640
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/jira/solr-16640 by this push:
     new 7cb333a4afa more logging 9
7cb333a4afa is described below

commit 7cb333a4afa0290a64a91cd29b27b7206dbf78c5
Author: Noble Paul <no...@gmail.com>
AuthorDate: Thu Oct 13 17:36:23 2022 +1100

    more logging 9
---
 .../core/src/java/org/apache/solr/cloud/RefreshCollectionMessage.java | 2 +-
 solr/core/src/java/org/apache/solr/cloud/overseer/SliceMutator.java   | 4 ++--
 .../src/java/org/apache/solr/common/cloud/ZkStateReader.java          | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/cloud/RefreshCollectionMessage.java b/solr/core/src/java/org/apache/solr/cloud/RefreshCollectionMessage.java
index 681020245fb..0355f2f511c 100644
--- a/solr/core/src/java/org/apache/solr/cloud/RefreshCollectionMessage.java
+++ b/solr/core/src/java/org/apache/solr/cloud/RefreshCollectionMessage.java
@@ -54,7 +54,7 @@ public class RefreshCollectionMessage implements Overseer.Message {
     } else {
       log.info("RefreshCollectionMessage({}). stale, refreshed to ver {}", collection, stat.getVersion());
       overseer.getZkStateReader().forceUpdateCollection(collection);
-      coll = overseer.getZkStateReader().getCollection(collection);
+      coll = overseer.getZkStateReader().getCollectionLive(collection);
       return clusterState.copyWith(collection, coll);
     }
   }
diff --git a/solr/core/src/java/org/apache/solr/cloud/overseer/SliceMutator.java b/solr/core/src/java/org/apache/solr/cloud/overseer/SliceMutator.java
index 910740fe941..ee3a229e359 100644
--- a/solr/core/src/java/org/apache/solr/cloud/overseer/SliceMutator.java
+++ b/solr/core/src/java/org/apache/solr/cloud/overseer/SliceMutator.java
@@ -79,7 +79,7 @@ public class SliceMutator {
   }
 
   public ZkWriteCommand addReplica(ClusterState clusterState, ZkNodeProps message) {
-    log.info("createReplica() {}, CS: {} ", message, clusterState);
+    log.info("createReplica() {}, CS: {} ", message, clusterState.hashCode());
     String coll = message.getStr(ZkStateReader.COLLECTION_PROP);
     if (!checkCollectionKeyExistence(message)) return ZkStateWriter.NO_OP;
     String slice = message.getStr(ZkStateReader.SHARD_ID_PROP);
@@ -89,7 +89,7 @@ public class SliceMutator {
     } catch (SolrException e) {
       try {
         Stat stat = zkClient.exists(DocCollection.getCollectionPath(coll), null, true);
-        log.info("NO COLL. current version : {}, clusterstate : {}", stat.getVersion(), clusterState);
+        log.info("NO COLL. current version : {}, hash {} clusterstate : {}", stat.getVersion(), clusterState.hashCode(), clusterState);
       } catch (Exception ex) {
       }
       throw e;
diff --git a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.java b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.java
index 2d0165ae96b..6ccb9b68e80 100644
--- a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.java
+++ b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.java
@@ -745,6 +745,7 @@ public class ZkStateReader implements SolrCloseable {
           }
         }
       }
+      log.info("refreshCollectionList lazy:{}, watches : {}", lazyCollectionStates.keySet(), collectionWatches.statefulWatchesByCollectionName.keySet());
     }
   }