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.

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

Rollup of backup commits #7297

Merged
merged 8 commits into from
Mar 30, 2020

Conversation

overvenus
Copy link
Member

What problem does this PR solve?

Problem Summary: Cherry pick recent bug fixes about backup & restore

Check List

Tests

  • Unit test
  • Integration test

Release note

  • Support AWS IAM web identity.

@overvenus overvenus added component/backup-restore Component: backup, import, external_storage needs-cherry-pick-release-3.1 Type: Need cherry pick to release 3.1 labels Mar 30, 2020
@overvenus overvenus added this to the v3.1.0-rc milestone Mar 30, 2020
@overvenus overvenus force-pushed the release-3.1-br-cherry-pick branch 3 times, most recently from 4da04ec to 223108c Compare March 30, 2020 07:51
@kennytm
Copy link
Contributor

kennytm commented Mar 30, 2020

1d44cf3 has a typo in the commit message and failing the DCO.

@overvenus overvenus force-pushed the release-3.1-br-cherry-pick branch 2 times, most recently from 138e02e to 5010f36 Compare March 30, 2020 08:34
@youjiali1995 youjiali1995 added type/cherry-pick Type: PR - Cherry pick and removed needs-cherry-pick-release-3.1 Type: Need cherry pick to release 3.1 labels Mar 30, 2020
@overvenus
Copy link
Member Author

/run-all-tests

@kennytm

This comment has been minimized.

overvenus and others added 7 commits March 30, 2020 19:21
Signed-off-by: Neil Shen <overvenus@gmail.com>
Signed-off-by: yiwu-arbug <yiwu@pingcap.com>
…set (tikv#7241)

Signed-off-by: 3pointer <luancheng@pingcap.com>
Signed-off-by: Neil Shen <overvenus@gmail.com>
Signed-off-by: Neil Shen <overvenus@gmail.com>
@overvenus
Copy link
Member Author

/run-all-tests

@overvenus
Copy link
Member Author

/run-unit-test

@youjiali1995 youjiali1995 added the status/can-merge Indicates a PR has been approved by a committer. label Mar 30, 2020
@sre-bot
Copy link
Contributor

sre-bot commented Mar 30, 2020

/run-all-tests

Signed-off-by: Neil Shen <overvenus@gmail.com>
@youjiali1995
Copy link
Contributor

/merge

@sre-bot
Copy link
Contributor

sre-bot commented Mar 30, 2020

/run-all-tests

@sre-bot sre-bot merged commit 6ab05e4 into tikv:release-3.1 Mar 30, 2020
@overvenus overvenus deleted the release-3.1-br-cherry-pick branch March 31, 2020 02:01
solotzg pushed a commit to pingcap/tidb-engine-ext that referenced this pull request Apr 15, 2020
Signed-off-by: Neil Shen <overvenus@gmail.com>
Signed-off-by: yiwu-arbug <yiwu@pingcap.com>
Signed-off-by: kennytm <kennytm@gmail.com>
Signed-off-by: 3pointer <luancheng@pingcap.com>
Signed-off-by: Tong Zhigao <tongzhigao@pingcap.com>
# Conflicts:
#	Cargo.lock
solotzg added a commit to pingcap/tidb-engine-ext that referenced this pull request Apr 15, 2020
Signed-off-by: Tong Zhigao <tongzhigao@pingcap.com>

Cherry-pick 3.1:  adjust memory/CPU configurations automatically in container (tikv#7224)

tidb_query: fix TopN comparison for release 3.1 (tikv#7199)

Signed-off-by: zhongzc <zhongzc_arch@outlook.com>

Makefile: allow verbose warnings (tikv#7226)

Signed-off-by: Neil Shen <overvenus@gmail.com>

sst_importer: add error field to DownloadResponse (tikv#7271)

Signed-off-by: 5kbpers <tangminghua@pingcap.com>

raftstore: fix a panic about read index during transfer leader (tikv#7101) (tikv#7240)

Signed-off-by: qupeng <qupeng@pingcap.com>

raftstore: apply read after snapshot (tikv#7230) (tikv#7249)

Signed-off-by: Jay Lee <BusyJayLee@gmail.com>

Rollup of backup commits (tikv#7297)

Signed-off-by: Neil Shen <overvenus@gmail.com>
Signed-off-by: yiwu-arbug <yiwu@pingcap.com>
Signed-off-by: kennytm <kennytm@gmail.com>
Signed-off-by: 3pointer <luancheng@pingcap.com>
Signed-off-by: Tong Zhigao <tongzhigao@pingcap.com>

Migrate Check-CN and Reloading Certs (tikv#7305)

Signed-off-by: Xintao <hunterlxt@live.com>
Signed-off-by: Tong Zhigao <tongzhigao@pingcap.com>

coprocessor: differentiate real/int/decimal for `not` expressio… (tikv#7326)

Signed-off-by: Kenan Yao <cauchy1992@gmail.com>

*: bump v3.1.0-rc (tikv#7352)

Signed-off-by: youjiali1995 <zlwgx1023@gmail.com>
Signed-off-by: Tong Zhigao <tongzhigao@pingcap.com>

txn: write protected rollback when cleanup with missing lock (tikv#7365) (tikv#7389)

Signed-off-by: Yilin Chen <sticnarf@gmail.com>

 raftstore: tolerate out of order read index responses (tikv#7313) (tikv#7369)

Signed-off-by: qupeng <qupeng@pingcap.com>

sst_importer: skip validation in ingest temporary until we can handle sst file size correctly (tikv#7419)

Signed-off-by: luancheng <luancheng@pingcap.com>

raftstore: set term in read index response (tikv#7418)

Signed-off-by: Liqi Geng <gengliqiii@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component/backup-restore Component: backup, import, external_storage status/can-merge Indicates a PR has been approved by a committer. type/cherry-pick Type: PR - Cherry pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants