fix: add missing version for meta request

apache · Oct 24, 2022 · b774b1b · b774b1b
1 parent 09ee196
commit b774b1b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/cluster/src/cluster_impl.rs b/cluster/src/cluster_impl.rs
@@ -70,10 +70,10 @@ impl ClusterImpl {
 
         let handle = self.runtime.spawn(async move {
             loop {
-                let shards_info = inner.shard_tables_cache.all_shard_infos();
-                info!("Node heartbeat to meta, shards info:{:?}", shards_info);
+                let shard_infos = inner.shard_tables_cache.all_shard_infos();
+                info!("Node heartbeat to meta, shard infos:{:?}", shard_infos);
 
-                let resp = inner.meta_client.send_heartbeat(shards_info).await;
+                let resp = inner.meta_client.send_heartbeat(shard_infos).await;
                 let wait = match resp {
                     Ok(()) => interval,
                     Err(e) => {

diff --git a/meta_client/src/meta_impl.rs b/meta_client/src/meta_impl.rs
@@ -219,10 +219,10 @@ impl MetaClient for MetaClientImpl {
         GetNodesResponse::try_from(pb_resp)
     }
 
-    async fn send_heartbeat(&self, shards_info: Vec<ShardInfo>) -> Result<()> {
+    async fn send_heartbeat(&self, shard_infos: Vec<ShardInfo>) -> Result<()> {
         let node_info = NodeInfo {
             node_meta_info: self.node_meta_info.clone(),
-            shards_info,
+            shard_infos,
         };
         let pb_req = meta_service::NodeHeartbeatRequest {
             header: Some(self.request_header().into()),

diff --git a/meta_client/src/types.rs b/meta_client/src/types.rs
@@ -118,7 +118,7 @@ impl NodeMetaInfo {
 #[derive(Debug, Clone)]
 pub struct NodeInfo {
     pub node_meta_info: NodeMetaInfo,
-    pub shards_info: Vec<ShardInfo>,
+    pub shard_infos: Vec<ShardInfo>,
 }
 
 #[derive(Debug, Default, Clone, PartialEq, Eq)]
@@ -171,7 +171,7 @@ impl Default for MetaClientConfig {
 impl From<NodeInfo> for meta_service::NodeInfo {
     fn from(node_info: NodeInfo) -> Self {
         let shard_infos = node_info
-            .shards_info
+            .shard_infos
             .into_iter()
             .map(meta_service::ShardInfo::from)
             .collect();
@@ -193,7 +193,7 @@ impl From<ShardInfo> for meta_service::ShardInfo {
         Self {
             id: shard_info.id,
             role: role as i32,
-            version: 0,
+            version: shard_info.version,
         }
     }
 }

diff --git a/server/src/grpc/meta_event_service/mod.rs b/server/src/grpc/meta_event_service/mod.rs
@@ -59,6 +59,8 @@ macro_rules! handle_request {
                     // considerations.
 
                     let request = request.into_inner();
+                    info!("Receive request from meta, req:{:?}", request);
+
                     [<handle_ $mod_name>](ctx, request).await
                 });
 
@@ -80,6 +82,7 @@ macro_rules! handle_request {
                     }
                 };
 
+                info!("Finish handling request from meta, resp:{:?}", resp);
                 Ok(tonic::Response::new(resp))
             }
         }