You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2014/03/06 18:17:38 UTC
svn commit: r1574967 - in /lucene/dev/branches/lucene5493: ./ dev-tools/
dev-tools/idea/solr/contrib/dataimporthandler/
dev-tools/idea/solr/contrib/map-reduce/ lucene/ lucene/test-framework/
lucene/test-framework/src/java/org/apache/lucene/index/ solr/...
Author: rmuir
Date: Thu Mar 6 17:17:38 2014
New Revision: 1574967
URL: http://svn.apache.org/r1574967
Log:
merge trunk
Modified:
lucene/dev/branches/lucene5493/ (props changed)
lucene/dev/branches/lucene5493/dev-tools/ (props changed)
lucene/dev/branches/lucene5493/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml
lucene/dev/branches/lucene5493/dev-tools/idea/solr/contrib/map-reduce/map-reduce.iml
lucene/dev/branches/lucene5493/lucene/ (props changed)
lucene/dev/branches/lucene5493/lucene/test-framework/ (props changed)
lucene/dev/branches/lucene5493/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java
lucene/dev/branches/lucene5493/solr/ (props changed)
lucene/dev/branches/lucene5493/solr/core/ (props changed)
lucene/dev/branches/lucene5493/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
lucene/dev/branches/lucene5493/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java
lucene/dev/branches/lucene5493/solr/core/src/test/org/apache/solr/cloud/TestDistribDocBasedVersion.java
Modified: lucene/dev/branches/lucene5493/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5493/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml?rev=1574967&r1=1574966&r2=1574967&view=diff
==============================================================================
--- lucene/dev/branches/lucene5493/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml (original)
+++ lucene/dev/branches/lucene5493/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml Thu Mar 6 17:17:38 2014
@@ -16,6 +16,7 @@
<orderEntry type="library" scope="TEST" name="HSQLDB" level="project" />
<orderEntry type="library" scope="TEST" name="Derby" level="project" />
<orderEntry type="library" scope="TEST" name="Solr DIH test library" level="project" />
+ <orderEntry type="library" scope="TEST" name="Solr example library" level="project" />
<orderEntry type="library" name="Solr core library" level="project" />
<orderEntry type="library" name="Solrj library" level="project" />
<orderEntry type="library" name="Solr DIH library" level="project" />
Modified: lucene/dev/branches/lucene5493/dev-tools/idea/solr/contrib/map-reduce/map-reduce.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5493/dev-tools/idea/solr/contrib/map-reduce/map-reduce.iml?rev=1574967&r1=1574966&r2=1574967&view=diff
==============================================================================
--- lucene/dev/branches/lucene5493/dev-tools/idea/solr/contrib/map-reduce/map-reduce.iml (original)
+++ lucene/dev/branches/lucene5493/dev-tools/idea/solr/contrib/map-reduce/map-reduce.iml Thu Mar 6 17:17:38 2014
@@ -18,6 +18,7 @@
<orderEntry type="library" name="Solr morphlines core library" level="project" />
<orderEntry type="library" name="Solr morphlines cell library" level="project" />
<orderEntry type="library" scope="TEST" name="Solr morphlines core test library" level="project" />
+ <orderEntry type="library" scope="TEST" name="Solr example library" level="project" />
<orderEntry type="module" scope="TEST" module-name="lucene-test-framework" />
<orderEntry type="module" scope="TEST" module-name="solr-test-framework" />
<orderEntry type="module" module-name="solr-core" />
Modified: lucene/dev/branches/lucene5493/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5493/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java?rev=1574967&r1=1574966&r2=1574967&view=diff
==============================================================================
--- lucene/dev/branches/lucene5493/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java (original)
+++ lucene/dev/branches/lucene5493/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java Thu Mar 6 17:17:38 2014
@@ -440,8 +440,10 @@ public abstract class ThreadedIndexingAn
if (dir instanceof BaseDirectoryWrapper) {
((BaseDirectoryWrapper) dir).setCheckIndexOnClose(false); // don't double-checkIndex, we do it ourselves.
}
+ MockAnalyzer analyzer = new MockAnalyzer(random());
+ analyzer.setMaxTokenLength(TestUtil.nextInt(random(), 1, IndexWriter.MAX_TERM_LENGTH));
final IndexWriterConfig conf = newIndexWriterConfig(TEST_VERSION_CURRENT,
- new MockAnalyzer(random())).setInfoStream(new FailOnNonBulkMergesInfoStream());
+ analyzer).setInfoStream(new FailOnNonBulkMergesInfoStream());
if (LuceneTestCase.TEST_NIGHTLY) {
// newIWConfig makes smallish max seg size, which
Modified: lucene/dev/branches/lucene5493/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5493/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java?rev=1574967&r1=1574966&r2=1574967&view=diff
==============================================================================
--- lucene/dev/branches/lucene5493/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java (original)
+++ lucene/dev/branches/lucene5493/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java Thu Mar 6 17:17:38 2014
@@ -1627,7 +1627,7 @@ public class OverseerCollectionProcessor
if (!created)
throw new SolrException(ErrorCode.SERVER_ERROR, "Could not fully createcollection: " + message.getStr("name"));
- log.info("going to create cores replicas shardNames {} , repFactor : {}", shardNames, repFactor);
+ log.info("Creating SolrCores for new collection, shardNames {} , replicationFactor : {}", shardNames, repFactor);
Map<String ,ShardRequest> coresToCreate = new LinkedHashMap<String, ShardRequest>();
for (int i = 1; i <= shardNames.size(); i++) {
String sliceName = shardNames.get(i-1);
@@ -1671,14 +1671,17 @@ public class OverseerCollectionProcessor
sreq.actualShards = sreq.shards;
sreq.params = params;
- if(isLegacyCloud) shardHandler.submit(sreq, sreq.shards[0], sreq.params);
- else coresToCreate.put(coreName, sreq);
+ if(isLegacyCloud) {
+ shardHandler.submit(sreq, sreq.shards[0], sreq.params);
+ } else {
+ coresToCreate.put(coreName, sreq);
+ }
}
}
if(!isLegacyCloud) {
- //wait for all replica entries to be created
- Map<String, Replica> replicas = lookupReplicas(collectionName, coresToCreate.keySet());
+ // wait for all replica entries to be created
+ Map<String, Replica> replicas = waitToSeeReplicasInState(collectionName, coresToCreate.keySet());
for (Map.Entry<String, ShardRequest> e : coresToCreate.entrySet()) {
ShardRequest sreq = e.getValue();
sreq.params.set(CoreAdminParams.CORE_NODE_NAME, replicas.get(e.getKey()).getName());
@@ -1704,37 +1707,35 @@ public class OverseerCollectionProcessor
}
}
- private Map<String, Replica> lookupReplicas(String collectionName, Collection<String> coreNames) throws InterruptedException {
+ private Map<String, Replica> waitToSeeReplicasInState(String collectionName, Collection<String> coreNames) throws InterruptedException {
Map<String, Replica> result = new HashMap<String, Replica>();
- long endTime = System.nanoTime() + TimeUnit.NANOSECONDS.convert(3, TimeUnit.SECONDS);
- for(;;) {
- DocCollection coll = zkStateReader.getClusterState().getCollection(collectionName);
- for (String coreName : coreNames) {
- if(result.containsKey(coreName)) continue;
+ long endTime = System.nanoTime() + TimeUnit.NANOSECONDS.convert(30, TimeUnit.SECONDS);
+ while (true) {
+ DocCollection coll = zkStateReader.getClusterState().getCollection(
+ collectionName);
+ for (String coreName : coreNames) {
+ if (result.containsKey(coreName)) continue;
for (Slice slice : coll.getSlices()) {
for (Replica replica : slice.getReplicas()) {
- if(coreName.equals(replica.getStr(ZkStateReader.CORE_NAME_PROP))) {
- result.put(coreName,replica);
+ if (coreName.equals(replica.getStr(ZkStateReader.CORE_NAME_PROP))) {
+ result.put(coreName, replica);
break;
}
}
}
}
-
- if(result.size() == coreNames.size()) {
+
+ if (result.size() == coreNames.size()) {
return result;
}
- if( System.nanoTime() > endTime) {
- //time up . throw exception and go out
- throw new SolrException(ErrorCode.SERVER_ERROR, "Unable to create replica entries in ZK");
+ if (System.nanoTime() > endTime) {
+ throw new SolrException(ErrorCode.SERVER_ERROR, "Timed out waiting to see all replicas in cluster state.");
}
-
+
Thread.sleep(100);
}
-
}
-
private void addReplica(ClusterState clusterState, ZkNodeProps message, NamedList results) throws KeeperException, InterruptedException {
String collection = message.getStr(COLLECTION_PROP);
String node = message.getStr("node");
@@ -1789,7 +1790,7 @@ public class OverseerCollectionProcessor
ZkStateReader.STATE_PROP, ZkStateReader.DOWN,
ZkStateReader.BASE_URL_PROP,zkStateReader.getBaseUrlForNodeName(node));
Overseer.getInQueue(zkStateReader.getZkClient()).offer(ZkStateReader.toJSON(props));
- params.set(CoreAdminParams.CORE_NODE_NAME, lookupReplicas(collection, Collections.singletonList(coreName)).get(coreName).getName());
+ params.set(CoreAdminParams.CORE_NODE_NAME, waitToSeeReplicasInState(collection, Collections.singletonList(coreName)).get(coreName).getName());
}
Modified: lucene/dev/branches/lucene5493/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5493/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java?rev=1574967&r1=1574966&r2=1574967&view=diff
==============================================================================
--- lucene/dev/branches/lucene5493/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java (original)
+++ lucene/dev/branches/lucene5493/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java Thu Mar 6 17:17:38 2014
@@ -665,7 +665,7 @@ public class CollectionsAPIDistributedZk
boolean disableLegacy = random().nextBoolean();
CloudSolrServer client1 = null;
- if(disableLegacy) {
+ if (disableLegacy) {
log.info("legacyCloud=false");
client1 = createCloudClient(null);
setClusterProp(client1, ZkStateReader.LEGACY_CLOUD, "false");
Modified: lucene/dev/branches/lucene5493/solr/core/src/test/org/apache/solr/cloud/TestDistribDocBasedVersion.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5493/solr/core/src/test/org/apache/solr/cloud/TestDistribDocBasedVersion.java?rev=1574967&r1=1574966&r2=1574967&view=diff
==============================================================================
--- lucene/dev/branches/lucene5493/solr/core/src/test/org/apache/solr/cloud/TestDistribDocBasedVersion.java (original)
+++ lucene/dev/branches/lucene5493/solr/core/src/test/org/apache/solr/cloud/TestDistribDocBasedVersion.java Thu Mar 6 17:17:38 2014
@@ -103,6 +103,8 @@ public class TestDistribDocBasedVersion
doTestDocVersions();
doTestHardFail();
+ commit(); // work arround SOLR-5628
+
testFinished = true;
} finally {
if (!testFinished) {