Skip to content

Commit

Permalink
jsc,job,wreck: change key from lwj to jobid for consistency
Browse files Browse the repository at this point in the history
  • Loading branch information
SteVwonder committed Apr 1, 2018
1 parent 1e7d621 commit 3c1fa79
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/common/libjsc/jstatctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,7 @@ static int send_state_event (flux_t *h, job_state_t st, int64_t j)
jsc_job_num2state (st));
goto done;
}
if ((msg = flux_event_pack (topic, "{ s:I }", "lwj", j)) == NULL) {
if ((msg = flux_event_pack (topic, "{ s:I }", "jobid", j)) == NULL) {
flux_log_error (h, "flux_event_pack");
goto done;
}
Expand Down Expand Up @@ -1137,7 +1137,7 @@ static void job_state_cb (flux_t *h, flux_msg_handler_t *mh,
if (flux_msg_get_topic (msg, &topic) < 0)
goto done;

if (flux_event_unpack (msg, NULL, "{ s:I }", "lwj", &jobid) < 0) {
if (flux_event_unpack (msg, NULL, "{ s:I }", "jobid", &jobid) < 0) {
flux_log (h, LOG_ERR, "%s: bad message", __FUNCTION__);
goto done;
}
Expand Down
2 changes: 1 addition & 1 deletion src/modules/wreck/job.c
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ static void send_create_event (flux_t *h, int64_t id,
walltime = val;

msg = flux_event_pack (topic, "{s:I,s:s,s:i,s:i,s:i,s:i}",
"lwj", id, "kvs_path", path,
"jobid", id, "kvs_path", path,
"ntasks", ntasks,
"ncores", ncores,
"nnodes", nnodes,
Expand Down
2 changes: 1 addition & 1 deletion src/modules/wreck/wrexecd.c
Original file line number Diff line number Diff line change
Expand Up @@ -1127,7 +1127,7 @@ void send_job_state_event (struct prog_ctx *ctx, const char *state)
}

if ((msg = flux_event_pack (topic, "{ s:I, s:s }",
"lwj", ctx->id,
"jobid", ctx->id,
"kvs_path", ctx->kvspath)) == NULL) {
wlog_err (ctx, "flux_event_pack: %s", flux_strerror (errno));
goto out;
Expand Down

0 comments on commit 3c1fa79

Please sign in to comment.