From b838277fda1153d56e14a9db401fdfa4b287da1b Mon Sep 17 00:00:00 2001 From: Pierre Salagnac Date: Fri, 19 Dec 2025 11:13:33 +0100 Subject: [PATCH 1/2] SOLR-17972: Retry creation of ZK lock on connection loss. --- solr/core/src/java/org/apache/solr/cloud/ZkDistributedLock.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkDistributedLock.java b/solr/core/src/java/org/apache/solr/cloud/ZkDistributedLock.java index b9fedc5e0763..a1603c98bb32 100644 --- a/solr/core/src/java/org/apache/solr/cloud/ZkDistributedLock.java +++ b/solr/core/src/java/org/apache/solr/cloud/ZkDistributedLock.java @@ -95,7 +95,7 @@ protected ZkDistributedLock(SolrZkClient zkClient, String lockDir, String lockNo + lockNodePrefix, null, CreateMode.EPHEMERAL_SEQUENTIAL, - false); + true); sequence = getSequenceFromNodename(lockNode); } From 40263590a90022a9d2a92ae7fadf98c872d88540 Mon Sep 17 00:00:00 2001 From: Pierre Salagnac Date: Fri, 19 Dec 2025 11:21:37 +0100 Subject: [PATCH 2/2] Add changelog --- changelog/unreleased/SOLR-17972-distributed-lock-lead.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 changelog/unreleased/SOLR-17972-distributed-lock-lead.yml diff --git a/changelog/unreleased/SOLR-17972-distributed-lock-lead.yml b/changelog/unreleased/SOLR-17972-distributed-lock-lead.yml new file mode 100644 index 000000000000..da5b8d7e5141 --- /dev/null +++ b/changelog/unreleased/SOLR-17972-distributed-lock-lead.yml @@ -0,0 +1,7 @@ +title: Retry creation of ZK lock on transient connection loss. +type: fixed +authors: + - name: Pierre Salagnac +links: + - name: SOLR-17972 + url: https://issues.apache.org/jira/browse/SOLR-17972