Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

debug: impl region_info #2332

Merged
merged 8 commits into from
Sep 25, 2017
Merged

debug: impl region_info #2332

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ee4be8a
WIP: impl region_info
overvenus Sep 21, 2017
88e0ad2
Merge branch 'master' into ov/debugger/region-info
overvenus Sep 22, 2017
3d53663
Cargo: update kvproto
overvenus Sep 22, 2017
1e08972
WIP
overvenus Sep 22, 2017
32d9eb3
debug: add region_info tests
overvenus Sep 22, 2017
35461af
Address comments
overvenus Sep 25, 2017
d320c2e
Address comments
overvenus Sep 25, 2017
9135ff4
Merge branch 'master' into ov/debugger/region-info
overvenus Sep 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

95 changes: 95 additions & 0 deletions src/raftstore/store/debug.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

use std::{error, result};
use kvproto::debugpb::*;
use kvproto::raft_serverpb;
use kvproto::eraftpb;

use raftstore::store::{keys, Engines};
Expand Down Expand Up @@ -67,6 +68,42 @@ impl Debugger {
}
}

pub fn region_info(
&self,
region_id: u64,
) -> Result<
(
Option<raft_serverpb::RaftLocalState>,
Option<raft_serverpb::RaftApplyState>,
Option<raft_serverpb::RegionLocalState>,
),
> {
let raft_state_key = keys::raft_state_key(region_id);
let raft_state = self.engines
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not using box_try here so we don't need to check multi errors later.

.raft_engine
.get_msg::<raft_serverpb::RaftLocalState>(&raft_state_key);

let apply_state_key = keys::apply_state_key(region_id);
let apply_state = self.engines
.kv_engine
.get_msg_cf::<raft_serverpb::RaftApplyState>(CF_RAFT, &apply_state_key);

let region_state_key = keys::region_state_key(region_id);
let region_state = self.engines
.kv_engine
.get_msg_cf::<raft_serverpb::RegionLocalState>(CF_RAFT, &region_state_key);

match (raft_state, apply_state, region_state) {
(Ok(None), Ok(None), Ok(None)) => {
Err(Error::NotFound(format!("info for region {}", region_id)))
}
(Ok(raft_state), Ok(apply_state), Ok(region_state)) => {
Ok((raft_state, apply_state, region_state))
}
(Err(e), _, _) | (_, Err(e), _) | (_, _, Err(e)) => Err(box_err!(e)),
}
}

pub fn raft_log(&self, region_id: u64, log_index: u64) -> Result<eraftpb::Entry> {
let key = keys::raft_log_key(region_id, log_index);
match self.engines.raft_engine.get_msg(&key) {
Expand Down Expand Up @@ -193,4 +230,62 @@ mod tests {
_ => panic!("expect Error::NotFound(_)"),
}
}

#[test]
fn test_region_info() {
let debugger = new_debugger();
let raft_engine = &debugger.engines.raft_engine;
let kv_engine = &debugger.engines.kv_engine;
let raft_cf = kv_engine.cf_handle(CF_RAFT).unwrap();
let region_id = 1;

let raft_state_key = keys::raft_state_key(region_id);
let mut raft_state = raft_serverpb::RaftLocalState::new();
raft_state.set_last_index(42);
raft_engine.put_msg(&raft_state_key, &raft_state).unwrap();
assert_eq!(
raft_engine
.get_msg::<raft_serverpb::RaftLocalState>(&raft_state_key)
.unwrap()
.unwrap(),
raft_state
);

let apply_state_key = keys::apply_state_key(region_id);
let mut apply_state = raft_serverpb::RaftApplyState::new();
apply_state.set_applied_index(42);
kv_engine
.put_msg_cf(raft_cf, &apply_state_key, &apply_state)
.unwrap();
assert_eq!(
kv_engine
.get_msg_cf::<raft_serverpb::RaftApplyState>(CF_RAFT, &apply_state_key)
.unwrap()
.unwrap(),
apply_state
);

let region_state_key = keys::region_state_key(region_id);
let mut region_state = raft_serverpb::RegionLocalState::new();
region_state.set_state(raft_serverpb::PeerState::Tombstone);
kv_engine
.put_msg_cf(raft_cf, &region_state_key, &region_state)
.unwrap();
assert_eq!(
kv_engine
.get_msg_cf::<raft_serverpb::RegionLocalState>(CF_RAFT, &region_state_key)
.unwrap()
.unwrap(),
region_state
);

assert_eq!(
debugger.region_info(region_id).unwrap(),
(Some(raft_state), Some(apply_state), Some(region_state))
);
match debugger.region_info(region_id + 1) {
Err(Error::NotFound(_)) => (),
_ => panic!("expect Error::NotFound(_)"),
}
}
}
45 changes: 37 additions & 8 deletions src/server/service/debug.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,6 @@ impl debugpb_grpc::Debug for Service {
self.handle_response(ctx, sink, f, TAG);
}

fn mvcc(&self, _: RpcContext, _: MvccRequest, _: UnarySink<MvccResponse>) {
unimplemented!()
}

