Skip to content

Commit

Permalink
store: update log.
Browse files Browse the repository at this point in the history
  • Loading branch information
siddontang committed Aug 26, 2016
1 parent 8bd91c6 commit d32519f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
5 changes: 4 additions & 1 deletion src/raftstore/store/peer_storage.rs
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,10 @@ impl PeerStorage {
ctx.apply_state.mut_truncated_state().set_index(last_index);
ctx.apply_state.mut_truncated_state().set_term(snap.get_metadata().get_term());

info!("{} apply snapshot meta ok", self.tag);
info!("{} apply snapshot for region {:?} with state {:?} ok",
self.tag,
region,
ctx.apply_state);

Ok(ApplySnapResult {
prev_region: self.region.clone(),
Expand Down
6 changes: 3 additions & 3 deletions src/raftstore/store/store.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1097,20 +1097,20 @@ impl<T: Transport, C: PdClient> Store<T, C> {
let f = try!(self.snap_mgr.rl().get_snap_file(&key, is_sending));
if is_sending {
if key.term < compacted_term || key.idx < compacted_idx {
debug!("snap file {} has been compacted, delete.", key);
info!("snap file {} has been compacted, delete.", key);
f.delete();
} else if let Ok(meta) = f.meta() {
let modified = box_try!(meta.modified());
if let Ok(elapsed) = modified.elapsed() {
if elapsed > Duration::from_secs(self.cfg.snap_gc_timeout) {
debug!("snap file {} has been expired, delete.", key);
info!("snap file {} has been expired, delete.", key);
f.delete();
}
}
}
} else if key.term <= compacted_term &&
(key.idx < compacted_idx || key.idx == compacted_idx && !is_applying_snap) {
debug!("snap file {} has been applied, delete.", key);
info!("snap file {} has been applied, delete.", key);
f.delete();
}
}
Expand Down

0 comments on commit d32519f

Please sign in to comment.