forked from zstackio/zstack
-
Notifications
You must be signed in to change notification settings - Fork 0
<feature>[storage]: ZSV-12577 support backup encryption change extension #4367
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
Open
zstack-robot-2
wants to merge
2
commits into
feature-zsv-5.1.0-encryption
Choose a base branch
from
sync/zstackio/dev/encrypted-volume-backup-linked-encryption@@4
base: feature-zsv-5.1.0-encryption
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
31 changes: 31 additions & 0 deletions
31
header/src/main/java/org/zstack/header/volume/VolumeBackupEncryptionConversionContext.java
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| package org.zstack.header.volume; | ||
|
|
||
| public class VolumeBackupEncryptionConversionContext { | ||
| private String volumeUuid; | ||
| private boolean targetEncrypted; | ||
| private Object extensionData; | ||
|
|
||
| public String getVolumeUuid() { | ||
| return volumeUuid; | ||
| } | ||
|
|
||
| public void setVolumeUuid(String volumeUuid) { | ||
| this.volumeUuid = volumeUuid; | ||
| } | ||
|
|
||
| public boolean isTargetEncrypted() { | ||
| return targetEncrypted; | ||
| } | ||
|
|
||
| public void setTargetEncrypted(boolean targetEncrypted) { | ||
| this.targetEncrypted = targetEncrypted; | ||
| } | ||
|
|
||
| public Object getExtensionData() { | ||
| return extensionData; | ||
| } | ||
|
|
||
| public void setExtensionData(Object extensionData) { | ||
| this.extensionData = extensionData; | ||
| } | ||
| } |
14 changes: 14 additions & 0 deletions
14
...rc/main/java/org/zstack/header/volume/VolumeBackupEncryptionConversionExtensionPoint.java
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| package org.zstack.header.volume; | ||
|
|
||
| import org.zstack.header.core.ReturnValueCompletion; | ||
|
|
||
| public interface VolumeBackupEncryptionConversionExtensionPoint { | ||
| void prepareVolumeBackupEncryptionConversion(VolumeInventory volume, boolean encrypted, | ||
| ReturnValueCompletion<VolumeBackupEncryptionConversionContext> completion); | ||
|
|
||
| void commitVolumeBackupEncryptionConversion(VolumeBackupEncryptionConversionContext context); | ||
|
|
||
| void rollbackVolumeBackupEncryptionConversion(VolumeBackupEncryptionConversionContext context); | ||
|
|
||
| void afterVolumeBackupEncryptionConversionCommitted(VolumeBackupEncryptionConversionContext context); | ||
| } |
245 changes: 219 additions & 26 deletions
245
plugin/ceph/src/main/java/org/zstack/storage/ceph/primary/CephPrimaryStorageBase.java
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or 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
This file contains hidden or 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
64 changes: 64 additions & 0 deletions
64
...main/java/org/zstack/storage/encrypt/VolumeBackupEncryptionConversionExtensionHelper.java
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| package org.zstack.storage.encrypt; | ||
|
|
||
| import org.zstack.header.volume.VolumeBackupEncryptionConversionContext; | ||
| import org.zstack.header.volume.VolumeBackupEncryptionConversionExtensionPoint; | ||
| import org.zstack.utils.Utils; | ||
| import org.zstack.utils.logging.CLogger; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
|
|
||
| public class VolumeBackupEncryptionConversionExtensionHelper { | ||
| private static final CLogger logger = Utils.getLogger(VolumeBackupEncryptionConversionExtensionHelper.class); | ||
|
|
||
| public static class Context { | ||
| private final VolumeBackupEncryptionConversionExtensionPoint extension; | ||
| private final VolumeBackupEncryptionConversionContext context; | ||
|
|
||
| public Context(VolumeBackupEncryptionConversionExtensionPoint extension, | ||
| VolumeBackupEncryptionConversionContext context) { | ||
| this.extension = extension; | ||
| this.context = context; | ||
| } | ||
| } | ||
|
|
||
| public Context makeContext(VolumeBackupEncryptionConversionExtensionPoint extension, | ||
| VolumeBackupEncryptionConversionContext context) { | ||
| return new Context(extension, context); | ||
| } | ||
|
|
||
| public void commit(List<Context> contexts) { | ||
| for (Context context : safeContexts(contexts)) { | ||
| context.extension.commitVolumeBackupEncryptionConversion(context.context); | ||
| } | ||
| } | ||
|
|
||
| public void rollback(List<Context> contexts, String volumeUuid) { | ||
| List<Context> reversed = new ArrayList<>(safeContexts(contexts)); | ||
| Collections.reverse(reversed); | ||
| for (Context context : reversed) { | ||
| try { | ||
| context.extension.rollbackVolumeBackupEncryptionConversion(context.context); | ||
| } catch (RuntimeException e) { | ||
| logger.warn(String.format("failed to rollback volume backup encryption conversion for volume[uuid:%s]: %s", | ||
| volumeUuid, e.getMessage()), e); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public void cleanupCommitted(List<Context> contexts, String volumeUuid) { | ||
| for (Context context : safeContexts(contexts)) { | ||
| try { | ||
| context.extension.afterVolumeBackupEncryptionConversionCommitted(context.context); | ||
| } catch (RuntimeException e) { | ||
| logger.warn(String.format("failed to run volume backup encryption conversion cleanup for volume[uuid:%s]: %s", | ||
| volumeUuid, e.getMessage()), e); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private List<Context> safeContexts(List<Context> contexts) { | ||
| return contexts == null ? Collections.emptyList() : contexts; | ||
| } | ||
| } |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.