You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2015/05/18 14:52:37 UTC
svn commit: r1680018 -
/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/SchemaManager.java
Author: noble
Date: Mon May 18 12:52:37 2015
New Revision: 1680018
URL: http://svn.apache.org/r1680018
Log:
sync other replicas only in Cloud mode
Modified:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/SchemaManager.java
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/SchemaManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/SchemaManager.java?rev=1680018&r1=1680017&r2=1680018&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/SchemaManager.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/SchemaManager.java Mon May 18 12:52:37 2015
@@ -129,6 +129,7 @@ public class SchemaManager {
managedIndexSchema.getResourceName(),
sw.toString().getBytes(StandardCharsets.UTF_8),
true);
+ waitForOtherReplicasToUpdate(timeout, startTime);
return Collections.emptyList();
} catch (ZkController.ResourceModifiedInZkException e) {
log.info("Race condition schema modified by another node");
@@ -142,7 +143,6 @@ public class SchemaManager {
//only for non cloud stuff
managedIndexSchema.persistManagedSchema(false);
core.setLatestSchema(managedIndexSchema);
- waitForOtherReplicasToUpdate(timeout, startTime);
return Collections.emptyList();
} catch (ManagedIndexSchema.SchemaChangedInZkException e) {
String s = "Failed to update schema because schema is modified";