Skip to content

feat: refine meta election logic #7669

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

Merged
merged 6 commits into from
Feb 3, 2023
Merged

feat: refine meta election logic #7669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b8b37b9
use multi meta addr
shanicky Jan 31, 2023
407f16a
fix unit test
shanicky Feb 3, 2023
a54fcfe
remove address mode
shanicky Feb 3, 2023
36ba9ef
add ut
shanicky Feb 3, 2023
a0937b1
fix comma
shanicky Feb 3, 2023
7c85d69
Merge branch 'main' into peng/refine-meta-election
mergify[bot] Feb 3, 2023
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
13 changes: 8 additions & 5 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

157 changes: 87 additions & 70 deletions dashboard/proto/gen/meta.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 0 additions & 27 deletions proto/leader.proto
View file
Open in desktop

This file was deleted.

26 changes: 15 additions & 11 deletions proto/meta.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,17 +255,6 @@ service NotificationService {
rpc Subscribe(SubscribeRequest) returns (stream SubscribeResponse);
}

message MetaLeaderInfo {
string node_address = 1;
uint64 lease_id = 2;
}

message MetaLeaseInfo {
MetaLeaderInfo leader = 1;
uint64 lease_register_time = 2;
uint64 lease_expire_time = 3;
}

message PauseRequest {}

message PauseResponse {}
Expand Down Expand Up @@ -303,3 +292,18 @@ service ScaleService {
rpc GetClusterInfo(GetClusterInfoRequest) returns (GetClusterInfoResponse);
rpc Reschedule(RescheduleRequest) returns (RescheduleResponse);
}

message MembersRequest {}

message MetaMember {
common.HostAddress address = 1;
bool is_leader = 2;
}

message MembersResponse {
repeated MetaMember members = 1;
}

service MetaMemberService {
rpc Members(MembersRequest) returns (MembersResponse);
}
7 changes: 0 additions & 7 deletions src/common/src/util/addr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,9 @@ use std::net::SocketAddr;
use std::str::FromStr;

use risingwave_pb::common::HostAddress as ProstHostAddress;
use risingwave_pb::meta::MetaLeaderInfo;

use crate::error::{internal_error, Result};

pub fn leader_info_to_host_addr(mli: MetaLeaderInfo) -> HostAddr {
mli.node_address
.parse::<HostAddr>()
.expect("invalid leader addr")
}

/// General host address and port.
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub struct HostAddr {
Expand Down
4 changes: 1 addition & 3 deletions src/meta/src/hummock/manager/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ use risingwave_pb::hummock::{
HummockVersionDelta, HummockVersionDeltas, HummockVersionStats, IntraLevelDelta, LevelType,
};
use risingwave_pb::meta::subscribe_response::{Info, Operation};
use risingwave_pb::meta::MetaLeaderInfo;
use tokio::sync::oneshot::Sender;
use tokio::sync::{Notify, RwLockReadGuard, RwLockWriteGuard};
use tokio::task::JoinHandle;
Expand Down Expand Up @@ -128,7 +127,7 @@ macro_rules! commit_multi_var {
$val_txn.apply_to_txn(&mut trx)?;
)*
// Commit to state store
$hummock_mgr.commit_trx($hummock_mgr.env.meta_store(), trx, $context_id, $hummock_mgr.env.get_leader_info())
$hummock_mgr.commit_trx($hummock_mgr.env.meta_store(), trx, $context_id)
.await?;
// Upon successful commit, commit the change to local in-mem state
$(
Expand Down Expand Up @@ -491,7 +490,6 @@ where
meta_store: &S,
trx: Transaction,
context_id: Option<HummockContextId>,
_info: MetaLeaderInfo,
) -> Result<()> {
if let Some(context_id) = context_id {
if context_id == META_NODE_ID {
Expand Down
Loading