EH: CS-186 show task concurrency in qstat -j job_id

Author: jgabler-hpc

source/clients/common/ocs_client_job.cc

@@ -575,11 +575,15 @@ void cull_show_job(const lListElem *job, int flags, bool show_binding) {
    }
 
    if (lGetPosViaElem(job, JB_ja_structure, SGE_NO_ABORT) >= 0) {
-      u_long32 start, end, step;
-
-      job_get_submit_task_ids(job, &start, &end, &step);
-      if (job_is_array(job))
+      if (job_is_array(job)) {
+         u_long32 start, end, step;
+         job_get_submit_task_ids(job, &start, &end, &step);
          printf("job-array tasks:                " sge_u32 "-" sge_u32 ":" sge_u32 "\n", start, end, step);
+         u_long32 task_concurrency = lGetUlong(job, JB_ja_task_concurrency);
+         if (task_concurrency > 0) {
+            printf("task_concurrency:               " sge_u32 "\n", task_concurrency);
+         }
+      }
    }
 
    if (lGetPosViaElem(job, JB_context, SGE_NO_ABORT) >= 0)

source/libs/sched/sge_job_schedd.cc

@@ -741,17 +741,14 @@ void split_jobs(lList **job_list, u_long32 max_aj_instances,
           max_aj_instances > 0) {
          u_long32 task_concurrency = lGetUlong(job, JB_ja_task_concurrency);
          u_long32 max_aj_conc_instances = max_aj_instances;
-         if(task_concurrency > 0 && task_concurrency < max_aj_instances)
-         {
+         if (task_concurrency > 0 && task_concurrency < max_aj_instances) {
             max_aj_conc_instances = task_concurrency;
          }
          excluded_n_h_ids = n_h_ids;
          n_h_ids = nullptr;
          if (task_instances < max_aj_conc_instances) {
             u_long32 allowed_instances = max_aj_conc_instances - task_instances;
-
-            range_list_move_first_n_ids(&excluded_n_h_ids, nullptr, &n_h_ids,
-                                        allowed_instances);
+            range_list_move_first_n_ids(&excluded_n_h_ids, nullptr, &n_h_ids, allowed_instances);
          }
          target_for_ids = SPLIT_PENDING_EXCLUDED_INSTANCES;
          target_ids = excluded_n_h_ids;

source/libs/sgeobj/sge_job.cc

@@ -3525,7 +3525,7 @@ job_verify_submitted_job(lListElem *job, lList **answer_list)
    if (ret) {
       ret = object_verify_double_null(job, answer_list, JB_wtcontr);
     }
-   /* JB_ja_task_concurrency must be nullptr */
+   // JB_ja_task_concurrency may only be given for array jobs
    if (ret) {
       u_long32 task_concurrency = lGetUlong(job, JB_ja_task_concurrency);
       if (task_concurrency > 0 && !job_is_array(job)) {