Skip to content
This repository was archived by the owner on Jul 24, 2024. It is now read-only.

update release 3.1#130

Merged
overvenus merged 15 commits intopingcap:release-3.1from
overvenus:release-3.1-update
Jan 7, 2020
Merged

update release 3.1#130
overvenus merged 15 commits intopingcap:release-3.1from
overvenus:release-3.1-update

Conversation

@overvenus
Copy link
Member

Merge recent commits into release-3.1

overvenus and others added 7 commits December 20, 2019 10:43
* restore: support batch split

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

* go mod tidy

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

* address lint

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

Co-authored-by: Neil Shen <overvenus@gmail.com>
Remove deployment section since BR is a command-line tool,
and there are no special deployment requirements.
* restore: remove/add pd scheduler in restore

* add test

* address comment

* address comment

Co-authored-by: Neil Shen <overvenus@gmail.com>
* conn: fix inaccurate region count

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

* conn: add getRegionCount test

Signed-off-by: Neil Shen <overvenus@gmail.com>
* validate: debug backupmeta

* address comment
Signed-off-by: 5kbpers <tangminghua@pingcap.com>
@overvenus overvenus changed the title update release 3. update release 3.1 Dec 30, 2019
@overvenus overvenus added the WIP label Dec 30, 2019
YangKeao and others added 2 commits December 30, 2019 13:58
…cap#109)

* cmd: add lastbackupts arguments to full and table backup

Signed-off-by: Yang Keao <keao.yang@yahoo.com>

* cmd: add lastbackupts arguments to full and database and table restore

Signed-off-by: Yang Keao <keao.yang@yahoo.com>

* restore: set NewTimestamp for downloadSST rewrite rule

Signed-off-by: Yang Keao <keao.yang@yahoo.com>

* restore: reset PD's ts if lastBackupTS is zero

Signed-off-by: Yang Keao <keao.yang@yahoo.com>

* restore: restore from a backupmeta is good enough

Signed-off-by: Yang Keao <keao.yang@yahoo.com>

* cmd/validate: add parse cmd

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

* restore/db: insert `IF NOT EXISTS` into create table SQL

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

* tests: add integration test for incremental br

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

* *: update kvproto and remove \t in error

Signed-off-by: Yang Keao <keao.yang@yahoo.com>

* fix bugs in test script

Signed-off-by: Yang Keao <keao.yang@yahoo.com>

* address comments

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

Co-authored-by: 5kbpers <20279863+5kbpers@users.noreply.github.com>
Signed-off-by: Neil Shen <overvenus@gmail.com>
@overvenus overvenus removed the WIP label Dec 31, 2019
* flags: hidden not stable command flags

* address comment

echo "start version: $start_ts, end version: $end_ts"

# incremental restore
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems we did not cleanup data after Line43, so it always success even though restore failed?

3pointer and others added 4 commits January 6, 2020 15:40
* restore: support table partition

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

* add test

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

* fix get rewrite rules

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

* fix checksum

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

* add warn log

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

* reset tidb-tools

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

* add check for validate file

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

* replace zap.ByteString with zap.Binary

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

codecov bot commented Jan 7, 2020

Codecov Report

❗ No coverage uploaded for pull request base (release-3.1@87206ef). Click here to learn what that means.
The diff coverage is 73.13%.

Impacted file tree graph

@@              Coverage Diff               @@
##             release-3.1     #130   +/-   ##
==============================================
  Coverage               ?   72.95%           
==============================================
  Files                  ?       33           
  Lines                  ?     3257           
  Branches               ?        0           
==============================================
  Hits                   ?     2376           
  Misses                 ?      591           
  Partials               ?      290
Impacted Files Coverage Δ
cmd/cmd.go 60% <ø> (ø)
pkg/utils/schema.go 57.57% <ø> (ø)
pkg/backup/schema.go 78.66% <100%> (ø)
pkg/restore/client.go 71.9% <100%> (ø)
pkg/backup/client.go 73.69% <100%> (ø)
pkg/storage/s3.go 84.41% <100%> (ø)
pkg/restore/db.go 46.42% <100%> (ø)
pkg/checksum/executor.go 78.03% <100%> (ø)
pkg/storage/gcs.go 71.96% <100%> (ø)
cmd/validate.go 66.66% <56.57%> (ø)
... and 5 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 87206ef...b4ba91e. Read the comment docs.

Signed-off-by: Neil Shen <overvenus@gmail.com>
@overvenus overvenus merged commit b4ba91e into pingcap:release-3.1 Jan 7, 2020
@overvenus overvenus deleted the release-3.1-update branch January 7, 2020 06:34
overvenus pushed a commit to overvenus/br-1 that referenced this pull request Dec 29, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants