sched-simple: parse full sched.free request

Problem: sched-simple doesn't parse the entire sched.free payload.

Parse 'id' and 'final' and include them in LOG_DEBUG output.
Update housekeeping test to expect "(final)" in partial release tests.

Author: garlick

src/modules/sched-simple/sched.c

@@ -343,7 +343,11 @@ static void check_cb (flux_reactor_t *r,
     }
 }
 
-static int try_free (flux_t *h, struct simple_sched *ss, json_t *R)
+static int try_free (flux_t *h,
+                     struct simple_sched *ss,
+                     flux_jobid_t id,
+                     json_t *R,
+                     bool final)
 {
     int rc = -1;
     char *r = NULL;
@@ -358,8 +362,14 @@ static int try_free (flux_t *h, struct simple_sched *ss, json_t *R)
     r = rlist_dumps (alloc);
     if ((rc = rlist_free (ss->rlist, alloc)) < 0)
         flux_log_error (h, "free: %s", r);
-    else
-        flux_log (h, LOG_DEBUG, "free: %s", r);
+    else {
+        flux_log (h,
+                  LOG_DEBUG,
+                  "free: %s %s%s",
+                  r,
+                  idf58 (id),
+                  final ? " (final)" : "");
+    }
     free (r);
     rlist_destroy (alloc);
     return rc;
@@ -369,13 +379,20 @@ void free_cb (flux_t *h, const flux_msg_t *msg, const char *R_str, void *arg)
 {
     struct simple_sched *ss = arg;
     json_t *R;
+    flux_jobid_t id;
+    int final = 0;
 
-    if (flux_request_unpack (msg, NULL, "{s:o}", "R", &R) < 0) {
+    if (flux_request_unpack (msg,
+                             NULL,
+                             "{s:I s:o s?b}",
+                             "id", &id,
+                             "R", &R,
+                             "final", &final) < 0) {
         flux_log (h, LOG_ERR, "free: error unpacking sched.free request");
         return;
     }
 
-    if (try_free (h, ss, R) < 0) {
+    if (try_free (h, ss, id, R, final) < 0) {
         flux_log_error (h, "free: could not free R");
         return;
     }

t/t2226-housekeeping.t

@@ -109,7 +109,8 @@ test_expect_success 'nodes were returned to scheduler separately' '
 	grep "free: rank0" sched.log &&
 	grep "free: rank1" sched.log &&
 	grep "free: rank2" sched.log &&
-	grep "free: rank3" sched.log
+	grep "free: rank3" sched.log &&
+	test $(grep final sched.log | wc -l) -eq 1
 '
 test_expect_success 'create housekeeping script with one 10s straggler' '
 	cat >housekeeping2.sh <<-EOT &&
@@ -147,7 +148,7 @@ test_expect_success 'housekeeping script ran on ranks 0-3' '
 test_expect_success 'there was one alloc and two frees to the scheduler' '
 	flux dmesg -H | grep sched-simple >sched2.log &&
 	grep "free: rank\[0-2\]" sched2.log &&
-	grep "free: rank3" sched2.log
+	grep "free: rank3.*(final)" sched2.log
 '
 test_expect_success 'configuring housekeeping with bad key fails' '
 	test_must_fail flux config load 2>load.err <<-EOT &&