mirror of
https://github.com/shareAI-lab/analysis_claude_code.git
synced 2026-05-06 16:26:16 +08:00
Merge pull request #123: prevent task claiming race condition in s11
Add double-checked validation inside _claim_lock: verify task owner, status, and blockedBy before claiming. Check claim_task return value in idle loop to skip failed claims.
This commit is contained in:
@@ -142,6 +142,14 @@ def claim_task(task_id: int, owner: str) -> str:
|
|||||||
if not path.exists():
|
if not path.exists():
|
||||||
return f"Error: Task {task_id} not found"
|
return f"Error: Task {task_id} not found"
|
||||||
task = json.loads(path.read_text())
|
task = json.loads(path.read_text())
|
||||||
|
if task.get("owner"):
|
||||||
|
existing_owner = task.get("owner") or "someone else"
|
||||||
|
return f"Error: Task {task_id} has already been claimed by {existing_owner}"
|
||||||
|
if task.get("status") != "pending":
|
||||||
|
status = task.get("status")
|
||||||
|
return f"Error: Task {task_id} cannot be claimed because its status is '{status}'"
|
||||||
|
if task.get("blockedBy"):
|
||||||
|
return f"Error: Task {task_id} is blocked by other task(s) and cannot be claimed yet"
|
||||||
task["owner"] = owner
|
task["owner"] = owner
|
||||||
task["status"] = "in_progress"
|
task["status"] = "in_progress"
|
||||||
path.write_text(json.dumps(task, indent=2))
|
path.write_text(json.dumps(task, indent=2))
|
||||||
@@ -274,7 +282,9 @@ class TeammateManager:
|
|||||||
unclaimed = scan_unclaimed_tasks()
|
unclaimed = scan_unclaimed_tasks()
|
||||||
if unclaimed:
|
if unclaimed:
|
||||||
task = unclaimed[0]
|
task = unclaimed[0]
|
||||||
claim_task(task["id"], name)
|
result = claim_task(task["id"], name)
|
||||||
|
if result.startswith("Error:"):
|
||||||
|
continue
|
||||||
task_prompt = (
|
task_prompt = (
|
||||||
f"<auto-claimed>Task #{task['id']}: {task['subject']}\n"
|
f"<auto-claimed>Task #{task['id']}: {task['subject']}\n"
|
||||||
f"{task.get('description', '')}</auto-claimed>"
|
f"{task.get('description', '')}</auto-claimed>"
|
||||||
|
|||||||
Reference in New Issue
Block a user