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

refactor: shard lock module #853

Merged
merged 9 commits into from
Apr 25, 2023
Merged

refactor: shard lock module #853

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
29ecc69
refactor: shard lock module
ShiKaiWi Apr 21, 2023
a1bcd3b
chore: classify whether the lock release is in purpose
ShiKaiWi Apr 21, 2023
d8488ff
fix: allow ceresmeta restarting
ShiKaiWi Apr 24, 2023
0ef4d0f
fix: wait background keepalive exit before next grant
ShiKaiWi Apr 24, 2023
1f5d952
feat: support retry for keeping alive
ShiKaiWi Apr 24, 2023
ffef0d7
chore: rename mutex and rwlock
ShiKaiWi Apr 24, 2023
9a30d43
fix: allow exit when schedule next keepalive
ShiKaiWi Apr 25, 2023
faecb93
feat: determine rpc_time by ttl
ShiKaiWi Apr 25, 2023
8c8c9d0
chore: comments to explain the retry logic
ShiKaiWi Apr 25, 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
5 changes: 4 additions & 1 deletion cluster/src/cluster_impl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ pub struct ClusterImpl {
}

impl ClusterImpl {
pub async fn create(
pub async fn try_new(
node_name: String,
shard_tables_cache: ShardTablesCache,
meta_client: MetaClientRef,
Expand All @@ -83,6 +83,9 @@ impl ClusterImpl {
shard_lock_key_prefix,
node_name,
etcd_client,
config.etcd_client.shard_lock_lease_ttl_sec,
config.etcd_client.shard_lock_lease_check_interval.0,
config.etcd_client.rpc_timeout.0,
runtime.clone(),
);
Ok(Self {
Expand Down
4 changes: 3 additions & 1 deletion cluster/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ pub struct EtcdClientConfig {
/// Root path in the etcd used by the ceresdb server
pub root_path: String,

/// Timeout to connect to etcd cluster
pub connect_timeout: ReadableDuration,
/// Timeout for each rpc request
pub rpc_timeout: ReadableDuration,

/// The lease of the shard lock in seconds.
Expand All @@ -61,7 +63,7 @@ impl Default for EtcdClientConfig {

rpc_timeout: ReadableDuration::secs(5),
connect_timeout: ReadableDuration::secs(5),
shard_lock_lease_ttl_sec: 15,
shard_lock_lease_ttl_sec: 30,
shard_lock_lease_check_interval: ReadableDuration::millis(200),
}
}
Expand Down
Loading