[lucene-solr] branch reference_impl_dev updated: @436 Fix distrib updates.

[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 a1a06fc  @436 Fix distrib updates.
a1a06fc is described below

commit a1a06fc1408ae6dd5aa7d06b4eab6461736ae31d
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Tue Jul 28 15:15:11 2020 -0500

    @436 Fix distrib updates.
---
 solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java b/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
index 9e7f77e..a366609 100644
--- a/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
+++ b/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
@@ -76,7 +76,7 @@ public class SolrCmdDistributor implements Closeable {
   };
 
   public SolrCmdDistributor(UpdateShardHandler updateShardHandler) {
-    this.solrClient = updateShardHandler.getUpdateOnlyHttpClient();
+    this.solrClient = new Http2SolrClient.Builder().withHttpClient(updateShardHandler.getUpdateOnlyHttpClient()).build();
   }
   
   /* For tests only */
@@ -86,8 +86,9 @@ public class SolrCmdDistributor implements Closeable {
   
   public void finish() {
     assert !finished : "lifecycle sanity check";
-    phaser.arriveAndAwaitAdvance();
+    solrClient.waitForOutstandingRequests();
     finished = true;
+    ParWork.close(solrClient);
   }
   
   public void close() {