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 2015/02/17 09:19:50 UTC
svn commit: r1660314 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/core/ solr/core/src/test/org/apache/solr/cloud/ solr/test-framework/
solr/test-framework/src/java/org/apache/solr/cloud/
Author: shalin
Date: Tue Feb 17 08:19:50 2015
New Revision: 1660314
URL: http://svn.apache.org/r1660314
Log:
SOLR-7118: Use the right schema fields to avoid spurious failures and other misc fixes
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/core/ (props changed)
lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
lucene/dev/branches/branch_5x/solr/test-framework/ (props changed)
lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/StopableIndexingThread.java
Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java?rev=1660314&r1=1660313&r2=1660314&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java Tue Feb 17 08:19:50 2015
@@ -110,7 +110,9 @@ public class ChaosMonkeyNothingIsSafeTes
int numShards = Integer.parseInt(System.getProperty("solr.tests.cloud.cm.shardcount", "-1"));
if (numShards == -1) {
- numShards = sliceCount + random().nextInt(TEST_NIGHTLY ? 12 : 2);
+ // we make sure that there's at least one shard with more than one replica
+ // so that the ChaosMonkey has something to kill
+ numShards = sliceCount + random().nextInt(TEST_NIGHTLY ? 12 : 2) + 1;
}
fixShardCount(numShards);
}
@@ -358,8 +360,8 @@ public class ChaosMonkeyNothingIsSafeTes
}
}
-
- System.err.println("FT added docs:" + numAdds + " with " + fails + " fails" + " deletes:" + numDeletes);
+
+ log.info("FT added docs:" + numAdds + " with " + fails + " fails" + " deletes:" + numDeletes);
}
private void changeUrlOnError(Exception e) {
Modified: lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java?rev=1660314&r1=1660313&r2=1660314&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java (original)
+++ lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java Tue Feb 17 08:19:50 2015
@@ -1428,7 +1428,7 @@ public abstract class AbstractFullDistri
}
}
- System.err.println("num searches done:" + numSearches + " with " + queryFails + " fails");
+ log.info("num searches done:" + numSearches + " with " + queryFails + " fails");
}
@Override
Modified: lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/StopableIndexingThread.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/StopableIndexingThread.java?rev=1660314&r1=1660313&r2=1660314&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/StopableIndexingThread.java (original)
+++ lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/StopableIndexingThread.java Tue Feb 17 08:19:50 2015
@@ -29,8 +29,8 @@ import org.apache.solr.common.SolrInputD
*/
public class StopableIndexingThread extends AbstractFullDistribZkTestBase.StopableThread {
- private static String t1 = "a_t";
- private static String i1 = "a_i";
+ static String t1 = "a_t";
+ static String i1 = "a_i";
private volatile boolean stop = false;
protected final String id;
protected final List<String> deletes = new ArrayList<>();