svn commit: r1680023 - /lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/SchemaManager.java

[no...@apache.org]

Author: noble
Date: Mon May 18 12:56:42 2015
New Revision: 1680023

URL: http://svn.apache.org/r1680023
Log:
sync other replicas only in Cloud mode

Modified:
    lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/SchemaManager.java

Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/SchemaManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/SchemaManager.java?rev=1680023&r1=1680022&r2=1680023&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/SchemaManager.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/SchemaManager.java Mon May 18 12:56:42 2015
@@ -130,6 +130,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");
@@ -143,7 +144,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";