Support post_exec on Raftstore Proxy

.github/workflows/pr-ci.yml

@@ -58,19 +58,21 @@ jobs:
           export ENGINE_LABEL_VALUE=tiflash
           export RUST_BACKTRACE=full
           cargo check
-          cargo test --features compat_new_proxy --package tests --test proxy normal
+          cargo test --features compat_old_proxy --package tests --test failpoints cases::test_normal
+          cargo test --features compat_old_proxy --package tests --test failpoints cases::test_bootstrap
+          cargo test --features compat_old_proxy --package tests --test failpoints cases::test_compact_log
+          cargo test --features compat_old_proxy --package tests --test failpoints cases::test_early_apply
+          cargo test --features compat_old_proxy --package tests --test failpoints cases::test_encryption
+          cargo test --features compat_old_proxy --package tests --test failpoints cases::test_pd_client
+          cargo test --features compat_old_proxy --package tests --test failpoints cases::test_pending_peers
+          cargo test --features compat_old_proxy --package tests --test failpoints cases::test_transaction
+          cargo test --features compat_old_proxy --package tests --test failpoints cases::test_cmd_epoch_checker
+          cargo test --features compat_old_proxy --package tests --test failpoints cases::test_disk_full
+          cargo test --features compat_old_proxy --package tests --test failpoints cases::test_snap
+          cargo test --features compat_old_proxy --package tests --test failpoints cases::test_merge
+          cargo test --features compat_old_proxy --package tests --test failpoints cases::test_import_service
+          cargo test --features compat_old_proxy --package tests --test failpoints cases::test_proxy_replica_read
+          # tests based on new-mock-engine-store, with compat for new proxy
+          cargo test --package tests --test proxy normal
+          # tests based on new-mock-engine-store, for some tests not available for new proxy
           cargo test --package tests --test proxy proxy
-          cargo test --package tests --test failpoints cases::test_normal
-          cargo test --package tests --test failpoints cases::test_bootstrap
-          cargo test --package tests --test failpoints cases::test_compact_log
-          cargo test --package tests --test failpoints cases::test_early_apply
-          cargo test --package tests --test failpoints cases::test_encryption
-          cargo test --package tests --test failpoints cases::test_pd_client
-          cargo test --package tests --test failpoints cases::test_pending_peers
-          cargo test --package tests --test failpoints cases::test_transaction
-          cargo test --package tests --test failpoints cases::test_cmd_epoch_checker
-          cargo test --package tests --test failpoints cases::test_disk_full
-          cargo test --package tests --test failpoints cases::test_snap
-          cargo test --package tests --test failpoints cases::test_merge
-          cargo test --package tests --test failpoints cases::test_import_service
-          cargo test --package tests --test failpoints cases::test_proxy_replica_read

Cargo.toml

@@ -38,7 +38,7 @@ cloud-azure = [
   "encryption_export/cloud-azure",
   "sst_importer/cloud-azure",
 ]
-testexport = ["raftstore/testexport", "api_version/testexport"]
+testexport = ["raftstore/testexport", "api_version/testexport", "engine_tiflash/testexport"]
 test-engine-kv-rocksdb = [
   "engine_test/test-engine-kv-rocksdb"
 ]
@@ -58,7 +58,8 @@ cloud-storage-grpc = ["sst_importer/cloud-storage-grpc"]
 cloud-storage-dylib = ["sst_importer/cloud-storage-dylib"]
 pprof-dwarf = ["pprof/backtrace-rs"]
 pprof-fp = ["pprof/frame-pointer"]
-compat_new_proxy = ["engine_tiflash/compat_new_proxy"]
+compat_new_proxy = ["engine_tiflash/compat_new_proxy", "raftstore/compat_new_proxy"]
+compat_old_proxy = ["engine_tiflash/compat_old_proxy", "raftstore/compat_old_proxy"]
 
 # for testing configure propegate to other crates
 # https://stackoverflow.com/questions/41700543/can-we-share-test-utilites-between-crates

components/cdc/src/delegate.rs

@@ -446,6 +446,7 @@ impl Delegate {
         for cmd in batch.into_iter(self.region_id) {
             let Cmd {
                 index,
+                term: _,
                 mut request,
                 mut response,
             } = cmd;

components/proxy_server/src/proxy.rs

@@ -83,7 +83,7 @@ pub unsafe fn run_proxy(
 
     let matches = App::new("RaftStore Proxy")
         .about("RaftStore proxy to connect TiKV cluster")
-        .author("tongzhigao@pingcap.com")
+        .author("tongzhigao@pingcap.com;luorongzhen@pingcap.com")
         .version(crate::proxy_version_info().as_ref())
         .long_version(crate::proxy_version_info().as_ref())
         .arg(
@@ -308,6 +308,7 @@ pub unsafe fn run_proxy(
                 fatal!("unknown configuration options: {}", e);
             }
         }
+        crate::config::address_proxy_config(&mut config);
         println!("config check successful");
         process::exit(0)
     }

components/raftstore/Cargo.toml

@@ -27,6 +27,8 @@ test-engines-panic = [
 cloud-aws = ["sst_importer/cloud-aws"]
 cloud-gcp = ["sst_importer/cloud-gcp"]
 cloud-azure = ["sst_importer/cloud-azure"]
+compat_new_proxy = ["engine_tiflash/compat_new_proxy"]
+compat_old_proxy = ["engine_tiflash/compat_old_proxy"]
 
 [dependencies]
 batch-system = { path = "../batch-system", default-features = false }