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

Open
ZStack-Robot wants to merge 1 commit into
base: dev/encrypted-volume-snapshot-conversion-rollback@@3
Choose a base branch
from
Open

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

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
61 changes: 37 additions & 24 deletions storage/src/main/java/org/zstack/storage/volume/VolumeBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3408,7 +3408,16 @@ public void run(FlowTrigger trigger, Map data) {
VolumeEncryptionConversionContext ctx = conversionContext.get();
updateVolumeEncryptionConversionInDb(targetEncrypted, ctx.snapshots, ctx.oldAndNewInstallPaths,
(Map<String, Long>) data.get("actualSizes"));
refreshVO();
try {
refreshVO();
} catch (RuntimeException e) {
logger.warn(String.format("failed to refresh volume[uuid:%s] after encryption conversion DB update: %s",
self.getUuid(), e.getMessage()), e);
VolumeVO latest = dbf.findByUuid(self.getUuid(), VolumeVO.class);
if (latest != null) {
self = latest;
}
}
trigger.next();
}

Expand Down Expand Up @@ -3741,34 +3750,38 @@ private void deleteConvertedVolumeEncryptionBits(List<ConvertVolumeEncryptionOnP
}
}

@Transactional
private void updateVolumeEncryptionConversionInDb(boolean targetEncrypted, List<VolumeSnapshotVO> snapshots,
Map<String, String> oldAndNewInstallPaths,
Map<String, Long> actualSizes) {
VolumeSnapshotReferenceUtils.handleVolumeInstallUrlChange(self.getUuid(), oldAndNewInstallPaths);

UpdateQuery q = SQL.New(VolumeVO.class)
.eq(VolumeVO_.uuid, self.getUuid())
.set(VolumeVO_.installPath, oldAndNewInstallPaths.get(self.getInstallPath()))
.set(VolumeVO_.encrypted, targetEncrypted);
if (actualSizes != null && actualSizes.get(self.getUuid()) != null) {
q.set(VolumeVO_.actualSize, actualSizes.get(self.getUuid()));
}
q.update();
new SQLBatch() {
@Override
protected void scripts() {
VolumeSnapshotReferenceUtils.handleVolumeInstallUrlChange(self.getUuid(), oldAndNewInstallPaths);

UpdateQuery q = SQL.New(VolumeVO.class)
.eq(VolumeVO_.uuid, self.getUuid())
.set(VolumeVO_.installPath, oldAndNewInstallPaths.get(self.getInstallPath()))
.set(VolumeVO_.encrypted, targetEncrypted);
if (actualSizes != null && actualSizes.get(self.getUuid()) != null) {
q.set(VolumeVO_.actualSize, actualSizes.get(self.getUuid()));
}
q.update();

Map<String, String> convertedSnapshotInstallPaths = new LinkedHashMap<>();
for (VolumeSnapshotVO snapshot : snapshots) {
String newPath = oldAndNewInstallPaths.get(snapshot.getPrimaryStorageInstallPath());
if (StringUtils.isBlank(newPath)) {
continue;
}
convertedSnapshotInstallPaths.put(snapshot.getUuid(), newPath);
}
Map<String, String> convertedSnapshotInstallPaths = new LinkedHashMap<>();
for (VolumeSnapshotVO snapshot : snapshots) {
String newPath = oldAndNewInstallPaths.get(snapshot.getPrimaryStorageInstallPath());
if (StringUtils.isBlank(newPath)) {
continue;
}
convertedSnapshotInstallPaths.put(snapshot.getUuid(), newPath);
}

updateConvertedSnapshotPaths(convertedSnapshotInstallPaths, targetEncrypted);
if (targetEncrypted && !convertedSnapshotInstallPaths.isEmpty()) {
volumeEncryptedResourceKeyBackend.copyVolumeKeyRefToSnapshots(self.getUuid(), convertedSnapshotInstallPaths.keySet());
}
updateConvertedSnapshotPaths(convertedSnapshotInstallPaths, targetEncrypted);
if (targetEncrypted && !convertedSnapshotInstallPaths.isEmpty()) {
volumeEncryptedResourceKeyBackend.copyVolumeKeyRefToSnapshots(self.getUuid(), convertedSnapshotInstallPaths.keySet());
}
}
}.execute();
}

private void updateConvertedSnapshotPaths(Map<String, String> snapshotInstallPaths, boolean targetEncrypted) {
Expand Down