Skip to content

<feature>[storage]: switch volume encryption conversion to new install path #4530

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.

Sign up for GitHub

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

Closed
ZStack-Robot wants to merge 1 commit into from
Closed

<feature>[storage]: switch volume encryption conversion to new install path #4530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions ...in/java/org/zstack/header/storage/primary/ConvertVolumeEncryptionOnPrimaryStorageMsg.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ public static class VolumeEncryptionConversionItem implements Serializable {
private String resourceUuid;
private String resourceType;
private String sourceInstallPath;
private String sourceTrashInstallPath;
private String targetInstallPath;
private String targetBackingInstallPath;

Expand Down Expand Up @@ -82,14 +81,6 @@ public void setSourceInstallPath(String sourceInstallPath) {
this.sourceInstallPath = sourceInstallPath;
}

public String getSourceTrashInstallPath() {
return sourceTrashInstallPath;
}

public void setSourceTrashInstallPath(String sourceTrashInstallPath) {
this.sourceTrashInstallPath = sourceTrashInstallPath;
}

public String getTargetInstallPath() {
return targetInstallPath;
}
Expand Down
67 changes: 39 additions & 28 deletions plugin/ceph/src/main/java/org/zstack/storage/ceph/primary/CephPrimaryStorageBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,6 @@ public static class KVMHostLuksConvertCmd implements Serializable {
public String encryptedDek;
public String installPath;
public String targetInstallPath;
public String sourceTrashInstallPath;
public boolean targetEncrypted;
public Long virtualSize;
}
Expand Down Expand Up @@ -490,19 +489,6 @@ public static class KVMHostLuksRsp extends KVMAgentCommands.AgentResponse {
public Long actualSize;
}

public static class ReplaceLuksRbdCmd extends AgentCommand {
public String installPath;
public String targetInstallPath;
public String temporaryInstallPath;
public String sourceTrashInstallPath;
public boolean deleteSourceTrash;
}

public static class ReplaceLuksRbdRsp extends AgentResponse {
public Long size;
public Long actualSize;
}

public static class SwapInPlaceLuksRbdCmd extends AgentCommand {
public String installPath;
public String temporaryInstallPath;
Expand Down Expand Up @@ -1454,7 +1440,6 @@ public int compareTo(SnapInfo snapInfo) {
public static final String KVM_HOST_LUKS_ENCRYPT_IN_PLACE_PATH = "/ceph/primarystorage/kvmhost/encryptinplace";
public static final String KVM_HOST_LUKS_RESIZE_PATH = "/ceph/primarystorage/kvmhost/luksresize";
public static final String KVM_HOST_LUKS_CONVERT_PATH = "/ceph/primarystorage/kvmhost/luksconvert";
public static final String LUKS_REPLACE_VOLUME_PATH = "/ceph/primarystorage/volume/luksreplace";
public static final String LUKS_SWAP_IN_PLACE_PATH = "/ceph/primarystorage/volume/luksswapinplace";
public static final String KVM_HOST_IMAGESTORE_ENCRYPTED_DOWNLOAD_PATH = "/ceph/primarystorage/kvmhost/imagestore/encrypteddownload";
public static final String FLATTEN_PATH = "/ceph/primarystorage/volume/flatten";
Expand Down Expand Up @@ -3629,12 +3614,38 @@ protected void handle(ConvertVolumeEncryptionOnPrimaryStorageMsg msg) {
KVMHostLuksConvertCmd kcmd = new KVMHostLuksConvertCmd();
kcmd.psUuid = self.getUuid();
kcmd.installPath = item.getSourceInstallPath();
kcmd.targetInstallPath = makeTemporaryLuksRbdInstallPath(item.getTargetInstallPath(), "converting");
kcmd.sourceTrashInstallPath = item.getSourceTrashInstallPath();
kcmd.targetInstallPath = item.getTargetInstallPath();
kcmd.targetEncrypted = msg.isTargetEncrypted();
kcmd.virtualSize = msg.getVolume().getSize();
kcmd.encryptedDek = volumeEncryptedSecretHelper.materializeAndSealVolumeDekForHost(hostUuid, msg.getVolume().getUuid());

CheckIsBitsExistingCmd checkTargetCmd = new CheckIsBitsExistingCmd();
checkTargetCmd.setInstallPath(item.getTargetInstallPath());
httpCall(CHECK_BITS_PATH, checkTargetCmd, CheckIsBitsExistingRsp.class,
new ReturnValueCompletion<CheckIsBitsExistingRsp>(msg) {
@Override
public void success(CheckIsBitsExistingRsp returnValue) {
if (returnValue.isExisting()) {
reply.setError(operr("RBD LUKS conversion target already exists: %s", item.getTargetInstallPath()));
bus.reply(msg, reply);
return;
}
convertVolumeEncryptionOnKvmHost(msg, reply, kcmd, hostUuid);
}

@Override
public void fail(ErrorCode errorCode) {
reply.setError(errorCode);
bus.reply(msg, reply);
}
});
}

private void convertVolumeEncryptionOnKvmHost(ConvertVolumeEncryptionOnPrimaryStorageMsg msg,
ConvertVolumeEncryptionOnPrimaryStorageReply reply,
KVMHostLuksConvertCmd kcmd,
String hostUuid) {
ConvertVolumeEncryptionOnPrimaryStorageMsg.VolumeEncryptionConversionItem item = msg.getItems().get(0);
httpCallToKvmHost(hostUuid, KVM_HOST_LUKS_CONVERT_PATH, kcmd, KVMHostLuksRsp.class,
new ReturnValueCompletion<KVMHostLuksRsp>(msg) {
@Override
Expand All @@ -3646,16 +3657,16 @@ public void fail(ErrorCode err) {

@Override
public void success(KVMHostLuksRsp ret) {
ReplaceLuksRbdCmd rcmd = new ReplaceLuksRbdCmd();
rcmd.installPath = item.getSourceInstallPath();
rcmd.targetInstallPath = item.getTargetInstallPath();
rcmd.temporaryInstallPath = kcmd.targetInstallPath;
rcmd.sourceTrashInstallPath = item.getSourceTrashInstallPath();
rcmd.deleteSourceTrash = false;
httpCall(LUKS_REPLACE_VOLUME_PATH, rcmd, ReplaceLuksRbdRsp.class,
new ReturnValueCompletion<ReplaceLuksRbdRsp>(msg) {
if (ret.actualSize != null) {
reply.setActualSizes(Collections.singletonMap(msg.getVolume().getUuid(), ret.actualSize));
bus.reply(msg, reply);
return;
}

syncVolumeSize(msg.getVolume().getUuid(), item.getTargetInstallPath(),
new ReturnValueCompletion<GetVolumeSizeRsp>(msg) {
@Override
public void success(ReplaceLuksRbdRsp rsp) {
public void success(GetVolumeSizeRsp rsp) {
if (rsp.actualSize != null) {
reply.setActualSizes(Collections.singletonMap(msg.getVolume().getUuid(), rsp.actualSize));
}
Expand All @@ -3664,8 +3675,8 @@ public void success(ReplaceLuksRbdRsp rsp) {

@Override
public void fail(ErrorCode errorCode) {
deleteRbdBitsBestEffort(kcmd.targetInstallPath);
reply.setError(errorCode);
logger.warn(String.format("failed to sync converted RBD volume[uuid:%s, installPath:%s] size: %s",
msg.getVolume().getUuid(), item.getTargetInstallPath(), errorCode.getReadableDetails()));
bus.reply(msg, reply);
}
});
Expand Down
Loading