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 2015/02/09 19:39:36 UTC
svn commit: r1658519 -
/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
Author: markrmiller
Date: Mon Feb 9 18:39:36 2015
New Revision: 1658519
URL: http://svn.apache.org/r1658519
Log:
SOLR-6920, SOLR-6640: Make constant and fix logging.
Modified:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java?rev=1658519&r1=1658518&r2=1658519&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java Mon Feb 9 18:39:36 2015
@@ -122,6 +122,8 @@ import org.slf4j.LoggerFactory;
* @since solr 1.4
*/
public class SnapPuller {
+ private static final int _100K = 100000;
+
public static final String INDEX_PROPERTIES = "index.properties";
private static final Logger LOG = LoggerFactory.getLogger(SnapPuller.class.getName());
@@ -821,9 +823,9 @@ public class SnapPuller {
private boolean filesToAlwaysDownloadIfNoChecksums(String filename,
long size, CompareResult compareResult) {
// without checksums to compare, we always download .si, .liv, segments_N,
- // and any file under 100kb
+ // and any very small files
return !compareResult.checkSummed && (filename.endsWith(".si") || filename.endsWith(".liv")
- || filename.startsWith("segments_") || size < 100000);
+ || filename.startsWith("segments_") || size < _100K);
}
static class CompareResult {
@@ -855,9 +857,7 @@ public class SnapPuller {
return compareResult;
} else {
LOG.warn(
- "File {} did not match. " + "expected length is {} and actual length is {}",
- filename, backupIndexFileChecksum, indexFileChecksum,
- backupIndexFileLen, indexFileLen);
+ "File {} did not match. expected length is {} and actual length is {}", filename, backupIndexFileLen, indexFileLen);
compareResult.equal = false;
return compareResult;
}