ZBUG-4409: Missing Blobs on a restored account from backup with S3 storage #1698
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Gopal-Moolchandani
requested review from
RakeshAMore,
prashantajari,
dasiyogesh,
chitranshu198,
preshitaagrawal,
rcyarrapothu,
shrutig0510,
viditZim,
mamtadahiwal and
ashwinsahu19
store/src/java/com/zimbra/cs/store/external/ExternalStoreManager.java
Outdated
Show resolved
Hide resolved
mamtadahiwal
reviewed
Feb 3, 2025
|
|
||
| try { | ||
| String locator = writeStreamToStore(pin, actualSize, mbox, volume.getId()); | ||
| if (locator != null) { |
There was a problem hiding this comment.
Suggested change
| if (locator != null) { | |
| if (null != locator) { |
mamtadahiwal
reviewed
Feb 3, 2025
| @@ -306,6 +321,21 @@ public StagedBlob stage(InputStream data, Mailbox mbox) | |||
| return stage(data, -1, mbox); | |||
There was a problem hiding this comment.
instead of hard code value can we declare variable for -1 , because its confusing
mamtadahiwal
reviewed
Feb 3, 2025
| if (supports(StoreFeature.RESUMABLE_UPLOAD) && blob instanceof ExternalUploadedBlob) { | ||
| ZimbraLog.store.debug("blob already uploaded, just need to commit"); | ||
| String locator = ((ExternalResumableUpload) this).finishUpload((ExternalUploadedBlob) blob); | ||
| if (locator != null) { |
There was a problem hiding this comment.
Suggested change
| if (locator != null) { | |
| if (null != locator) { |
mamtadahiwal
reviewed
Feb 3, 2025
| InputStream is = getContent(blob); | ||
| try { | ||
| StagedBlob staged = stage(is, blob.getRawSize(), mbox, volume); | ||
| if (staged != null && staged.getLocator() != null) { |
There was a problem hiding this comment.
Suggested change
| if (staged != null && staged.getLocator() != null) { | |
| if (null != staged && null != staged.getLocator()) { |
viditZim
reviewed
Feb 4, 2025
mamtadahiwal
approved these changes
Feb 5, 2025
ashwinsahu19
approved these changes
Feb 5, 2025
preshitaagrawal
approved these changes
Feb 5, 2025
RakeshAMore
reviewed
Feb 6, 2025
| @@ -59,6 +60,11 @@ public StagedBlob stage(InputStream data, long actualSize, Mailbox mbox) throws | |||
| return null; | |||
| } | |||
|
|
|||
| @Override | |||
| public StagedBlob stage(InputStream data, long actualSize, Mailbox mbox, Volume volume) throws IOException, ServiceException { | |||
| return null; | |||
There was a problem hiding this comment.
What about NotImplementedException or UnsupportedOperation
RakeshAMore
reviewed
Feb 6, 2025
| @Override | ||
| public StagedBlob stage(InputStream data, long actualSize, Mailbox mbox, Volume volume) throws IOException, ServiceException { | ||
| // mailbox store is on the same volume as incoming directory, so no need to stage the blob | ||
| throw ServiceException.FAILURE("Operation can not be completed because ExternalStoreManager is not available", null); |
There was a problem hiding this comment.
It is not necessary this method will be always executed for external storage, this message should be generic
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue: With-Blob Backup was not supported for external storage.
Fix: Modified the Backup and Restore code to support with-blob backup. For external storage, blobs will be restored in the same bucket.