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.

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

feat(meta): introduce consistent hash logic #626

Merged
merged 7 commits into from
Mar 3, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions proto/common.proto
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ enum WorkerType {
UNKNOWN = 2;
}

message ParallelUnit {
yezizp2012 marked this conversation as resolved.
Show resolved Hide resolved
uint32 id = 1;
}

message WorkerNode {
enum State {
STARTING = 0;
Expand All @@ -40,6 +44,8 @@ message WorkerNode {
WorkerType type = 2;
HostAddress host = 3;
State state = 4;
// a mapping from logical key to parallel unit, with logical key as the index of array
repeated ParallelUnit parallel_units = 5;
}

// A cluster can be either a set of OLAP compute nodes, or a set of streaming compute nodes.
Expand All @@ -48,3 +54,7 @@ message Cluster {
repeated common.WorkerNode nodes = 2;
map<string, string> config = 3;
}

message HashMapping {
repeated ParallelUnit parallel_units = 1;
xx01cyx marked this conversation as resolved.
Show resolved Hide resolved
}
5 changes: 4 additions & 1 deletion rust/frontend/src/scheduler/plan_fragmenter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ mod tests {

use std::sync::Arc;

use risingwave_pb::common::{WorkerNode, WorkerType};
use risingwave_pb::common::{ParallelUnit, WorkerNode, WorkerType};
use risingwave_pb::plan::JoinType;

use crate::optimizer::plan_node::{
Expand Down Expand Up @@ -308,18 +308,21 @@ mod tests {
r#type: WorkerType::ComputeNode as i32,
host: None,
state: risingwave_pb::common::worker_node::State::Running as i32,
parallel_units: vec![ParallelUnit { id: 1 }],
};
let worker2 = WorkerNode {
id: 1,
r#type: WorkerType::ComputeNode as i32,
host: None,
state: risingwave_pb::common::worker_node::State::Running as i32,
parallel_units: vec![ParallelUnit { id: 2 }],
};
let worker3 = WorkerNode {
id: 2,
r#type: WorkerType::ComputeNode as i32,
host: None,
state: risingwave_pb::common::worker_node::State::Running as i32,
parallel_units: vec![ParallelUnit { id: 3 }],
};
let workers = vec![worker1.clone(), worker2.clone(), worker3.clone()];
let worker_node_manager = Arc::new(WorkerNodeManager::mock(workers));
Expand Down
55 changes: 49 additions & 6 deletions rust/meta/src/cluster/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,34 @@ use risingwave_common::error::ErrorCode::InternalError;
use risingwave_common::error::{Result, RwError};
use risingwave_common::try_match_expand;
use risingwave_pb::common::worker_node::State;
use risingwave_pb::common::{HostAddress, WorkerNode, WorkerType};
use risingwave_pb::common::{HostAddress, ParallelUnit, WorkerNode, WorkerType};
use risingwave_pb::meta::subscribe_response::{Info, Operation};

use crate::hummock::HummockManager;
use crate::manager::{IdCategory, IdGeneratorManagerRef, MetaSrvEnv, NotificationManagerRef};
use crate::manager::{
HashDispatchManager, HashDispatchManagerRef, IdCategory, IdGeneratorManagerRef, MetaSrvEnv,
NotificationManagerRef,
};
use crate::model::{MetadataModel, Worker};
use crate::storage::MetaStore;

pub type NodeId = u32;
pub type ParallelUnitId = u32;
pub type NodeLocations = HashMap<NodeId, WorkerNode>;
pub type StoredClusterManagerRef<S> = Arc<StoredClusterManager<S>>;

const DEFAULT_WORKNODE_PARALLEL_DEGREE: usize = 8;

/// [`StoredClusterManager`] manager cluster/worker meta data in [`MetaStore`].
pub struct StoredClusterManager<S> {
meta_store_ref: Arc<S>,
id_gen_manager_ref: IdGeneratorManagerRef<S>,
hummock_manager_ref: Option<Arc<HummockManager<S>>>,
dispatch_manager_ref: HashDispatchManagerRef<S>,
workers: DashMap<WorkerKey, Worker>,
nm: NotificationManagerRef,
}

pub type StoredClusterManagerRef<S> = Arc<StoredClusterManager<S>>;

pub struct WorkerKey(pub HostAddress);

impl PartialEq<Self> for WorkerKey {
Expand Down Expand Up @@ -62,15 +68,23 @@ where
"Worker::list fail"
)?;
let worker_map = DashMap::new();
let mut compute_nodes = Vec::new();

workers.iter().for_each(|w| {
worker_map.insert(WorkerKey(w.key().unwrap()), w.clone());
if w.worker_type() == WorkerType::ComputeNode {
compute_nodes.push(w.worker_node());
}
});

let dispatch_manager_ref =
xx01cyx marked this conversation as resolved.
Show resolved Hide resolved
Arc::new(HashDispatchManager::new(&compute_nodes, meta_store_ref.clone()).await?);

Ok(Self {
meta_store_ref,
id_gen_manager_ref: env.id_gen_manager_ref(),
hummock_manager_ref,
dispatch_manager_ref,
workers: worker_map,
nm,
})
Expand All @@ -84,19 +98,42 @@ where
match self.workers.entry(WorkerKey(host_address.clone())) {
Entry::Occupied(o) => Ok((o.get().to_protobuf(), false)),
Entry::Vacant(v) => {
let id = self
let worker_id = self
.id_gen_manager_ref
.generate::<{ IdCategory::Worker }>()
.await?;

let mut parallel_units = Vec::with_capacity(DEFAULT_WORKNODE_PARALLEL_DEGREE);
let start_id = self
.id_gen_manager_ref
.generate_interval::<{ IdCategory::ParallelUnit }>(
DEFAULT_WORKNODE_PARALLEL_DEGREE as i32,
)
.await? as usize;
for parallel_unit_id in start_id..start_id + DEFAULT_WORKNODE_PARALLEL_DEGREE {
parallel_units.push(ParallelUnit {
id: parallel_unit_id as u32,
});
}

let worker_node = WorkerNode {
id: id as u32,
id: worker_id as u32,
r#type: r#type as i32,
host: Some(host_address.clone()),
state: State::Starting as i32,
parallel_units,
};

let worker = Worker::from_protobuf(worker_node.clone());
worker.insert(&*self.meta_store_ref).await?;

// Alter consistent hash mapping
if r#type == WorkerType::ComputeNode {
self.dispatch_manager_ref
.add_worker_mapping(&worker.worker_node())
.await?;
}

Ok((v.insert(worker).to_protobuf(), true))
}
}
Expand Down Expand Up @@ -161,6 +198,12 @@ where
.release_context_resource(entry.1.to_protobuf().id)
.await?;
}
let worker = entry.1;
if worker.worker_type() == WorkerType::ComputeNode {
self.dispatch_manager_ref
.delete_worker_mapping(&worker.worker_node())
.await?;
}
Ok(())
}
}
Expand Down
1 change: 1 addition & 0 deletions rust/meta/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#![feature(binary_heap_drain_sorted)]
#![feature(const_fn_trait_bound)]
#![feature(option_result_contains)]
#![feature(map_first_last)]

mod barrier;
pub mod cluster;
Expand Down
Loading