diff options
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/hastd/primary.c | 19 | ||||
| -rw-r--r-- | sbin/hastd/secondary.c | 1 |
2 files changed, 20 insertions, 0 deletions
diff --git a/sbin/hastd/primary.c b/sbin/hastd/primary.c index 7c7c93b..751929e 100644 --- a/sbin/hastd/primary.c +++ b/sbin/hastd/primary.c @@ -667,6 +667,25 @@ init_remote(struct hast_resource *res, struct proto_conn **inp, res->hr_secondary_localcnt = nv_get_uint64(nvin, "localcnt"); res->hr_secondary_remotecnt = nv_get_uint64(nvin, "remotecnt"); res->hr_syncsrc = nv_get_uint8(nvin, "syncsrc"); + if (nv_exists(nvin, "virgin")) { + /* + * Secondary was reinitialized, bump localcnt if it is 0 as + * only we have the data. + */ + PJDLOG_ASSERT(res->hr_syncsrc == HAST_SYNCSRC_PRIMARY); + PJDLOG_ASSERT(res->hr_secondary_localcnt == 0); + + if (res->hr_primary_localcnt == 0) { + PJDLOG_ASSERT(res->hr_secondary_remotecnt == 0); + + mtx_lock(&metadata_lock); + res->hr_primary_localcnt++; + pjdlog_debug(1, "Increasing localcnt to %ju.", + (uintmax_t)res->hr_primary_localcnt); + (void)metadata_write(res); + mtx_unlock(&metadata_lock); + } + } map = NULL; mapsize = nv_get_uint32(nvin, "mapsize"); if (mapsize > 0) { diff --git a/sbin/hastd/secondary.c b/sbin/hastd/secondary.c index d47f8fa..5d7df68 100644 --- a/sbin/hastd/secondary.c +++ b/sbin/hastd/secondary.c @@ -261,6 +261,7 @@ init_remote(struct hast_resource *res, struct nv *nvin) } else { memset(map, 0xff, mapsize); } + nv_add_int8(nvout, 1, "virgin"); nv_add_uint8(nvout, HAST_SYNCSRC_PRIMARY, "syncsrc"); } else if (res->hr_resuid != resuid) { char errmsg[256]; |