fn raft_log(&self, ctx: RpcContext, req: RaftLogRequest, sink: UnarySink<RaftLogResponse>) {
const TAG: &'static str = "debug_raft_log";

Expand All @@ -109,15 +105,48 @@ impl debugpb_grpc::Debug for Service {
self.handle_response(ctx, sink, f, TAG);
}

fn region_info(&self, _: RpcContext, _: RegionInfoRequest, _: UnarySink<RegionInfoResponse>) {
unimplemented!()
fn region_info(
&self,
ctx: RpcContext,
req: RegionInfoRequest,
sink: UnarySink<RegionInfoResponse>,
) {
const TAG: &'static str = "debug_region_log";

let region_id = req.get_region_id();

let f = self.pool
.spawn(
future::ok(self.debugger.clone())
.and_then(move |debugger| debugger.region_info(region_id)),
)
.map(|(raft_local_state, raft_apply_state, region_state)| {
let mut resp = RegionInfoResponse::new();
if let Some(raft_local_state) = raft_local_state {
resp.set_raft_local_state(raft_local_state);
}
if let Some(raft_apply_state) = raft_apply_state {
resp.set_raft_apply_state(raft_apply_state);
}
if let Some(region_state) = region_state {
resp.set_region_local_state(region_state);
}
resp
});

self.handle_response(ctx, sink, f, TAG);
}

fn size(&self, _: RpcContext, _: SizeRequest, _: UnarySink<SizeResponse>) {
fn region_size(&self, _: RpcContext, _: RegionSizeRequest, _: UnarySink<RegionSizeResponse>) {
unimplemented!()
}

fn scan(&self, _: RpcContext, _: ScanRequest, _: ServerStreamingSink<ScanResponse>) {
fn scan_mvcc(
&self,
_: RpcContext,
_: ScanMvccRequest,
_: ServerStreamingSink<ScanMvccResponse>,
) {
unimplemented!()
}
}
73 changes: 72 additions & 1 deletion tests/raftstore/test_service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use std::sync::Arc;
use tikv::util::HandyRwLock;
use tikv::storage::Key;
use tikv::raftstore::store::keys;
use tikv::storage::CF_DEFAULT;
use tikv::storage::{CF_DEFAULT, CF_RAFT};
use tikv::raftstore::store::engine::{Mutable, Peekable};

use kvproto::tikvpb_grpc::TikvClient;
Expand All @@ -25,6 +25,7 @@ use kvproto::kvrpcpb::*;
use kvproto::debugpb_grpc::DebugClient;
use kvproto::debugpb;
use kvproto::eraftpb;
use kvproto::raft_serverpb;
use kvproto::raft_serverpb::*;
use kvproto::coprocessor::*;
use futures::{Future, Sink};
Expand Down Expand Up @@ -594,3 +595,73 @@ fn test_debug_raft_log() {
_ => panic!("expect NotFound"),
}
}

#[test]
fn test_debug_region_info() {
let (cluster, leader, _) = must_new_cluster();
let addr = cluster.sim.rl().get_addr(leader.get_store_id());
let env = Arc::new(Environment::new(1));
let channel = ChannelBuilder::new(env.clone()).connect(&format!("{}", addr));
let debug_client = DebugClient::new(channel);

let raft_engine = cluster.get_raft_engine(leader.get_store_id());
let kv_engine = cluster.get_engine(leader.get_store_id());
let raft_cf = kv_engine.cf_handle(CF_RAFT).unwrap();

let region_id = 100;
let raft_state_key = keys::raft_state_key(region_id);
let mut raft_state = raft_serverpb::RaftLocalState::new();
raft_state.set_last_index(42);
raft_engine.put_msg(&raft_state_key, &raft_state).unwrap();
assert_eq!(
raft_engine
.get_msg::<raft_serverpb::RaftLocalState>(&raft_state_key)
.unwrap()
.unwrap(),
raft_state
);

let apply_state_key = keys::apply_state_key(region_id);
let mut apply_state = raft_serverpb::RaftApplyState::new();
apply_state.set_applied_index(42);
kv_engine
.put_msg_cf(raft_cf, &apply_state_key, &apply_state)
.unwrap();
assert_eq!(
kv_engine
.get_msg_cf::<raft_serverpb::RaftApplyState>(CF_RAFT, &apply_state_key)
.unwrap()
.unwrap(),
apply_state
);

let region_state_key = keys::region_state_key(region_id);
let mut region_state = raft_serverpb::RegionLocalState::new();
region_state.set_state(raft_serverpb::PeerState::Tombstone);
kv_engine
.put_msg_cf(raft_cf, &region_state_key, &region_state)
.unwrap();
assert_eq!(
kv_engine
.get_msg_cf::<raft_serverpb::RegionLocalState>(CF_RAFT, &region_state_key)
.unwrap()
.unwrap(),
region_state
);

// Debug region_info
let mut req = debugpb::RegionInfoRequest::new();
req.set_region_id(region_id);
let mut resp = debug_client.region_info(req.clone()).unwrap();
assert_eq!(resp.take_raft_local_state(), raft_state);
assert_eq!(resp.take_raft_apply_state(), apply_state);
assert_eq!(resp.take_region_local_state(), region_state);

req.set_region_id(region_id + 1);
match debug_client.region_info(req).unwrap_err() {
Error::RpcFailure(status) => {
assert_eq!(status.status, RpcStatusCode::NotFound);
}
_ => panic!("expect NotFound"),
}
}