From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp53.i.mail.ru (smtp53.i.mail.ru [94.100.177.113]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 3F5224696C0 for ; Sun, 24 Nov 2019 00:54:04 +0300 (MSK) From: Ilya Kosarev Date: Sun, 24 Nov 2019 00:53:56 +0300 Message-Id: <66ff4c73f329f83b616eeadbf5ea6f26994ecb4a.1574545667.git.i.kosarev@tarantool.org> In-Reply-To: References: In-Reply-To: References: Subject: [Tarantool-patches] [PATCH v2 2/4] replication: fix appliers pruning List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tarantool-patches@dev.tarantool.org Cc: v.shpilevoy@tarantool.org During pruning of replicaset appliers some anon replicas might connect from replicaset_follow called in another fiber. Therefore we need to prune appliers of anon replicas first. Closes #4643 --- src/box/replication.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/box/replication.cc b/src/box/replication.cc index 509187cd3..3ccfa8b33 100644 --- a/src/box/replication.cc +++ b/src/box/replication.cc @@ -516,23 +516,23 @@ replicaset_update(struct applier **appliers, int count) */ /* Prune old appliers */ - replicaset_foreach(replica) { - if (replica->applier == NULL) - continue; + rlist_foreach_entry_safe(replica, &replicaset.anon, in_anon, next) { applier = replica->applier; replica_clear_applier(replica); - replica->applier_sync_state = APPLIER_DISCONNECTED; + replica_delete(replica); applier_stop(applier); applier_delete(applier); } - rlist_foreach_entry_safe(replica, &replicaset.anon, in_anon, next) { + rlist_create(&replicaset.anon); + replicaset_foreach(replica) { + if (replica->applier == NULL) + continue; applier = replica->applier; replica_clear_applier(replica); - replica_delete(replica); + replica->applier_sync_state = APPLIER_DISCONNECTED; applier_stop(applier); applier_delete(applier); } - rlist_create(&replicaset.anon); /* Save new appliers */ replicaset.applier.total = count; -- 2.17.1