]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
ctdb-daemon: Reset push_started flag once DB_PUSH_CONFIRM is done
authorAmitay Isaacs <amitay@gmail.com>
Wed, 8 Jun 2016 05:04:52 +0000 (15:04 +1000)
committerAmitay Isaacs <amitay@samba.org>
Wed, 8 Jun 2016 12:31:52 +0000 (14:31 +0200)
Once DB_PUSH_START is processed as part of recovery, push_started
flag tracks if there are multiple attempts to send DB_PUSH_START.
In DB_PUSH_CONFIRM, once the record count is confirmed, all information
related to DB_PUSH should be reset.  However, The push_started flag was
not reset when the push_state was reset.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Autobuild-User(master): Amitay Isaacs <amitay@samba.org>
Autobuild-Date(master): Wed Jun  8 14:31:52 CEST 2016 on sn-devel-144

ctdb/server/ctdb_recover.c

index 52734d179b80f4b75ad95f3fe9f435d534423ee4..3486e722e61511d16237743832407cc1e32fc1ca 100644 (file)
@@ -744,6 +744,7 @@ int32_t ctdb_control_db_push_confirm(struct ctdb_context *ctdb,
        outdata->dsize = sizeof(uint32_t);
 
        talloc_free(state);
+       ctdb_db->push_started = false;
        ctdb_db->push_state = NULL;
 
        return 0;