adapt

Signed-off-by: Calvin Neo <calvinneo1995@gmail.com>
pingcap · Jan 21, 2025 · 3f2efb3 · 3f2efb3
1 parent a89e7c1
commit 3f2efb3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/proxy_components/mock-engine-store/src/mock_cluster/v1/cluster.rs b/proxy_components/mock-engine-store/src/mock_cluster/v1/cluster.rs
@@ -10,7 +10,6 @@ use std::{
 
 use collections::{HashMap, HashSet};
 use encryption::DataKeyManager;
-use engine_traits::Iterator;
 // mock cluster
 use engine_traits::{Engines, KvEngine, CF_DEFAULT};
 use file_system::IoRateLimiter;
@@ -79,7 +78,7 @@ impl Drop for CallbackLeakDetector {
 
         debug!("before capture");
         let bt = std::backtrace::Backtrace::capture();
-        warn!("callback is dropped"; "backtrace" => ?bt);
+        debug!("callback is dropped"; "backtrace" => ?bt);
     }
 }
 

diff --git a/proxy_components/proxy_server/src/run.rs b/proxy_components/proxy_server/src/run.rs
@@ -49,6 +49,7 @@ use kvproto::{
     raft_serverpb::RaftMessage,
 };
 use pd_client::{PdClient, RpcClient};
+use raft::eraftpb::MessageType;
 use raft_log_engine::RaftLogEngine;
 use raftstore::{
     coprocessor::{config::SplitCheckConfigManager, CoprocessorHost, RegionInfoAccessor},
@@ -139,15 +140,20 @@ impl TiFlashGrpcMessageFilter {
 }
 
 impl RaftGrpcMessageFilter for TiFlashGrpcMessageFilter {
-    fn should_reject_raft_message(&self, _: &RaftMessage) -> bool {
+    fn should_reject_raft_message(&self, m: &RaftMessage) -> bool {
         fail::fail_point!("tiflash_force_reject_raft_append_message", |_| true);
 
         if self.reject_messages_on_memory_ratio < f64::EPSILON {
             return false;
         }
 
+        if m.get_message().get_msg_type() != MessageType::MsgAppend {
+            return false;
+        }
+
         let mut usage = 0;
-        memory_usage_reaches_high_water(&mut usage)
+        let b = memory_usage_reaches_high_water(&mut usage);
+        b
     }
 
     fn should_reject_snapshot(&self) -> bool {
@@ -158,7 +164,8 @@ impl RaftGrpcMessageFilter for TiFlashGrpcMessageFilter {
         }
 
         let mut usage = 0;
-        memory_usage_reaches_high_water(&mut usage)
+        let b = memory_usage_reaches_high_water(&mut usage);
+        b
     }
 }
 

diff --git a/proxy_scripts/ci_check.sh b/proxy_scripts/ci_check.sh
@@ -44,6 +44,7 @@ elif [[ $M == "testnew" ]]; then
     export ENGINE_LABEL_VALUE=tiflash
     export RUST_BACKTRACE=full
     export ENABLE_FEATURES="test-engine-kv-rocksdb test-engine-raft-raft-engine openssl-vendored"
+    export LOG_LEVEL=INFO
     cargo check --package proxy_server --features="$ENABLE_FEATURES"
     # tests based on mock-engine-store, with compat for new proxy
     LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib cargo test --package proxy_tests --features="$ENABLE_FEATURES" --test proxy shared::jemalloc --features="jemalloc"