dsmiley commented on code in PR #2304:
URL: https://github.com/apache/solr/pull/2304#discussion_r1643412352
##########
solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java:
##########
@@ -497,42 +534,23 @@ public void submitAsyncTask(TaskObject taskObject) throws
SolrException {
}
}
- /** Helper method to add a task to a tracking type. */
- private void addTask(String type, TaskObject o, boolean limit) {
- synchronized (getRequestStatusMap(type)) {
- if (limit && getRequestStatusMap(type).size() == MAX_TRACKED_REQUESTS)
{
- String key =
getRequestStatusMap(type).entrySet().iterator().next().getKey();
- getRequestStatusMap(type).remove(key);
- }
- addTask(type, o);
- }
- }
+ private void addTask(TaskObject taskObject) {
+ // Ensure task ID is not already in use
+ TaskObject taskInCache = requestStatusCache.get(taskObject.taskId, n ->
taskObject);
- private void addTask(String type, TaskObject o) {
- synchronized (getRequestStatusMap(type)) {
- getRequestStatusMap(type).put(o.taskId, o);
- }
- }
-
- /** Helper method to remove a task from a tracking map. */
- private void removeTask(String map, String taskId) {
- synchronized (getRequestStatusMap(map)) {
- getRequestStatusMap(map).remove(taskId);
- }
- }
-
- private void ensureTaskIdNotInUse(String taskId) throws SolrException {
- if (getRequestStatusMap(RUNNING).containsKey(taskId)
- || getRequestStatusMap(COMPLETED).containsKey(taskId)
- || getRequestStatusMap(FAILED).containsKey(taskId)) {
+ // If we get a different task instance, it means one was already in the
cache with the
+ // same name. Just reject the new one.
+ if (taskInCache != taskObject) {
throw new SolrException(
ErrorCode.BAD_REQUEST, "Duplicate request with the same requestid
found.");
}
+
+ taskObject.status = RUNNING;
+ requestStatusCache.put(taskObject.taskId, taskObject);
Review Comment:
In the lambda providing the new taskObject, you could set to RUNNING there.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For additional commands, e-mail: issues-h...@solr.apache.org
