From a482904d30b8e2d155b83f21f311686e81f8452d Mon Sep 17 00:00:00 2001 From: trociny Date: Sat, 26 Oct 2013 08:35:54 +0000 Subject: Merging local and remote bitmaps must be protected by hr_amp lock. This is believed to fix hastd crashes, which might occur during synchronization, triggered by the failed assertion: Assertion failed: (amp->am_memtab[ext] > 0), function activemap_write_complete, file activemap.c, line 351. MFC after: 1 week --- sbin/hastd/primary.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sbin/hastd') diff --git a/sbin/hastd/primary.c b/sbin/hastd/primary.c index 09ae17b..bd484e3 100644 --- a/sbin/hastd/primary.c +++ b/sbin/hastd/primary.c @@ -781,6 +781,7 @@ init_remote(struct hast_resource *res, struct proto_conn **inp, free(map); goto close; } + mtx_lock(&res->hr_amp_lock); /* * Merge local and remote bitmaps. */ @@ -790,7 +791,6 @@ init_remote(struct hast_resource *res, struct proto_conn **inp, * Now that we merged bitmaps from both nodes, flush it to the * disk before we start to synchronize. */ - mtx_lock(&res->hr_amp_lock); (void)hast_activemap_flush(res); } nv_free(nvin); -- cgit v1.1