fix conflict

Signed-off-by: Connor1996 <zbk602423539@gmail.com>
tikv · May 28, 2024 · 9737e2a · 9737e2a
1 parent 495091b
commit 9737e2a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 26 deletions.
diff --git a/components/raftstore/src/store/fsm/store.rs b/components/raftstore/src/store/fsm/store.rs
@@ -33,12 +33,8 @@ use engine_traits::{
 use fail::fail_point;
 use file_system::{IoType, WithIoType};
 use futures::{compat::Future01CompatExt, FutureExt};
-<<<<<<< HEAD
 use grpcio_health::HealthService;
-=======
-use health_controller::{types::LatencyInspector, HealthController};
 use itertools::Itertools;
->>>>>>> 8ab73504d8 (raftstore: Add slow log for peer and store msg (#16605))
 use keys::{self, data_end_key, data_key, enc_end_key, enc_start_key};
 use kvproto::{
     metapb::{self, Region, RegionEpoch},
@@ -65,18 +61,9 @@ use tikv_util::{
     mpsc::{self, LooseBoundedSender, Receiver},
     slow_log,
     store::{find_peer, region_on_stores},
-<<<<<<< HEAD
     sys as sys_util,
     sys::disk::{get_disk_status, DiskUsage},
-    time::{duration_to_sec, monotonic_raw_now, Instant as TiInstant},
-=======
-    sys::{
-        self as sys_util,
-        cpu_time::ProcessStat,
-        disk::{get_disk_status, DiskUsage},
-    },
     time::{duration_to_sec, monotonic_raw_now, Instant as TiInstant, SlowTimer},
->>>>>>> 8ab73504d8 (raftstore: Add slow log for peer and store msg (#16605))
     timer::SteadyTimer,
     warn,
     worker::{LazyWorker, Scheduler, Worker},

diff --git a/components/raftstore/src/store/msg.rs b/components/raftstore/src/store/msg.rs
@@ -882,10 +882,6 @@ where
         inspector: LatencyInspector,
     },
 
-    /// Message only used for test.
-    #[cfg(any(test, feature = "testexport"))]
-    Validate(Box<dyn FnOnce(&crate::store::Config) + Send>),
-
     UnsafeRecoveryReport(pdpb::StoreReport),
     UnsafeRecoveryCreatePeer {
         syncer: UnsafeRecoveryExecutePlanSyncer,
@@ -897,6 +893,10 @@ where
     AwakenRegions {
         abnormal_stores: Vec<u64>,
     },
+
+    /// Message only used for test.
+    #[cfg(any(test, feature = "testexport"))]
+    Validate(Box<dyn FnOnce(&crate::store::Config) + Send>),
 }
 
 impl<EK: KvEngine> ResourceMetered for StoreMsg<EK> {}
@@ -922,8 +922,6 @@ where
             ),
             StoreMsg::Tick(tick) => write!(fmt, "StoreTick {:?}", tick),
             StoreMsg::Start { ref store } => write!(fmt, "Start store {:?}", store),
-            #[cfg(any(test, feature = "testexport"))]
-            StoreMsg::Validate(_) => write!(fmt, "Validate config"),
             StoreMsg::UpdateReplicationMode(_) => write!(fmt, "UpdateReplicationMode"),
             StoreMsg::LatencyInspect { .. } => write!(fmt, "LatencyInspect"),
             StoreMsg::UnsafeRecoveryReport(..) => write!(fmt, "UnsafeRecoveryReport"),
@@ -932,6 +930,8 @@ where
             }
             StoreMsg::GcSnapshotFinish => write!(fmt, "GcSnapshotFinish"),
             StoreMsg::AwakenRegions { .. } => write!(fmt, "AwakenRegions"),
+            #[cfg(any(test, feature = "testexport"))]
+            StoreMsg::Validate(_) => write!(fmt, "Validate config"),
         }
     }
 }
@@ -945,14 +945,14 @@ impl<EK: KvEngine> StoreMsg<EK> {
             StoreMsg::ClearRegionSizeInRange { .. } => 3,
             StoreMsg::Tick(_) => 4,
             StoreMsg::Start { .. } => 5,
+            StoreMsg::UpdateReplicationMode(_) => 6,
+            StoreMsg::LatencyInspect { .. } => 7,
+            StoreMsg::UnsafeRecoveryReport(_) => 8,
+            StoreMsg::UnsafeRecoveryCreatePeer { .. } => 9,
+            StoreMsg::GcSnapshotFinish => 10,
+            StoreMsg::AwakenRegions { .. } => 11,
             #[cfg(any(test, feature = "testexport"))]
-            StoreMsg::Validate(_) => 6,
-            StoreMsg::UpdateReplicationMode(_) => 7,
-            StoreMsg::LatencyInspect { .. } => 8,
-            StoreMsg::UnsafeRecoveryReport(_) => 9,
-            StoreMsg::UnsafeRecoveryCreatePeer { .. } => 10,
-            StoreMsg::GcSnapshotFinish => 11,
-            StoreMsg::AwakenRegions { .. } => 12,
+            StoreMsg::Validate(_) => 13,
         }
     }
 }