resolved_ts: fix check_leader to tiflash proxy (tikv#13312) (tikv#13360)

ref tikv#12092, close tikv#13310, ref tikv#13312 For TiFlash proxy, should use store.peer_address instead of store.address. For TiKV, always use the same peer_address and address, so the change won't affect. Signed-off-by: ti-srebot <[email protected]> Co-authored-by: hehechen <[email protected]> Co-authored-by: Ti Chi Robot <[email protected]>
ti-chi-bot · Dec 8, 2022 · f8ecf0b · f8ecf0b
1 parent deb149e
commit f8ecf0b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/components/resolved_ts/src/advance.rs b/components/resolved_ts/src/advance.rs
@@ -382,7 +382,7 @@ async fn get_tikv_client(
         CString::new("random id").unwrap(),
         CONN_ID.fetch_add(1, Ordering::SeqCst),
     );
-    let channel = security_mgr.connect(cb, &store.address);
+    let channel = security_mgr.connect(cb, &store.peer_address);
     let cli = TikvClient::new(channel);
     clients.insert(store_id, cli.clone());
     RTS_TIKV_CLIENT_INIT_DURATION_HISTOGRAM.observe(start.saturating_elapsed_secs());

diff --git a/src/server/node.rs b/src/server/node.rs
@@ -105,8 +105,10 @@ where
         store.set_id(INVALID_ID);
         if cfg.advertise_addr.is_empty() {
             store.set_address(cfg.addr.clone());
+            store.set_peer_address(cfg.addr.clone());
         } else {
-            store.set_address(cfg.advertise_addr.clone())
+            store.set_address(cfg.advertise_addr.clone());
+            store.set_peer_address(cfg.advertise_addr.clone());
         }
         if cfg.advertise_status_addr.is_empty() {
             store.set_status_address(cfg.status_addr.clone());