Skip to content

Commit 73b5a75

Browse files
authored
Merge pull request #5152 from garlick/issue#5151
broker: signal readiness to systemd in JOIN state
2 parents 53e0875 + dfc5532 commit 73b5a75

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

doc/requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
sphinx==3.4.3
22
sphinx-rtd-theme>=0.5.2
33
docutils>=0.14,<0.18
4+
urllib3<2

src/broker/state_machine.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,12 +220,13 @@ static void action_join (struct state_machine *s)
220220
sd_notifyf (0,
221221
"STATUS=Joining Flux instance via %s",
222222
overlay_get_parent_uri (s->ctx->overlay));
223-
if (s->ctx->rank > 0)
224-
sd_notify (0, "READY=1");
225223
}
226224
#endif
227225
join_check_parent (s);
228226
}
227+
#if HAVE_LIBSYSTEMD
228+
sd_notify (0, "READY=1");
229+
#endif
229230
}
230231

231232
static void quorum_timer_cb (flux_reactor_t *r,
@@ -365,8 +366,6 @@ static void action_run (struct state_machine *s)
365366
"STATUS=Running as %s of %d node Flux instance",
366367
s->ctx->rank == 0 ? "leader" : "member",
367368
(int)s->ctx->size);
368-
if (s->ctx->rank == 0)
369-
sd_notify (0, "READY=1");
370369
}
371370
#endif
372371
}

0 commit comments

Comments
 (0)