From 72353e9b1bd3db59cd36fc586c112517c3169aa3 Mon Sep 17 00:00:00 2001 From: Ana Hobden Date: Mon, 11 Feb 2019 15:13:32 -0800 Subject: [PATCH] Bump Kvproto Signed-off-by: Ana Hobden --- Cargo.toml | 1 + src/rpc/tikv/client.rs | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 2a46c2ef..a008657d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,6 +26,7 @@ log = "0.3.9" [dependencies.kvproto] git = "https://github.com/pingcap/kvproto.git" +rev = "f9b9e7d362c7cc2c90202fc7c300b2e466cbfbf2" [dependencies.prometheus] version = "0.4.2" diff --git a/src/rpc/tikv/client.rs b/src/rpc/tikv/client.rs index 4fa81e26..c369ef6a 100644 --- a/src/rpc/tikv/client.rs +++ b/src/rpc/tikv/client.rs @@ -55,11 +55,11 @@ impl From for Error { e.take_start_key(), e.take_end_key(), ) - } else if e.has_stale_epoch() { + } else if e.has_epoch_not_match() { Error::StaleEpoch(Some(format!( "{}. New epoch: {:?}", message, - e.get_stale_epoch().get_new_regions() + e.get_epoch_not_match().get_current_regions() ))) } else if e.has_server_is_busy() { let mut e = e.take_server_is_busy();