merge pingcap/release-3.1 until (tikv#7078)

raftstore: retry pending read index requests (tikv#6348) (tikv#6543) Signed-off-by: qupeng <qupeng@pingcap.com> raft_client: limit batch size (tikv#6993) (tikv#7076) (tikv#7087) Signed-off-by: qupeng <qupeng@pingcap.com> backup raw kv (tikv#6308) (tikv#7051) Co-authored-by: xinhua5 <xinhua5@users.noreply.github.com> Co-authored-by: MyonKeminta <MyonKeminta@users.noreply.github.com> tikv_util: fix s3 writer always creating zeroes (tikv#6675) (tikv#6967) Signed-off-by: kennytm <kennytm@gmail.com> Co-authored-by: Lei Zhao <zlwgx1023@gmail.com> backup: do fill in the file size of each SST file in the response (tikv#6664) (tikv#6983) Signed-off-by: kennytm <kennytm@gmail.com> *: update raft to include aggressive flow control (tikv#7078) Signed-off-by: Jay Lee <BusyJayLee@gmail.com>
pingcap · Mar 13, 2020 · 451a6d0 · 451a6d0
1 parent 5885ec9
commit 451a6d0
Show file tree

Hide file tree

Showing 17 changed files with 828 additions and 192 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -123,6 +123,7 @@ default-features = false
 "log:0.3.9" = { git = "https://github.com/busyjay/log", branch = "use-static-module" }
 "log:0.4.6" = { git = "https://github.com/busyjay/log", branch = "revert-to-static" }
 "prometheus:0.4.2" = { git = "https://github.com/birdstorm/rust-prometheus", branch = "0.4.2" }
+"raft:0.4.3" = { git = "https://github.com/tikv/raft-rs", rev = "9782199fa6318f94bf0974129664d974b03f8f11" }
 
 [dev-dependencies]
 panic_hook = { path = "components/panic_hook" }