You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2018/09/07 07:49:41 UTC
[32/50] [abbrv] lucene-solr:jira/http2: SOLR-12744: Improve logging
messages and verbosity around recoveries
SOLR-12744: Improve logging messages and verbosity around recoveries
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/89d598e9
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/89d598e9
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/89d598e9
Branch: refs/heads/jira/http2
Commit: 89d598e9e891e87825d45aabea45e708a51ba860
Parents: 37375ae
Author: Varun Thacker <va...@apache.org>
Authored: Wed Sep 5 19:43:36 2018 -0700
Committer: Varun Thacker <va...@apache.org>
Committed: Wed Sep 5 19:56:25 2018 -0700
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../src/java/org/apache/solr/cloud/RecoveryStrategy.java | 8 ++++----
solr/core/src/java/org/apache/solr/core/SolrCore.java | 4 ++--
solr/core/src/java/org/apache/solr/handler/IndexFetcher.java | 2 +-
solr/core/src/java/org/apache/solr/update/PeerSync.java | 2 +-
.../src/java/org/apache/solr/update/PeerSyncWithLeader.java | 6 +++---
6 files changed, 13 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/89d598e9/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index aa0698c..19db81e 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -409,6 +409,8 @@ Other Changes
* SOLR-12590: Improve Solr resource loader coverage in the ref guide.
(Steve Rowe, Cassandra Targett, Christine Poerschke)
+* SOLR-12744: Improve logging messages and verbosity around recoveries (Cao Manh Dat, Varun Thacker)
+
================== 7.4.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/89d598e9/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java b/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
index 24c53bd..aa87801 100644
--- a/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
+++ b/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
@@ -484,11 +484,11 @@ public class RecoveryStrategy implements Runnable, Closeable {
}
if (oldIdx > 0) {
- log.info("####### Found new versions added after startup: num=[{}]", oldIdx);
- log.info("###### currentVersions=[{}]",recentVersions);
+ log.info("Found new versions added after startup: num=[{}]", oldIdx);
+ log.info("currentVersions size={} range=[{} to {}]", recentVersions.size(), recentVersions.get(0), recentVersions.get(recentVersions.size()-1));
}
-
- log.info("###### startupVersions=[{}]", startingVersions);
+
+ log.info("startupVersions size={} range=[{} to {}]", startingVersions.size(), startingVersions.get(0), startingVersions.get(startingVersions.size()-1));
} catch (Exception e) {
SolrException.log(log, "Error getting recent versions.", e);
recentVersions = new ArrayList<>(0);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/89d598e9/solr/core/src/java/org/apache/solr/core/SolrCore.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.java
index 3a02af9..6e13039 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java
@@ -691,7 +691,7 @@ public final class SolrCore implements SolrInfoBean, SolrMetricProducer, Closeab
log.info(info.className);
rsBuilder = getResourceLoader().newInstance(info.className, RecoveryStrategy.Builder.class);
} else {
- log.info("solr.RecoveryStrategy.Builder");
+ log.debug("solr.RecoveryStrategy.Builder");
rsBuilder = new RecoveryStrategy.Builder();
}
if (info != null) {
@@ -1909,7 +1909,7 @@ public final class SolrCore implements SolrInfoBean, SolrMetricProducer, Closeab
f = IndexFingerprint.getFingerprint(searcher, ctx, maxVersion);
// cache fingerprint for the segment only if all the versions in the segment are included in the fingerprint
if (f.getMaxVersionEncountered() == f.getMaxInHash()) {
- log.info("Caching fingerprint for searcher:{} leafReaderContext:{} mavVersion:{}", searcher, ctx, maxVersion);
+ log.debug("Caching fingerprint for searcher:{} leafReaderContext:{} mavVersion:{}", searcher, ctx, maxVersion);
perSegmentFingerprintCache.put(cacheHelper.getKey(), f);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/89d598e9/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java b/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
index a34ad7a..8df0fb0 100644
--- a/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
+++ b/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
@@ -1033,7 +1033,7 @@ public class IndexFetcher {
}
filesDownloaded.add(new HashMap<>(file));
} else {
- log.info("Skipping download for {} because it already exists", file.get(NAME));
+ log.debug("Skipping download for {} because it already exists", file.get(NAME));
}
}
log.info("Bytes downloaded: {}, Bytes skipped downloading: {}", bytesDownloaded, bytesSkippedCopying);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/89d598e9/solr/core/src/java/org/apache/solr/update/PeerSync.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/PeerSync.java b/solr/core/src/java/org/apache/solr/update/PeerSync.java
index 6c3c578..cb7b918 100644
--- a/solr/core/src/java/org/apache/solr/update/PeerSync.java
+++ b/solr/core/src/java/org/apache/solr/update/PeerSync.java
@@ -772,7 +772,7 @@ public class PeerSync implements SolrMetricProducer {
}
if (updatesRequest.totalRequestedUpdates > nUpdates) {
- log.info("{} Failing due to needing too many updates:{}", logPrefix, nUpdates);
+ log.info("{} PeerSync will fail because number of missed updates is more than:{}", logPrefix, nUpdates);
return MissedUpdatesRequest.UNABLE_TO_SYNC;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/89d598e9/solr/core/src/java/org/apache/solr/update/PeerSyncWithLeader.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/PeerSyncWithLeader.java b/solr/core/src/java/org/apache/solr/update/PeerSyncWithLeader.java
index ce4bc77..b485727 100644
--- a/solr/core/src/java/org/apache/solr/update/PeerSyncWithLeader.java
+++ b/solr/core/src/java/org/apache/solr/update/PeerSyncWithLeader.java
@@ -359,9 +359,9 @@ public class PeerSyncWithLeader implements SolrMetricProducer {
try {
IndexFingerprint ourFingerprint = IndexFingerprint.getFingerprint(core, Long.MAX_VALUE);
int cmp = IndexFingerprint.compare(leaderFingerprint, ourFingerprint);
- log.info("Fingerprint comparison: {}" , cmp);
- if(cmp != 0) {
- log.info("Other fingerprint: {}, Our fingerprint: {}", leaderFingerprint , ourFingerprint);
+ log.info("Fingerprint comparison result: {}" , cmp);
+ if (cmp != 0) {
+ log.info("Leader fingerprint: {}, Our fingerprint: {}", leaderFingerprint , ourFingerprint);
}
return cmp == 0; // currently, we only check for equality...
} catch (IOException e) {