status_server: support dumping region meta by http (tikv#7650)

Signed-off-by: Hexilee <i@hexilee.me>
brson · May 11, 2020 · 817445d · 817445d
1 parent d10871f
commit 817445d
Show file tree

Hide file tree

Showing 10 changed files with 568 additions and 157 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cmd/src/server.rs b/cmd/src/server.rs
@@ -97,8 +97,8 @@ pub fn run_tikv(config: TiKvConfig) {
     let server_config = tikv.init_servers(&gc_worker);
     tikv.register_services();
     tikv.init_metrics_flusher();
-
     tikv.run_server(server_config);
+    tikv.run_status_server();
 
     signal_handler::wait_for_signal(Some(tikv.engines.take().unwrap().engines));
 
@@ -759,7 +759,9 @@ impl TiKVServer {
             .server
             .start(server_config, self.security_mgr.clone())
             .unwrap_or_else(|e| fatal!("failed to start server: {}", e));
+    }
 
+    fn run_status_server(&mut self) {
         // Create a status server.
         let status_enabled =
             self.config.metric.address.is_empty() && !self.config.server.status_addr.is_empty();
@@ -768,6 +770,7 @@ impl TiKVServer {
                 self.config.server.status_thread_pool_size,
                 Some(self.pd_client.clone()),
                 self.cfg_controller.take().unwrap(),
+                self.router.clone(),
             ));
             // Start the status server.
             if let Err(e) = status_server.start(
@@ -897,7 +900,11 @@ trait Stop {
     fn stop(self: Box<Self>);
 }
 
-impl Stop for StatusServer {
+impl<E, R> Stop for StatusServer<E, R>
+where
+    E: 'static,
+    R: 'static + Send,
+{
     fn stop(self: Box<Self>) {
         (*self).stop()
     }

diff --git a/components/raftstore/src/store/fsm/peer.rs b/components/raftstore/src/store/fsm/peer.rs
@@ -511,7 +511,7 @@ impl<'a, T: Transport, C: PdClient> PeerFsmDelegate<'a, T, C> {
                 self.fsm.peer.ping();
                 self.fsm.has_ready = true;
             }
-            CasualMessage::Test(cb) => cb(self.fsm),
+            CasualMessage::AccessPeer(cb) => cb(self.fsm),
         }
     }
 

diff --git a/components/raftstore/src/store/msg.rs b/components/raftstore/src/store/msg.rs
@@ -253,9 +253,8 @@ pub enum CasualMessage<E: KvEngine> {
     /// Notifies that a new snapshot has been generated.
     SnapshotGenerated,
 
-    /// A test only message, it is useful when we want to access
-    /// peer's internal state.
-    Test(Box<dyn FnOnce(&mut PeerFsm<E>) + Send + 'static>),
+    /// A message to access peer's internal state.
+    AccessPeer(Box<dyn FnOnce(&mut PeerFsm<E>) + Send + 'static>),
 }
 
 impl<E: KvEngine> fmt::Debug for CasualMessage<E> {
@@ -293,7 +292,7 @@ impl<E: KvEngine> fmt::Debug for CasualMessage<E> {
             },
             CasualMessage::RegionOverlapped => write!(fmt, "RegionOverlapped"),
             CasualMessage::SnapshotGenerated => write!(fmt, "SnapshotGenerated"),
-            CasualMessage::Test(_) => write!(fmt, "Test"),
+            CasualMessage::AccessPeer(_) => write!(fmt, "AccessPeer"),
         }
     }
 }

diff --git a/components/test_raftstore/src/cluster.rs b/components/test_raftstore/src/cluster.rs
@@ -1226,7 +1226,7 @@ impl<T: Simulator> Cluster<T> {
         CasualRouter::send(
             &router,
             region_id,
-            CasualMessage::Test(Box::new(move |peer: &mut PeerFsm<RocksEngine>| {
+            CasualMessage::AccessPeer(Box::new(move |peer: &mut PeerFsm<RocksEngine>| {
                 let idx = peer.peer.raft_group.store().committed_index();
                 peer.peer.raft_group.request_snapshot(idx).unwrap();
                 debug!("{} request snapshot at {}", idx, peer.peer.tag);