Apache Solr open-source search software
SOLR-17092: Fix race condition for async request status when using Overseer (#3391)
Houston Putmanfc65fa3c8181
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.javaindex 3b22b3072e5..85cc036d9ed 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@@ -805,7 +805,9 @@ public class CollectionsHandler extends RequestHandlerBase implements Permissionfinal 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());@@ -816,8 +818,6 @@ public class CollectionsHandler extends RequestHandlerBase implements Permissionrsp.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");