Rescheduling including TODO regarding job state machine bug (check th…

…e comment)

diracx-db/src/diracx/db/sql/job/db.py

@@ -292,7 +292,7 @@ async def insert(
             "TimeStamp": datetime.now(tz=timezone.utc),
         }
 
-    async def rescheduleJob(self, job_id) -> dict[str, Any]:
+    async def rescheduleJob(self, job_id, *, reset_counter=False) -> dict[str, Any]:
         """Reschedule given job."""
         from DIRAC.Core.Utilities.ClassAd.ClassAdLight import ClassAd
         from DIRAC.Core.Utilities.ReturnValues import SErrorException
@@ -326,7 +326,10 @@ async def rescheduleJob(self, job_id) -> dict[str, Any]:
                 f"Job {job_id} not Verified: Status {jobAttrs['Status']}, Minor Status: {jobAttrs['MinorStatus']}"
             )
 
-        reschedule_counter = int(jobAttrs["RescheduleCounter"]) + 1
+        if reset_counter:
+            reschedule_counter = 0
+        else:
+            reschedule_counter = int(jobAttrs["RescheduleCounter"]) + 1
 
         # TODO: update maxRescheduling:
         # self.maxRescheduling = self.getCSOption("MaxRescheduling", self.maxRescheduling)
@@ -396,6 +399,9 @@ async def rescheduleJob(self, job_id) -> dict[str, Any]:
         else:
             site = siteList[0]
 
+        ## TODO: Enforce state machine first
+        # then overwrite the other attributes once we know it makes sense
+        # to continue.
         jobAttrs["Site"] = site
 
         jobAttrs["Status"] = JobStatus.RECEIVED

diracx-routers/src/diracx/routers/jobs/status.py

@@ -212,12 +212,14 @@ async def reschedule_bulk_jobs(
 @router.post("/{job_id}/reschedule")
 async def reschedule_single_job(
     job_id: int,
+    reset_job: Annotated[bool, Query()],
     job_db: JobDB,
     check_permissions: CheckWMSPolicyCallable,
 ):
     await check_permissions(action=ActionType.MANAGE, job_db=job_db, job_ids=[job_id])
+
     try:
-        result = await job_db.rescheduleJob(job_id)
+        result = await job_db.rescheduleJob(job_id, reset_counter=reset_job)
     except ValueError as e:
         raise HTTPException(status_code=HTTPStatus.NOT_FOUND, detail=str(e)) from e
     return result