add docker file; restart recover (#156)

Makefile

@@ -22,3 +22,14 @@ build:
 
 test:
 	cargo test --features=$(features)
+
+images: manager-image server-image client-image
+
+manager-image:
+	docker build -t manager -f docker/manager/Dockerfile . --no-cache
+
+server-image:
+	docker build -t server -f docker/server/Dockerfile .
+
+client-image:
+	docker build -t client -f docker/client/Dockerfile .

docker/client/Dockerfile

@@ -0,0 +1,10 @@
+FROM debian:bullseye-20221205
+
+RUN apt update && apt upgrade -y && apt-mark unhold libcap2 && \
+    apt install -y libfuse3-3 libfuse2 libibverbs1 && \
+    apt clean && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+COPY target/debug/client /usr/local/bin/client
+
+ENTRYPOINT ["/usr/local/bin/client"]

docker/manager/Dockerfile

@@ -0,0 +1,10 @@
+FROM debian:bullseye-20221205
+
+RUN apt update && apt upgrade -y && apt-mark unhold libcap2 && \
+    apt install -y libfuse3-3 libfuse2 libibverbs1 && \
+    apt clean && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+COPY target/debug/manager /usr/local/bin/manager
+
+ENTRYPOINT ["/usr/local/bin/manager"]

docker/server/Dockerfile

@@ -0,0 +1,10 @@
+FROM debian:bullseye-20221205
+
+RUN apt update && apt upgrade -y && apt-mark unhold libcap2 && \
+    apt install -y libfuse3-3 libfuse2 libibverbs1 && \
+    apt clean && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+COPY target/debug/server /usr/local/bin/server
+
+ENTRYPOINT ["/usr/local/bin/server"]

examples/manager.yaml

@@ -8,9 +8,5 @@ all_servers_address:
  - 127.0.0.1:8089
 virtual_nodes:
   100
-heartbeat:
-  false
 log_level:
   warn
-protect_threshold:
-  0.5

scripts/test_run_all.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
 
 function finish() {
-    sudo rm -rf ~/fs
     trap 'kill $(jobs -p)' EXIT
     exit $1
 }
@@ -51,7 +50,7 @@ done
 
 sleep 3
 
-./target/debug/client --log-level $log_level create test1 100000
+./target/debug/client --log-level $log_level create-volume test1 100000
 
 ./target/debug/client --log-level $log_level daemon&
 sleep 3

src/bin/manager.rs

@@ -17,15 +17,11 @@ struct Args {
     #[arg(long)]
     address: Option<String>,
     #[arg(long)]
-    protect_threshold: Option<String>,
-    #[arg(long)]
     config_file: Option<String>,
     /// To use customized configuration or not. If this flag is used, please provide a config file through --config_file <path>
     #[arg(long)]
     use_config_file: bool,
     #[arg(long)]
-    heartbeat: Option<bool>,
-    #[arg(long)]
     log_level: Option<String>,
     #[arg(long)]
     all_servers_address: Option<Vec<String>>,
@@ -36,10 +32,8 @@ struct Args {
 #[derive(Debug, Serialize, Deserialize)]
 struct Properties {
     address: String,
-    protect_threshold: String,
     all_servers_address: Vec<String>,
     virtual_nodes: usize,
-    heartbeat: bool,
     log_level: String,
 }
 
@@ -89,16 +83,12 @@ async fn main() -> anyhow::Result<()> {
         }
         false => Properties {
             address: args.address.unwrap_or(default_properties.address),
-            protect_threshold: args
-                .protect_threshold
-                .unwrap_or(default_properties.protect_threshold),
             all_servers_address: args
                 .all_servers_address
                 .unwrap_or(default_properties.all_servers_address),
             virtual_nodes: args
                 .virtual_nodes
                 .unwrap_or(default_properties.virtual_nodes),
-            heartbeat: args.heartbeat.unwrap_or(default_properties.heartbeat),
             log_level: args.log_level.unwrap_or(default_properties.log_level),
         },
     };

src/client/fuse_client.rs

@@ -7,7 +7,7 @@ use crate::common::hash_ring::HashRing;
 use crate::common::serialization::{
     ClusterStatus, CreateDirSendMetaData, CreateFileSendMetaData, DeleteDirSendMetaData,
     DeleteFileSendMetaData, FileAttrSimple, OpenFileSendMetaData, OperationType,
-    ReadDirSendMetaData, ReadFileSendMetaData, WriteFileSendMetaData,
+    ReadDirSendMetaData, ReadFileSendMetaData, Volume, WriteFileSendMetaData,
 };
 use crate::common::{errors, sender};
 use crate::rpc;
@@ -213,6 +213,16 @@ impl Client {
             .await
     }
 
+    pub async fn list_volumes(&self) -> Result<Vec<Volume>, i32> {
+        let mut volumes: Vec<Volume> = Vec::new();
+
+        for server_address in self.hash_ring.read().as_ref().unwrap().get_server_lists() {
+            let mut new_volumes = self.sender.list_volumes(&server_address).await?;
+            volumes.append(&mut new_volumes);
+        }
+        Ok(volumes)
+    }
+
     pub async fn delete_servers(&self, servers_info: Vec<String>) -> Result<(), i32> {
         self.sender
             .delete_servers(&self.manager_address.lock().await, servers_info)
@@ -248,6 +258,12 @@ impl Client {
             .await
     }
 
+    pub async fn delete_volume(&self, name: &str) -> Result<(), i32> {
+        self.sender
+            .delete_volume(&self.get_connection_address(name), name)
+            .await
+    }
+
     pub async fn lookup_remote(&self, parent: u64, name: OsString, reply: ReplyEntry) {
         info!(
             "lookup_remote, parent: {}, name: {}",