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

fix zone lost in backup #4319

Merged
merged 3 commits into from
Jun 15, 2022
Merged

Conversation

panda-sheep
Copy link
Contributor

@panda-sheep panda-sheep commented Jun 14, 2022

What type of PR is this?

  • bug
  • feature
  • enhancement

What problem(s) does this PR solve?

Issue(s) number:

Description:

Solve the problem of zonename inconsistency during restore.

Currently a host is a zone by default.
When restoring, because the host needs to be replaced, so the zone needs to be replaced.
And when replacing the zone, need to replace the zone used in spaceDesc.

How do you solve it?

Special notes for your reviewer, ex. impact of this fix, design document, etc:

Checklist:

Tests:

  • Unit test(positive and negative cases)
  • Function test
  • Performance test
  • N/A

Affects:

  • Documentation affected (Please add the label if documentation needs to be modified.)
  • Incompatibility (If it breaks the compatibility, please describe it and add the label.)
  • If it's needed to cherry-pick (If cherry-pick to some branches is required, please label the destination version(s).)
  • Performance impacted: Consumes more CPU/Memory

Release notes:

Please confirm whether to be reflected in release notes and how to describe:

ex. Fixed the bug .....

@panda-sheep panda-sheep added ready-for-testing PR: ready for the CI test ready for review labels Jun 14, 2022
@Sophie-Xie Sophie-Xie added this to the v3.2.0 milestone Jun 14, 2022
if (zoneRet != nebula::cpp2::ErrorCode::E_ZONE_NOT_FOUND) {
if (zoneRet == nebula::cpp2::ErrorCode::SUCCEEDED)
LOG(ERROR) << "Zone " << zoneName << " have existed";
code = nebula::cpp2::ErrorCode::E_KEY_HAS_EXISTS;
Copy link
Contributor

Choose a reason for hiding this comment

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

Perhaps you need to return the error code from zoneRet, otherwise, some kvstore error could be vanished. Besides, the if in line 64 miss a bracket

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good catch, thx.

Copy link
Contributor

@critical27 critical27 left a comment

Choose a reason for hiding this comment

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

Good job~

pengweisong
pengweisong previously approved these changes Jun 14, 2022
Copy link
Contributor

@pengweisong pengweisong left a comment

Choose a reason for hiding this comment

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

Good job

pengweisong
pengweisong previously approved these changes Jun 14, 2022
critical27
critical27 previously approved these changes Jun 14, 2022
Copy link
Contributor

@critical27 critical27 left a comment

Choose a reason for hiding this comment

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

Good job~

@critical27 critical27 merged commit 6dc3651 into vesoft-inc:master Jun 15, 2022
@panda-sheep panda-sheep deleted the fix_backup_zone_info branch June 15, 2022 02:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready for review ready-for-testing PR: ready for the CI test
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants