diff --git a/src/lib/swim/swim.c b/src/lib/swim/swim.c index 00234d1df5bcf6d9c95af994c56ced74362fba4e..2b37d41e01ec8ce4e4c13f6a311ecb2e63507794 100644 --- a/src/lib/swim/swim.c +++ b/src/lib/swim/swim.c @@ -1960,6 +1960,8 @@ swim_cfg(struct swim *swim, const char *uri, double heartbeat_rate, } if (! swim_inaddr_eq(&addr, &swim->self->addr)) { swim->self->incarnation++; + swim_on_member_update(swim, swim->self, + SWIM_EV_NEW_INCARNATION); swim_update_member_addr(swim, swim->self, &addr); } if (gc_mode != SWIM_GC_DEFAULT) diff --git a/test/swim/swim.result b/test/swim/swim.result index 535c8c9699726d70f642e510a9ed96921d1dd82b..cceee259509c31d345a688da40ab97340fd48da1 100644 --- a/test/swim/swim.result +++ b/test/swim/swim.result @@ -1293,10 +1293,11 @@ m_list ... e_list --- -- - is_new_payload: true +- - is_update: true + is_new_payload: true is_new_uri: true is_new: true - is_update: true + is_new_incarnation: true ... ctx_list --- diff --git a/test/unit/swim.c b/test/unit/swim.c index 0e33d691cd6b64daa8f3d0f4d2a5fba6278f646d..0977e0969476f387823447add7ac13de040ac70e 100644 --- a/test/unit/swim.c +++ b/test/unit/swim.c @@ -998,7 +998,7 @@ swim_cluster_delete_f(va_list ap) static void swim_test_triggers(void) { - swim_start_test(21); + swim_start_test(22); struct swim_cluster *cluster = swim_cluster_new(2); swim_cluster_set_ack_timeout(cluster, 1); struct trigger_ctx tctx, tctx2; @@ -1085,11 +1085,29 @@ swim_test_triggers(void) fiber_sleep(0); note("now all the triggers are done and deleted"); - free(t1); free(t2); if (tctx.ctx.member != NULL) swim_member_unref(tctx.ctx.member); + /* Check that recfg fires incarnation update trigger. */ + s1 = swim_new(); + struct tt_uuid uuid = uuid_nil; + uuid.time_low = 1; + fail_if(swim_cfg(s1, "127.0.0.1:1", -1, -1, -1, &uuid) != 0); + + memset(&tctx, 0, sizeof(tctx)); + trigger_add(swim_trigger_list_on_member_event(s1), t1); + fail_if(swim_cfg(s1, "127.0.0.1:2", -1, -1, -1, NULL) != 0); + while (tctx.ctx.events == 0) + fiber_sleep(0); + is(tctx.ctx.events, SWIM_EV_NEW_URI | SWIM_EV_NEW_INCARNATION, + "local URI update warns about incarnation update"); + swim_delete(s1); + + if (tctx.ctx.member != NULL) + swim_member_unref(tctx.ctx.member); + free(t1); + swim_finish_test(); } diff --git a/test/unit/swim.result b/test/unit/swim.result index 3ebfe7ea0a5a2057c675f03b07f5aec1b72782dc..2968a2da709924785f620cdeb8c2413e05c1e053 100644 --- a/test/unit/swim.result +++ b/test/unit/swim.result @@ -201,7 +201,7 @@ ok 19 - subtests ok 20 - subtests *** swim_test_slow_net: done *** *** swim_test_triggers *** - 1..21 + 1..22 ok 1 - trigger is fired ok 2 - is not deleted ok 3 - ctx.member is set @@ -224,6 +224,7 @@ ok 20 - subtests ok 20 - non-yielding still is not ok 21 - trigger is not deleted until all currently sleeping triggers are finished # now all the triggers are done and deleted + ok 22 - local URI update warns about incarnation update ok 21 - subtests *** swim_test_triggers: done *** *** main_f: done ***