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

gcs: compatible with old gcs bug (#677) #689

Merged
merged 2 commits into from
Jan 11, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Jan 11, 2021

cherry-pick #677 to release-5.0-rc
You can switch your code base to this Pull Request by using git-extras:

# In br repo:
git pr 689

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/br.git pr/689:ti-srebot:release-5.0-rc-3de76b2ec3f2

What problem does this PR solve?

solve #675

What is changed and how it works?

for case 1: add a check before Read & Write meta file, decide which prefix to use.
for case 2: check whether sst file is in Prefix(after #647) or in PrefixSlash(before #647), adjust proper prefix for TiKV request.

Check List

Tests

  • Integration test

Related changes

  • Need to cherry-pick to the release branch
  • Need to update the documentation

Release Note

  • Fix the issue that br 4.0.9 cannot restore br 4.0.8 gcs backup files.

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
Copy link
Member

@overvenus overvenus left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-srebot ti-srebot added the status/LGT1 LGTM1 label Jan 11, 2021
@overvenus
Copy link
Member

Please fix build.

@kennytm
Copy link
Collaborator

kennytm commented Jan 11, 2021

lgtm

@ti-srebot ti-srebot added status/LGT2 LGTM2 and removed status/LGT1 LGTM1 labels Jan 11, 2021
@kennytm kennytm merged commit 9adc69b into pingcap:release-5.0-rc Jan 11, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants