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(restore): append the object path prefix while reading backup #7686

Merged
merged 1 commit into from
Apr 6, 2021

Conversation

NamanJain8
Copy link
Contributor

@NamanJain8 NamanJain8 commented Apr 5, 2021

Fixes DGRAPH-3236

The restore fails on S3 when the object is nested (s3://s3.us-east-1.amazonaws.com/dgraphbucket/abc/xyz). This PR fixes it.


This change is Reviewable

@danielmai
Copy link
Contributor

danielmai commented Apr 5, 2021

This PR by @ahsanbarkati did the same fix in release/v21.03: #7669

@NamanJain8 Is this change needed too or just Ahsan's? This PR changes the s3_handler while #7669 changes the backup_handler.

@NamanJain8
Copy link
Contributor Author

NamanJain8 commented Apr 5, 2021

@danielmai, correct that this fix is similar to the fix @ahsanbarkati made on master. But it couldn't directly be cherry-picked as the backup code diverged a lot. We would need my change in release/v21.03.

@danielmai
Copy link
Contributor

danielmai commented Apr 5, 2021

Oops, you're right, PR #7669 was done on master (I wrote earlier that it was on release/v21.03). Got it, thanks!

@NamanJain8 NamanJain8 merged commit de52d13 into release/v21.03 Apr 6, 2021
@NamanJain8 NamanJain8 deleted the naman/fix-restore-path branch April 6, 2021 08:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants