[lucene-solr] branch reference_impl_dev updated: @437 Track urp life cycle.

[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 1286284  @437 Track urp life cycle.
1286284 is described below

commit 12862849bbb2ed8e21bceef69bc16634428328b7
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Tue Jul 28 16:35:38 2020 -0500

    @437 Track urp life cycle.
---
 .../apache/solr/update/processor/DistributedZkUpdateProcessor.java  | 1 +
 .../apache/solr/update/processor/RoutedAliasUpdateProcessor.java    | 1 +
 .../org/apache/solr/update/processor/UpdateRequestProcessor.java    | 6 +++++-
 solr/test-framework/src/resources/logconf/log4j2-std-debug.xml      | 5 ++++-
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/update/processor/DistributedZkUpdateProcessor.java b/solr/core/src/java/org/apache/solr/update/processor/DistributedZkUpdateProcessor.java
index 6c6a684..2883074 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/DistributedZkUpdateProcessor.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/DistributedZkUpdateProcessor.java
@@ -1100,6 +1100,7 @@ public class DistributedZkUpdateProcessor extends DistributedUpdateProcessor {
 
   @Override
   protected void doClose() {
+    super.doClose();
     if (cmdDistrib != null) {
       cmdDistrib.close();
     }
diff --git a/solr/core/src/java/org/apache/solr/update/processor/RoutedAliasUpdateProcessor.java b/solr/core/src/java/org/apache/solr/update/processor/RoutedAliasUpdateProcessor.java
index d745b22..672cf23 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/RoutedAliasUpdateProcessor.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/RoutedAliasUpdateProcessor.java
@@ -224,6 +224,7 @@ public class RoutedAliasUpdateProcessor extends UpdateRequestProcessor {
 
   @Override
   protected void doClose() {
+    super.doClose();
     try {
       cmdDistrib.close();
     } finally {
diff --git a/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessor.java b/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessor.java
index 7963ec8..a5bd571 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessor.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessor.java
@@ -21,6 +21,7 @@ import java.io.IOException;
 import java.lang.invoke.MethodHandles;
 
 import org.apache.solr.common.SolrException;
+import org.apache.solr.common.util.ObjectReleaseTracker;
 import org.apache.solr.update.AddUpdateCommand;
 import org.apache.solr.update.CommitUpdateCommand;
 import org.apache.solr.update.DeleteUpdateCommand;
@@ -48,6 +49,7 @@ public abstract class UpdateRequestProcessor implements Closeable {
   protected final UpdateRequestProcessor next;
 
   public UpdateRequestProcessor( UpdateRequestProcessor next) {
+    assert ObjectReleaseTracker.track(this);
     this.next = next;
   }
 
@@ -98,6 +100,8 @@ public abstract class UpdateRequestProcessor implements Closeable {
    * Override to implement resource release logic that *must* be called at the
    * end of a request.
    */
-  protected void doClose() {}
+  protected void doClose() {
+    assert ObjectReleaseTracker.release(this);
+  }
 }
 
diff --git a/solr/test-framework/src/resources/logconf/log4j2-std-debug.xml b/solr/test-framework/src/resources/logconf/log4j2-std-debug.xml
index 02e4aef..a6ac632 100644
--- a/solr/test-framework/src/resources/logconf/log4j2-std-debug.xml
+++ b/solr/test-framework/src/resources/logconf/log4j2-std-debug.xml
@@ -47,8 +47,11 @@
         <AsyncLogger name="org.apache.solr.client.solrj.impl.LBSolrClient" level="INFO"/>
         <AsyncLogger name="org.apache.solr.cloud.ZkController" level="INFO"/>
         <AsyncLogger name="org.apache.solr.common.cloud.ZkMaintenanceUtils" level="INFO"/>
-        <AsyncLogger name="org.apache.solr.update.processor.DistributedZkUpdateProcessor" level="WARN"/>
+        <AsyncLogger name="org.apache.solr.update.processor.DistributedZkUpdateProcessor" level="INFO"/>
+        <AsyncLogger name="org.apache.solr.update.SolrCmdDistributor" level="DEBUG"/>
+
         <AsyncLogger name="com.google.inject.servlet" level="DEBUG"/>
+        <AsyncLogger name="org.apache.solr.client.solrj.impl.Http2SolrClient" level="DEBUG"/>
 
         <AsyncRoot level="INFO">
             <AppenderRef ref="STDERR_COLOR"/>