From e2f78e54b5e54b3b199519965c42a9919a95a294 Mon Sep 17 00:00:00 2001 From: Georgy Moshkin <gmoshkin@picodata.io> Date: Mon, 12 Dec 2022 16:44:31 +0300 Subject: [PATCH] fix(governor): don't promote masters after vshard.*.cfg --- src/governor/mod.rs | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/src/governor/mod.rs b/src/governor/mod.rs index 4439675948..7dd84db702 100644 --- a/src/governor/mod.rs +++ b/src/governor/mod.rs @@ -1,5 +1,5 @@ use std::borrow::Cow; -use std::collections::{HashMap, HashSet}; +use std::collections::HashMap; use std::iter::repeat; use std::rc::Rc; use std::time::Duration; @@ -466,32 +466,6 @@ impl Loop { return Continue; } - let res = (|| -> Result<()> { - // Promote the replication leaders again - // because of tarantool bugs - let replicasets = storage.replicasets.iter()?; - let masters = replicasets.map(|r| r.master_id).collect::<HashSet<_>>(); - let commit = raft_storage.commit()?.unwrap(); - let reqs = maybe_responding(&instances) - .filter(|instance| masters.contains(&instance.instance_id)) - .map(|instance| instance.instance_id.clone()) - .zip(repeat(replication::promote::Request { - term, - commit, - timeout: Self::SYNC_TIMEOUT, - })); - // TODO: don't hard code timeout - let res = call_all(pool, reqs, Duration::from_secs(3))?; - for (instance_id, resp) in res { - resp?; - tlog!(Debug, "promoted replicaset master"; "instance_id" => %instance_id); - } - Ok(()) - })(); - if let Err(e) = res { - tlog!(Warning, "failed to promote replicaset masters: {e}"); - } - tlog!(Info, "sharding is initialized"); return Continue; -- GitLab