[lucene-solr] branch reference_impl_dev updated: @757 Small tweak.

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/reference_impl_dev by this push:
     new f9b092a  @757 Small tweak.
f9b092a is described below

commit f9b092ae7d0163992b07365bbb078c4f5afca32d
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Sun Sep 6 07:35:13 2020 -0500

    @757 Small tweak.
---
 .../org/apache/solr/cloud/api/collections/CreateCollectionCmd.java    | 4 ++--
 solr/core/src/java/org/apache/solr/handler/SQLHandler.java            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateCollectionCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateCollectionCmd.java
index 8a4ce7c..efd773d 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateCollectionCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateCollectionCmd.java
@@ -328,8 +328,8 @@ public class CreateCollectionCmd implements OverseerCollectionMessageHandler.Cmd
       if(!isLegacyCloud) {
         // wait for all replica entries to be created
         Map<String,Replica> replicas = new HashMap<>();
-        zkStateReader.waitForState(collectionName, 10, TimeUnit.SECONDS, (n, c) -> c != null && c.getSlices().size() == shardNames.size());
-        zkStateReader.waitForState(collectionName, 5, TimeUnit.SECONDS, expectedReplicas(coresToCreate.size(), replicas)); // nocommit - timeout - keep this below containing timeouts - need central timeout stuff
+        zkStateReader.waitForState(collectionName, 5, TimeUnit.SECONDS, (n, c) -> c != null && c.getSlices().size() == shardNames.size());
+        zkStateReader.waitForState(collectionName, 10, TimeUnit.SECONDS, expectedReplicas(coresToCreate.size(), replicas)); // nocommit - timeout - keep this below containing timeouts - need central timeout stuff
         // TODO what if replicas comes back wrong?
         if (replicas.size() > 0) {
           for (Map.Entry<String, ShardRequest> e : coresToCreate.entrySet()) {
diff --git a/solr/core/src/java/org/apache/solr/handler/SQLHandler.java b/solr/core/src/java/org/apache/solr/handler/SQLHandler.java
index 34d8e5c..1efc4dc 100644
--- a/solr/core/src/java/org/apache/solr/handler/SQLHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/SQLHandler.java
@@ -61,7 +61,7 @@ public class SQLHandler extends RequestHandlerBase implements SolrCoreAware, Per
   public void inform(SolrCore core) {
     CoreContainer coreContainer = core.getCoreContainer();
 
-    if(coreContainer.isZooKeeperAware()) {
+    if (coreContainer.isZooKeeperAware()) {
       defaultZkhost = core.getCoreContainer().getZkController().getZkServerAddress();
       defaultWorkerCollection = core.getCoreDescriptor().getCollectionName();
       isCloud = true;