TA: CS-2229 deleted_by: reschedule (reschedule_unknown, qmod -r) — set JR_deleted_by on the pseudo job report

Author: jgabler-hpc

doc/markdown/man/man1/qacct.md

@@ -70,8 +70,9 @@ printed. If neither a name nor an ID is given all jobs are enlisted. This option
 `qacct`. If activated, CPU times are no longer accumulated but the "raw" accounting information is printed in a 
 formatted form instead. Seexxqs_name_sxx_accounting(5) for an explanation of the displayed information.
 
-For a job that was deleted, the output additionally contains a `deleted_by` line identifying who deleted the
-job (see the *deleted_by* attribute in xxqs_name_sxx_accounting(5)).
+For a job that was deleted, killed for exceeding a resource limit, or whose run was
+rescheduled by qmaster or by `qmod -r`, the output additionally contains a `deleted_by`
+line identifying the actor (see the *deleted_by* attribute in xxqs_name_sxx_accounting(5)).
 
 ## -l *attr=val,...*  
 A resource requirement specification which must be met by the queues in which the jobs being accounted were 

doc/markdown/man/man5/sge_accounting.md

@@ -48,14 +48,18 @@ The department which was assigned to the job.
 
 ## *deleted_by*
 
-Information about who deleted the job, in the form `<user>@<host>`.
+Information about who deleted (or terminated) the current run of the job, in the form
+`<user>@<host>`.
 
 When the job was deleted with the `qdel` command it contains the user and the host of the
 `qdel` request. When the job was killed because it exceeded a resource limit (e.g. `h_rt`) it
 contains `execd@<host>` if the limit was enforced by the execution daemon, or `qmaster@<host>`
-if it was enforced by the qmaster.
+if it was enforced by the qmaster. When the run was terminated because qmaster rescheduled
+the job (for example after a `reschedule_unknown` timeout fired on the execution host) it
+contains `qmaster@<master-host>`. When a run was rescheduled via `qmod -rj`/`qmod -rq` it
+contains the user and host that issued the `qmod` request.
 
-The attribute is absent if the job was not deleted.
+The attribute is absent if the job was not deleted or rescheduled.
 
 (JSONL only)
 
@@ -236,7 +240,7 @@ Values are contained in the following structure and order:
 * category
 * failed
 * exit_status
-* deleted_by (optional, present if the job was deleted)
+* deleted_by (optional, present if the job was deleted or rescheduled)
 * usage - array containing all rusage values
    * rusage
    * ru_wallclock

doc/markdown/man/man5/sge_reporting.md

@@ -175,7 +175,10 @@ For the contents and structure of the accounting records see xxqs_name_sxx_accou
 
 When a job was deleted before it finished, the acct record additionally contains a *deleted_by*
 attribute holding `<user>@<host>` of the `qdel` request, or `execd@<host>` / `qmaster@<host>` when
-the job was killed for exceeding a resource limit. This attribute is emitted only to the JSONL
+the job was killed for exceeding a resource limit. The same attribute is also written when
+qmaster rescheduled the run automatically (e.g. after a `reschedule_unknown` timeout) — in that
+case it holds `qmaster@<master-host>` — or when an operator issued `qmod -rj`/`qmod -rq`, in which
+case it holds `<user>@<host>` of the `qmod` caller. This attribute is emitted only to the JSONL
 reporting format.
 
 ## online_usage