Code

merge pingcap/release-3.1#10

Code

Merged

solotzg merged 25 commits intotiflash-proxy-masterpingcap/tidb-engine-ext:tiflash-proxy-masterfrom __tiflash-proxy-masterpingcap/tidb-engine-ext:__tiflash-proxy-masterCopy head branch name to clipboardFeb 15, 2020

+5,713-3,165

Commits

Commits on Feb 8, 2020

• [3.1] external_storage: add S3 support (tikv#6209) (tikv#6536)

  Show description for c1fa994
  kennytm

  authored
  c1fa994

Commits on Feb 11, 2020

• lock_manager: more metrics (tikv#6392) (tikv#6422) (tikv#6444)

  Show description for 647daec
  youjiali1995

  authored
  647daec

• lock_manager: update default config (tikv#6426) (tikv#6429) (tikv#6446)

  Show description for 1de4312
  youjiali1995

  authored
  1de4312

Commits on Feb 12, 2020

• Update rocksdb and titan. Update rust-rocksdb url (tikv#6554)

  Show description for 62b5d65
  

  yiwu-arbug

  authored
  62b5d65

Commits on Feb 13, 2020

• raft_client: connect to other stores using peer_address (tikv#5569) (tikv#6491)

  disksing

  authored
  52a7cae

• *: pick threads statistics for regions (tikv#6605)

  Show description for e190308
  

  3 peopleauthored
  e190308

• fix test_replica_read::test_read_after_cleanup_range_for_snap (tikv#6493)

  Show description for dee5c75
  sre-bot

  authored
  dee5c75

Commits on Feb 14, 2020

• deadlock: more solid role change observer (tikv#6415) (tikv#6431) (tikv#6445)

  Show description for d334f90
  youjiali1995

  authored
  d334f90

• raftstore: read index message count metric (tikv#6579) (tikv#6610)

  Show description for 2f02ee7
  5kbpers

  authored
  2f02ee7

• raftstore: speed up conf change (tikv#6421) (tikv#6432)

  Show description for 5ef9d0b
  BusyJay

  authored
  5ef9d0b

• raftstore: fix a panic in read index queue (tikv#6609) (tikv#6613)

  Show description for 6068bf5
  sre-bot

  authored
  6068bf5

• pick tikv#6414, tikv#6487, tikv#6477 and tikv#6539 to release-3.1 (tikv#6564)

  Show description for 2600f9a
  BusyJay

  authored
  2600f9a

• raftstore: set wait_merge_state to none after resuming pending state (tikv#6621)

  Show description for ec49dfb
  gengliqi

  authored
  ec49dfb

• raftstore: fix a panic in read index queue (tikv#6609) (tikv#6613)

  Show description for 2a093e4
  

  sre-bot

  authored and

  solotzg

  committed
  2a093e4

• Merge remote-tracking branch 'pingcap/release-3.1' into __tiflash-proxy-master

  Show description for 9cb1e13
  solotzg

  committed
  9cb1e13

Commits on Feb 15, 2020

• update cargo.lock

  solotzg

  committed
  2374a83

• raftstore: learner load merge target & fix a merge network recovery bug (tikv#6623)

  Show description for f5bd0d9
  gengliqi

  authored
  f5bd0d9

• 1

  solotzg

  committed
  ae7acda

• Merge remote-tracking branch 'pingcap/release-3.1' into __tiflash-proxy-master

  Show description for 3f6df2b
  solotzg

  committed
  3f6df2b

• fix

  solotzg

  committed
  914dd2a

• 1

  solotzg

  committed
  054b2e6

• Merge remote-tracking branch 'origin/tiflash-proxy-master' into __tiflash-proxy-master

  Show description for c9a2bc4
  solotzg

  committed
  c9a2bc4

• change merge flow path (tikv#6617)

  Show description for d1f9d48
  gengliqi

  authored
  d1f9d48

• wip

  

  committed
  e2dcc1f

• Merge remote-tracking branch 'pingcap/release-3.1' into __tiflash-proxy-master

  solotzg

  committed
  826d907