ctdb-recoverd: Avoid duplicate recoverd event in parallel recovery
authorAmitay Isaacs <amitay@gmail.com>
Wed, 8 Jun 2016 04:15:22 +0000 (14:15 +1000)
committerKarolin Seeger <kseeger@samba.org>
Thu, 9 Jun 2016 14:46:52 +0000 (16:46 +0200)
commit8acad0e0f9bb73b70fc3b2fceef4fdf960239cad
treefa07cca33aa32d4ccba8a6eeff7a05896f26180d
parentfb89732ce8831d3e6c9b26ef6148a7c758df95bb
ctdb-recoverd: Avoid duplicate recoverd event in parallel recovery

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11956

In do_recovery, after the recovery and takeover is complete, recoverd
event is triggered.  When the parallel database recovery was separated,
ctdb_recovery_helper implemented sending END_RECOVERY control which
causes recoverd event to be triggered.  So when there is parallel database
recovery, recoverd event is triggered twice.

Instead move the call to run_recovered_eventscript() explicitly in
the serial recovery code path.  This avoids the duplication trigger of
recoverd event.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
(cherry picked from commit ecb74721e78942e66aaf2d2f88f141305e311328)

Autobuild-User(v4-4-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-4-test): Thu Jun  9 16:46:53 CEST 2016 on sn-devel-144
ctdb/server/ctdb_recoverd.c