Merge pull request #311 from doyoubi/UpgradeRust

Upgrade rust to 1.55

Author: doyoubi

conf/server-proxy.toml

@@ -12,7 +12,10 @@ slowlog_sample_rate = 1000
 thread_number = 2
 
 backend_conn_num = 2
-backend_batch_strategy = "fixed"
+# "disabled" should be good enough for most cases.
+# For larger throughput with pipline enabled,
+# we can try "fixed" or "dynamic" for higher throughput.
+backend_batch_strategy = "disabled"
 # In bytes
 backend_flush_size = 1024
 # In nanoseconds

examples/Dockerfile-undermoon-release

@@ -1,19 +1,19 @@
 # Use https://crates.io/crates/cargo-chef to cache dependencies.
 
-FROM rust:1.51-buster as planner
+FROM rust:1.55-buster as planner
 WORKDIR /undermoon
 RUN cargo install cargo-chef
 COPY src /undermoon/src
 COPY Cargo.toml Cargo.lock /undermoon/
 RUN cargo chef prepare  --recipe-path recipe.json
 
-FROM rust:1.51-buster as cacher
+FROM rust:1.55-buster as cacher
 WORKDIR /undermoon
 RUN cargo install cargo-chef
 COPY --from=planner /undermoon/recipe.json recipe.json
 RUN cargo chef cook --release --recipe-path recipe.json
 
-FROM rust:1.51-buster as builder
+FROM rust:1.55-buster as builder
 WORKDIR /undermoon
 COPY src /undermoon/src
 COPY Cargo.toml Cargo.lock /undermoon/

examples/Dockerfile-undermoon-test

@@ -1,19 +1,19 @@
 # Use https://crates.io/crates/cargo-chef to cache dependencies.
 
-FROM rust:1.51-buster as planner
+FROM rust:1.55-buster as planner
 WORKDIR /undermoon
 RUN cargo install cargo-chef
 COPY src /undermoon/src
 COPY Cargo.toml Cargo.lock /undermoon/
 RUN cargo chef prepare  --recipe-path recipe.json
 
-FROM rust:1.51-buster as cacher
+FROM rust:1.55-buster as cacher
 WORKDIR /undermoon
 RUN cargo install cargo-chef
 COPY --from=planner /undermoon/recipe.json recipe.json
 RUN cargo chef cook --recipe-path recipe.json
 
-FROM rust:1.51-buster as builder
+FROM rust:1.55-buster as builder
 WORKDIR /undermoon
 COPY src /undermoon/src
 COPY Cargo.toml Cargo.lock /undermoon/

src/bin/server_proxy.rs

@@ -65,9 +65,9 @@ fn gen_conf() -> Result<ServerProxyConfig, &'static str> {
             "disabled" => BatchStrategy::Disabled,
             "fixed" => BatchStrategy::Fixed,
             "dynamic" => BatchStrategy::Dynamic,
-            _ => BatchStrategy::Fixed,
+            _ => BatchStrategy::Disabled,
         })
-        .unwrap_or_else(|_| BatchStrategy::Fixed);
+        .unwrap_or_else(|_| BatchStrategy::Disabled);
     let backend_flush_size =
         NonZeroUsize::new(s.get::<usize>("backend_flush_size").unwrap_or(1024))
             .ok_or("backend_flush_size")?;

src/migration/manager.rs

@@ -25,6 +25,7 @@ use std::sync::Arc;
 type TaskRecord<T> = Either<Arc<dyn MigratingTask<Task = T>>, Arc<dyn ImportingTask<Task = T>>>;
 struct MgrTask<T: CmdTask> {
     task: TaskRecord<T>,
+    #[allow(dyn_drop)]
     _stop_handle: Option<Box<dyn Drop + Send + Sync + 'static>>,
 }
 type ClusterTask<T> = HashMap<MigrationTaskMeta, Arc<MgrTask<T>>>;

src/migration/scan_task.rs

@@ -449,6 +449,7 @@ where
         self.range_map.contains_slot(slot)
     }
 
+    #[allow(dyn_drop)]
     fn get_stop_handle(&self) -> Option<Box<dyn Drop + Send + Sync + 'static>> {
         let handle = MigratingTaskHandle {
             task: self.task.clone(),
@@ -644,6 +645,7 @@ where
         self.range_map.contains_slot(slot)
     }
 
+    #[allow(dyn_drop)]
     fn get_stop_handle(&self) -> Option<Box<dyn Drop + Send + Sync + 'static>> {
         let handle = ImportingTaskHandle {
             meta: self.meta.clone(),

src/migration/task.rs

@@ -100,6 +100,9 @@ pub trait MigratingTask: ThreadSafe {
     ) -> BoxFuture<Result<(), ClusterSendError<BlockingHintTask<Self::Task>>>>;
     fn get_state(&self) -> MigrationState;
     fn contains_slot(&self, slot: usize) -> bool;
+    // Rust implements `drop` for all types.
+    // We just explicitly tag `Drop` here for better understanding.
+    #[allow(dyn_drop)]
     fn get_stop_handle(&self) -> Option<Box<dyn Drop + Send + Sync + 'static>>;
 }
 
@@ -114,6 +117,9 @@ pub trait ImportingTask: ThreadSafe {
     ) -> Result<(), ClusterSendError<BlockingHintTask<Self::Task>>>;
     fn get_state(&self) -> MigrationState;
     fn contains_slot(&self, slot: usize) -> bool;
+    // Rust implements `drop` for all types.
+    // We just explicitly tag `Drop` here for better understanding.
+    #[allow(dyn_drop)]
     fn get_stop_handle(&self) -> Option<Box<dyn Drop + Send + Sync + 'static>>;
     fn handle_switch(
         &self,