(solr) branch branch_9x updated: SOLR-17092: Fix race condition for async request status when using Overseer (#3391)

[houston]

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

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


The following commit(s) were added to refs/heads/branch_9x by this push:
     new 8ae78ce3452 SOLR-17092: Fix race condition for async request status 
when using Overseer (#3391)
8ae78ce3452 is described below

commit 8ae78ce34528db3298e7859424d66e8a17b2c177
Author: Houston Putman <hous...@apache.org>
AuthorDate: Wed Jun 25 16:19:06 2025 -0500

    SOLR-17092: Fix race condition for async request status when using Overseer 
(#3391)
    
    (cherry picked from commit fc65fa3c8181bad10a05cc9a933c32af9e78055b)
---
 .../src/java/org/apache/solr/handler/admin/CollectionsHandler.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java 
b/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
index c61951c76ac..f5ee17d6040 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
@@ -809,7 +809,9 @@ public class CollectionsHandler extends RequestHandlerBase 
implements Permission
 
           final NamedList<Object> status = new NamedList<>();
           if (coreContainer.getDistributedCollectionCommandRunner().isEmpty()) 
{
-            if (zkController.getOverseerCompletedMap().contains(requestId)) {
+            if (zkController.getOverseerRunningMap().contains(requestId)) {
+              addStatusToResponse(status, RUNNING, "found [" + requestId + "] 
in running tasks");
+            } else if 
(zkController.getOverseerCompletedMap().contains(requestId)) {
               final byte[] mapEntry = 
zkController.getOverseerCompletedMap().get(requestId);
               rsp.getValues()
                   
.addAll(OverseerSolrResponseSerializer.deserialize(mapEntry).getResponse());
@@ -820,8 +822,6 @@ public class CollectionsHandler extends RequestHandlerBase 
implements Permission
               rsp.getValues()
                   
.addAll(OverseerSolrResponseSerializer.deserialize(mapEntry).getResponse());
               addStatusToResponse(status, FAILED, "found [" + requestId + "] 
in failed tasks");
-            } else if 
(zkController.getOverseerRunningMap().contains(requestId)) {
-              addStatusToResponse(status, RUNNING, "found [" + requestId + "] 
in running tasks");
             } else if (h.overseerCollectionQueueContains(requestId)) {
               addStatusToResponse(
                   status, SUBMITTED, "found [" + requestId + "] in submitted 
tasks");