Continuation of commit 0c7bd6d0

src/api/job_step_info.c

@@ -169,16 +169,10 @@ slurm_sprint_job_step_info ( job_step_info_t * job_step_ptr,
 				 job_step_ptr->array_job_id,
 				 job_step_ptr->array_task_id);
 		} else if (job_step_ptr->step_id == SLURM_EXTERN_CONT) {
-			/* Pending used to be the same id as the
-			 * extern step. At EOL 16.05 the state check
-			 * below can go away.
-			 */
 			snprintf(tmp_line, sizeof(tmp_line),
-				 "StepId=%u_%u.%s ",
+				 "StepId=%u_%u.Extern ",
 				 job_step_ptr->array_job_id,
-				 job_step_ptr->array_task_id,
-				 (job_step_ptr->state == JOB_PENDING) ?
-				 "TBD" : "Extern");
+				 job_step_ptr->array_task_id);
 		} else {
 			snprintf(tmp_line, sizeof(tmp_line), "StepId=%u_%u.%u ",
 				 job_step_ptr->array_job_id,
@@ -189,18 +183,12 @@ slurm_sprint_job_step_info ( job_step_info_t * job_step_ptr,
 	} else {
 		if (job_step_ptr->step_id == SLURM_PENDING_STEP) {
 			snprintf(tmp_line, sizeof(tmp_line),
-				 "StepId=%u_%u.TBD ",
-				 job_step_ptr->array_job_id,
-				 job_step_ptr->array_task_id);
+				 "StepId=%u.TBD ",
+				 job_step_ptr->job_id);
 		} else if (job_step_ptr->step_id == SLURM_EXTERN_CONT) {
-			/* Pending used to be the same id as the
-			 * extern step. At EOL 16.05 the state check
-			 * below can go away.
-			 */
-			snprintf(tmp_line, sizeof(tmp_line), "StepId=%u.%s ",
-				 job_step_ptr->job_id,
-				 (job_step_ptr->state == JOB_PENDING) ?
-				 "TBD" : "Extern");
+			snprintf(tmp_line, sizeof(tmp_line),
+				 "StepId=%u.Extern ",
+				 job_step_ptr->job_id);
 		} else {
 			snprintf(tmp_line, sizeof(tmp_line), "StepId=%u.%u ",
 				 job_step_ptr->job_id, job_step_ptr->step_id);

src/squeue/print.c

@@ -2017,9 +2017,12 @@ int _print_step_id(job_step_info_t * step, int width, bool right, char* suffix)
 	if (step == NULL) {	/* Print the Header instead */
 		_print_str("STEPID", width, right, true);
 	} else if (step->array_job_id) {
-		if (step->step_id == INFINITE) {	/* Pending */
+		if (step->step_id == SLURM_PENDING_STEP) {	/* Pending */
 			snprintf(id, FORMAT_STRING_SIZE, "%u_%u.TBD",
 				 step->array_job_id, step->array_task_id);
+		} else if (step->step_id == SLURM_EXTERN_CONT) {
+			snprintf(id, FORMAT_STRING_SIZE, "%u_%u.Extern",
+				 step->array_job_id, step->array_task_id);
 		} else {
 			snprintf(id, FORMAT_STRING_SIZE, "%u_%u.%u",
 				 step->array_job_id, step->array_task_id,
@@ -2027,8 +2030,12 @@ int _print_step_id(job_step_info_t * step, int width, bool right, char* suffix)
 		}
 		_print_str(id, width, right, true);
 	} else {
-		if (step->step_id == INFINITE) {	/* Pending */
-			snprintf(id, FORMAT_STRING_SIZE, "%u.TBD", step->job_id);
+		if (step->step_id == SLURM_PENDING_STEP) {	/* Pending */
+			snprintf(id, FORMAT_STRING_SIZE, "%u.TBD",
+				 step->job_id);
+		} else if (step->step_id == SLURM_EXTERN_CONT) {
+			snprintf(id, FORMAT_STRING_SIZE, "%u.Extern",
+				 step->job_id);
 		} else {
 			snprintf(id, FORMAT_STRING_SIZE, "%u.%u",
 				 step->job_id, step->step_id);