You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ho...@apache.org on 2022/10/26 17:15:44 UTC

[solr] branch branch_9_1 updated: SOLR-14679: Fix evergrowing tlogs on TLOG replicas (#1131)

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

houston pushed a commit to branch branch_9_1
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/branch_9_1 by this push:
     new eadc4178b30 SOLR-14679: Fix evergrowing tlogs on TLOG replicas (#1131)
eadc4178b30 is described below

commit eadc4178b30af782a21cb739122a1bafbc6ae99b
Author: Houston Putman <ho...@apache.org>
AuthorDate: Wed Oct 26 13:09:55 2022 -0400

    SOLR-14679: Fix evergrowing tlogs on TLOG replicas (#1131)
    
    (cherry picked from commit 2d1a7485f00bd7e116463a09407d98f49348914b)
---
 solr/CHANGES.txt                                           | 2 ++
 solr/core/src/java/org/apache/solr/cloud/ZkController.java | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index f8c6ef82865..288b0b64788 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -173,6 +173,8 @@ Bug Fixes
 
 * SOLR-16416: OverseerPrioritizer now runs after all handlers are registered, and retries on failures. (Houston Putman)
 
+* SOLR-14679: Fix continuously growing TLOGs on TLOG replicas (Viktor Molnár via Houston Putman)
+
 Other Changes
 ---------------------
 * SOLR-16351: Upgrade Carrot2 to 4.4.3, upgrade randomizedtesting to 2.8.0. (Dawid Weiss)
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
index c5eedaf8220..4c74d614c2f 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
@@ -2481,7 +2481,7 @@ public class ZkController implements Closeable {
             // restart the replication thread to ensure the replication is running in each new
             // replica especially if previous role is "leader" (i.e., no replication thread)
             stopReplicationFromLeader(coreName);
-            startReplicationFromLeader(coreName, false);
+            startReplicationFromLeader(coreName, true);
           }
         }
       }