chore: do some small refactor

Signed-off-by: themanforfree <[email protected]>
xline-kv · Feb 16, 2024 · 1f17be2 · 1f17be2
1 parent 7f249e7
commit 1f17be2
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 27 deletions.
diff --git a/crates/curp/src/server/storage/db.rs b/crates/curp/src/server/storage/db.rs
@@ -82,12 +82,12 @@ impl<C: Command> StorageApi for DB<C> {
         ops.push(WriteOperation::new_put(
             CF,
             CLUSTER_ID.to_vec(),
-            bincode::serialize(&cluster_info.cluster_id())?,
+            cluster_info.cluster_id().to_be_bytes().to_vec(),
         ));
         ops.push(WriteOperation::new_put(
             CF,
             MEMBER_ID.to_vec(),
-            bincode::serialize(&cluster_info.self_id())?,
+            cluster_info.self_id().to_be_bytes().to_vec(),
         ));
         for m in cluster_info.all_members_vec() {
             ops.push(WriteOperation::new_put(
@@ -102,16 +102,22 @@ impl<C: Command> StorageApi for DB<C> {
 
     #[inline]
     fn recover_cluster_info(&self) -> Result<Option<ClusterInfo>, StorageError> {
-        let cluster_id = self
-            .db
-            .get(CF, CLUSTER_ID)?
-            .map(|bytes| bincode::deserialize::<u64>(&bytes))
-            .transpose()?;
-        let member_id = self
-            .db
-            .get(CF, MEMBER_ID)?
-            .map(|bytes| bincode::deserialize::<u64>(&bytes))
-            .transpose()?;
+        let cluster_id = self.db.get(CF, CLUSTER_ID)?.map(|bytes| {
+            u64::from_be_bytes(
+                bytes
+                    .as_slice()
+                    .try_into()
+                    .unwrap_or_else(|e| unreachable!("cannot decode index from backend, {e:?}")),
+            )
+        });
+        let member_id = self.db.get(CF, MEMBER_ID)?.map(|bytes| {
+            u64::from_be_bytes(
+                bytes
+                    .as_slice()
+                    .try_into()
+                    .unwrap_or_else(|e| unreachable!("cannot decode index from backend, {e:?}")),
+            )
+        });
         let mut members = vec![];
         for (_k, v) in self.db.get_all(MEMBERS_CF)? {
             let member = Member::decode(v.as_ref())?;

diff --git a/crates/simulation/src/curp_group.rs b/crates/simulation/src/curp_group.rs
@@ -204,7 +204,7 @@ impl CurpGroup {
     pub async fn crash(&mut self, id: ServerId) {
         let handle = madsim::runtime::Handle::current();
         handle.kill(id.to_string());
-        madsim::time::sleep(Duration::from_secs(2)).await;
+        madsim::time::sleep(Duration::from_secs(10)).await;
         if !handle.is_exit(id.to_string()) {
             panic!("failed to crash node: {id}");
         }

diff --git a/crates/simulation/src/xline_group.rs b/crates/simulation/src/xline_group.rs
@@ -5,9 +5,8 @@ use madsim::runtime::NodeHandle;
 use tonic::transport::Channel;
 use tracing::debug;
 use utils::config::{
-    default_quota, AuthConfig, ClientConfig, ClientConfig, ClusterConfig, CompactConfig,
-    CompactConfig, CurpConfig, CurpConfig, EngineConfig, InitialClusterState, ServerTimeout,
-    ServerTimeout, StorageConfig, StorageConfig, TlsConfig,
+    AuthConfig, ClientConfig, ClusterConfig, CompactConfig, CurpConfig, InitialClusterState,
+    ServerTimeout, StorageConfig, TlsConfig,
 };
 use xline::server::XlineServer;
 use xline_client::{
@@ -123,18 +122,18 @@ impl XlineGroup {
         self.nodes.get(name).unwrap()
     }
 
-    pub async fn crash(&mut self, id: ServerId) {
+    pub async fn crash(&mut self, name: &str) {
         let handle = madsim::runtime::Handle::current();
-        handle.kill(id.to_string());
-        madsim::time::sleep(Duration::from_secs(2)).await;
-        if !handle.is_exit(id.to_string()) {
-            panic!("failed to crash node: {id}");
+        handle.kill(name);
+        madsim::time::sleep(Duration::from_secs(10)).await;
+        if !handle.is_exit(name) {
+            panic!("failed to crash node: {name}");
         }
     }
 
-    pub async fn restart(&mut self, id: ServerId) {
+    pub async fn restart(&mut self, name: &str) {
         let handle = madsim::runtime::Handle::current();
-        handle.restart(id.to_string());
+        handle.restart(name);
     }
 }
 

diff --git a/crates/simulation/tests/it/xline.rs b/crates/simulation/tests/it/xline.rs
@@ -52,8 +52,7 @@ async fn watch_compacted_revision_should_receive_canceled_response() {
 async fn xline_members_restore() {
     init_logger();
     let mut group = XlineGroup::new(3).await;
-    let node = group.get_node_by_name("S1");
-    let node_id = node.id;
+    let node = group.get_node("S1");
     let addr = node.addr.clone();
     let client = SimEtcdClient::new(addr, group.client_handle.clone()).await;
 
@@ -70,10 +69,10 @@ async fn xline_members_restore() {
         .await
         .unwrap();
     assert_eq!(members.members.len(), 4);
-    group.crash(node_id).await;
+    group.crash("S1").await;
     sleep(Duration::from_secs(10)).await;
 
-    group.restart(node_id).await;
+    group.restart("S1").await;
     sleep(Duration::from_secs(10)).await;
     let members = client
         .member_list(MemberListRequest::new(false))