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(enterprise): Set version correctly post marshalling during restor… #7045

Closed
wants to merge 2 commits into from

Conversation

rahulgurnani
Copy link
Contributor

@rahulgurnani rahulgurnani commented Dec 2, 2020

…e (#7018)

  • Add test for old restore to a cluster

  • Fix author query

  • fix(restore): Use correct version after marshalling

The marshalPostingList function returns a KV without the version set and
this causes issues if you restore a backup on top of an existing data.
This PR fixes this issue by explicitly setting the version for the KV
returned by the MarshalPostingList function.

  • Fix test for restoring old backup incremental

  • Address review comments

  • Add old backup dir

  • Add wait for restore, address review comments

  • Make test use tls, refactor out waitforrestore

Co-authored-by: Ibrahim Jarif ibrahim@dgraph.io


This change is Reviewable

#7018)

* Add test for old restore to a cluster

* Fix author query

* fix(restore): Use correct version after marshalling

The marshalPostingList function returns a KV without the version set and
this causes issues if you restore a backup on top of an existing data.
This PR fixes this issue by explicitly setting the version for the KV
returned by the MarshalPostingList function.

* Fix test for restoring old backup incremental

* Address review comments

* Add old backup dir

* Add wait for restore, address review comments

* Make test use tls, refactor out waitforrestore

Co-authored-by: Ibrahim Jarif <ibrahim@dgraph.io>
@netlify
Copy link

netlify bot commented Dec 2, 2020

Deploy preview for dgraph-docs ready!

Built with commit 656c651

https://deploy-preview-7045--dgraph-docs.netlify.app

The added directory is used in systest/backup/filesystem/docker-compose.yml.
@rahulgurnani rahulgurnani added the area/enterprise/backup Related to binary backups label Dec 3, 2020
Copy link
Contributor

@danielmai danielmai left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewed 9 of 10 files at r1.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @manishrjain, @martinmr, and @vvbalaji-dgraph)

@CLAassistant
Copy link

CLAassistant commented Apr 29, 2022

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
0 out of 2 committers have signed the CLA.

❌ rahulgurnani
❌ NamanJain8
You have signed the CLA already but the status is still pending? Let us recheck it.

@mangalaman93 mangalaman93 deleted the rahulgurnani/cherrypick-20.11 branch August 11, 2023 02:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/enterprise/backup Related to binary backups area/testing Testing related issues
Development

Successfully merging this pull request may close these issues.

6 participants