micropelago/garage
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make less things public

Browse Source
This commit is contained in:
Alex Auvolat 2020-12-12 17:58:19 +01:00
parent e72c6d0575
commit 8956db2a81
3 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rpc/lib.rs
View File

@ -5,4 +5,4 @@ pub mod consul;
pub mod membership; pub mod membership;
pub mod rpc_client; pub mod rpc_client;
pub mod rpc_server; pub mod rpc_server;
pub mod tls_util; pub(crate) mod tls_util;

47
src/rpc/membership.rs
View File

@ -46,13 +46,13 @@ impl RpcMessage for Message {}
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]
pub struct PingMessage { pub struct PingMessage {
pub id: UUID, id: UUID,
pub rpc_port: u16, rpc_port: u16,
pub status_hash: Hash, status_hash: Hash,
pub config_version: u64, config_version: u64,
pub state_info: StateInfo, state_info: StateInfo,
} }
#[derive(Clone, Debug, Serialize, Deserialize)] #[derive(Clone, Debug, Serialize, Deserialize)]
@ -81,12 +81,13 @@ pub struct NetworkConfigEntry {
pub struct System { pub struct System {
pub id: UUID, pub id: UUID,
pub data_dir: PathBuf,
pub rpc_local_port: u16,
pub state_info: StateInfo, metadata_dir: PathBuf,
rpc_local_port: u16,
pub rpc_http_client: Arc<RpcHttpClient>, state_info: StateInfo,
rpc_http_client: Arc<RpcHttpClient>,
rpc_client: Arc<RpcClient<Message>>, rpc_client: Arc<RpcClient<Message>>,
pub status: watch::Receiver<Arc<Status>>, pub status: watch::Receiver<Arc<Status>>,
@ -296,15 +297,15 @@ fn read_network_config(metadata_dir: &PathBuf) -> Result<NetworkConfig, Error> {
impl System { impl System {
pub fn new( pub fn new(
data_dir: PathBuf, metadata_dir: PathBuf,
rpc_http_client: Arc<RpcHttpClient>, rpc_http_client: Arc<RpcHttpClient>,
background: Arc<BackgroundRunner>, background: Arc<BackgroundRunner>,
rpc_server: &mut RpcServer, rpc_server: &mut RpcServer,
) -> Arc<Self> { ) -> Arc<Self> {
let id = gen_node_id(&data_dir).expect("Unable to read or generate node ID"); let id = gen_node_id(&metadata_dir).expect("Unable to read or generate node ID");
info!("Node ID: {}", hex::encode(&id)); info!("Node ID: {}", hex::encode(&id));
let net_config = match read_network_config(&data_dir) { let net_config = match read_network_config(&metadata_dir) {
Ok(x) => x, Ok(x) => x,
Err(e) => { Err(e) => {
info!( info!(
@ -347,7 +348,7 @@ impl System {
let sys = Arc::new(System { let sys = Arc::new(System {
id, id,
data_dir, metadata_dir,
rpc_local_port: rpc_server.bind_addr.port(), rpc_local_port: rpc_server.bind_addr.port(),
state_info, state_info,
rpc_http_client, rpc_http_client,
@ -388,7 +389,7 @@ impl System {
} }
async fn save_network_config(self: Arc<Self>) -> Result<(), Error> { async fn save_network_config(self: Arc<Self>) -> Result<(), Error> {
let mut path = self.data_dir.clone(); let mut path = self.metadata_dir.clone();
path.push("network_config"); path.push("network_config");
let ring = self.ring.borrow().clone(); let ring = self.ring.borrow().clone();
@ -399,7 +400,7 @@ impl System {
Ok(()) Ok(())
} }
pub fn make_ping(&self) -> Message { fn make_ping(&self) -> Message {
let status = self.status.borrow().clone(); let status = self.status.borrow().clone();
let ring = self.ring.borrow().clone(); let ring = self.ring.borrow().clone();
Message::Ping(PingMessage { Message::Ping(PingMessage {
@ -411,7 +412,7 @@ impl System {
}) })
} }
pub async fn broadcast(self: Arc<Self>, msg: Message, timeout: Duration) { async fn broadcast(self: Arc<Self>, msg: Message, timeout: Duration) {
let status = self.status.borrow().clone(); let status = self.status.borrow().clone();
let to = status let to = status
.nodes .nodes
@ -527,7 +528,7 @@ impl System {
} }
} }
pub async fn handle_ping( async fn handle_ping(
self: Arc<Self>, self: Arc<Self>,
from: &SocketAddr, from: &SocketAddr,
ping: &PingMessage, ping: &PingMessage,
@ -557,7 +558,7 @@ impl System {
Ok(self.make_ping()) Ok(self.make_ping())
} }
pub fn handle_pull_status(&self) -> Result<Message, Error> { fn handle_pull_status(&self) -> Result<Message, Error> {
let status = self.status.borrow().clone(); let status = self.status.borrow().clone();
let mut mem = vec![]; let mut mem = vec![];
for (node, status) in status.nodes.iter() { for (node, status) in status.nodes.iter() {
@ -577,12 +578,12 @@ impl System {
Ok(Message::AdvertiseNodesUp(mem)) Ok(Message::AdvertiseNodesUp(mem))
} }
pub fn handle_pull_config(&self) -> Result<Message, Error> { fn handle_pull_config(&self) -> Result<Message, Error> {
let ring = self.ring.borrow().clone(); let ring = self.ring.borrow().clone();
Ok(Message::AdvertiseConfig(ring.config.clone())) Ok(Message::AdvertiseConfig(ring.config.clone()))
} }
pub async fn handle_advertise_nodes_up( async fn handle_advertise_nodes_up(
self: Arc<Self>, self: Arc<Self>,
adv: &[AdvertisedNode], adv: &[AdvertisedNode],
) -> Result<Message, Error> { ) -> Result<Message, Error> {
@ -635,7 +636,7 @@ impl System {
Ok(Message::Ok) Ok(Message::Ok)
} }
pub async fn handle_advertise_config( async fn handle_advertise_config(
self: Arc<Self>, self: Arc<Self>,
adv: &NetworkConfig, adv: &NetworkConfig,
) -> Result<Message, Error> { ) -> Result<Message, Error> {
@ -716,7 +717,7 @@ impl System {
} }
} }
pub fn pull_status( fn pull_status(
self: Arc<Self>, self: Arc<Self>,
peer: UUID, peer: UUID,
) -> impl futures::future::Future<Output = ()> + Send + 'static { ) -> impl futures::future::Future<Output = ()> + Send + 'static {
@ -731,7 +732,7 @@ impl System {
} }
} }
pub async fn pull_config(self: Arc<Self>, peer: UUID) { async fn pull_config(self: Arc<Self>, peer: UUID) {
let resp = self let resp = self
.rpc_client .rpc_client
.call(peer, Message::PullConfig, PING_TIMEOUT) .call(peer, Message::PullConfig, PING_TIMEOUT)

6
src/rpc/rpc_client.rs
View File

@ -61,7 +61,7 @@ pub struct RpcClient<M: RpcMessage> {
local_handler: ArcSwapOption<(UUID, LocalHandlerFn<M>)>, local_handler: ArcSwapOption<(UUID, LocalHandlerFn<M>)>,
pub rpc_addr_client: RpcAddrClient<M>, rpc_addr_client: RpcAddrClient<M>,
} }
impl<M: RpcMessage + 'static> RpcClient<M> { impl<M: RpcMessage + 'static> RpcClient<M> {
@ -215,8 +215,8 @@ impl<M: RpcMessage + 'static> RpcClient<M> {
pub struct RpcAddrClient<M: RpcMessage> { pub struct RpcAddrClient<M: RpcMessage> {
phantom: PhantomData<M>, phantom: PhantomData<M>,
pub http_client: Arc<RpcHttpClient>, http_client: Arc<RpcHttpClient>,
pub path: String, path: String,
} }
impl<M: RpcMessage> RpcAddrClient<M> { impl<M: RpcMessage> RpcAddrClient<M> {