Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove subscribe_metrics todos. #5801

Merged
merged 2 commits into from
Jun 6, 2022
Merged

Remove subscribe_metrics todos. #5801

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26ba920
Make the stop function reentrant
devillove084 Jun 6, 2022
49a9bd2
Remove todos in subscribe_metrics function
devillove084 Jun 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions metasrv/src/meta_service/raftmeta.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
use std::collections::BTreeSet;
use std::fmt::Debug;
use std::net::Ipv4Addr;
use std::sync::atomic::AtomicI32;
use std::sync::Arc;

use common_base::base::tokio;
Expand Down Expand Up @@ -80,6 +81,7 @@ pub struct MetaNode {
pub running_tx: watch::Sender<()>,
pub running_rx: watch::Receiver<()>,
pub join_handles: Mutex<Vec<JoinHandle<MetaResult<()>>>>,
pub joined_tasks: AtomicI32,
}

impl Opened for MetaNode {
Expand Down Expand Up @@ -132,6 +134,7 @@ impl MetaNodeBuilder {
running_tx: tx,
running_rx: rx,
join_handles: Mutex::new(Vec::new()),
joined_tasks: AtomicI32::new(1),
});

if self.monitor_metrics {
Expand Down Expand Up @@ -317,8 +320,6 @@ impl MetaNode {

#[tracing::instrument(level = "debug", skip(self))]
pub async fn stop(&self) -> MetaResult<i32> {
// TODO(xp): need to be reentrant.

let mut rx = self.raft.metrics();

self.raft
Expand All @@ -338,29 +339,28 @@ impl MetaNode {
}
tracing::info!("shutdown raft");

// raft counts 1
let mut joined = 1;
for j in self.join_handles.lock().await.iter_mut() {
let _rst = j
.await
.map_error_to_meta_error(MetaError::MetaServiceError, || "fail to join")?;
joined += 1;
// TODO(luhuanbing): Add joined node information to enrich debugging information
self.joined_tasks
.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
}

tracing::info!("shutdown: id={}", self.sto.id);
let joined = self.joined_tasks.load(std::sync::atomic::Ordering::Relaxed);
Ok(joined)
}

// spawn a monitor to watch raft state changes such as leader changes,
// and manually add non-voter to cluster so that non-voter receives raft logs.
pub async fn subscribe_metrics(mn: Arc<Self>, mut metrics_rx: watch::Receiver<RaftMetrics>) {
//TODO: return a handle for join
// TODO: every state change triggers add_non_voter!!!
// TODO(luhuanbing): every state change triggers add_non_voter is not very reasonable
let mut running_rx = mn.running_rx.clone();
let mut jh = mn.join_handles.lock().await;
let mut current_leader: Option<u64> = None;

// TODO: reduce dependency: it does not need all of the fields in MetaNode
let mn = mn.clone();

let span = tracing::span!(tracing::Level::INFO, "watch-metrics");
Expand Down Expand Up @@ -392,7 +392,6 @@ impl MetaNode {
}

if cur == mn.sto.id {
// TODO: check result
let _rst = mn.add_configured_non_voters().await;

if _rst.is_err() {
Expand Down