Skip to content

Fix of revert RBD snapshots #5544

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

Merged
sureshanaparti merged 7 commits into from
Feb 10, 2022
Merged

Fix of revert RBD snapshots #5544

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f72263d
Fix of revert RBD snapshots
slavkap Oct 1, 2021
d86f383
Check if snapshot is on primary storage
slavkap Oct 6, 2021
8a238cf
Fix unit tests
slavkap Oct 6, 2021
04cc48f
removed unused method's params
slavkap Jan 11, 2022
3c4ef89
Formatted error message and added the snapshot ID to it
slavkap Jan 20, 2022
709e042
Return to the old logic, the fix will only apply to RBD
slavkap Feb 7, 2022
d4e0ecc
Formatted Exception's messages
slavkap Feb 9, 2022
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
23 changes: 10 additions & 13 deletions server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,11 +308,12 @@ public Snapshot revertSnapshot(Long snapshotId) {
}
}

DataStoreRole dataStoreRole = getDataStoreRole(snapshot, _snapshotStoreDao, dataStoreMgr);
DataStoreRole dataStoreRole = getDataStoreRole(snapshot);

SnapshotInfo snapshotInfo = snapshotFactory.getSnapshot(snapshotId, dataStoreRole);
Comment thread
sureshanaparti marked this conversation as resolved.

if (snapshotInfo == null) {
throw new CloudRuntimeException("snapshot:" + snapshotId + " not exist in data store");
throw new CloudRuntimeException(String.format("snapshot %s [%s] does not exists in data store", snapshot.getName(), snapshot.getUuid()));
}

SnapshotStrategy snapshotStrategy = _storageStrategyFactory.getSnapshotStrategy(snapshot, SnapshotOperation.REVERT);
Expand Down Expand Up @@ -587,7 +588,7 @@ public boolean deleteSnapshot(long snapshotId) {
return false;
}

DataStoreRole dataStoreRole = getDataStoreRole(snapshotCheck, _snapshotStoreDao, dataStoreMgr);
DataStoreRole dataStoreRole = getDataStoreRole(snapshotCheck);

SnapshotDataStoreVO snapshotStoreRef = _snapshotStoreDao.findBySnapshot(snapshotId, dataStoreRole);

Expand Down Expand Up @@ -1238,15 +1239,11 @@ public SnapshotInfo takeSnapshot(VolumeInfo volume) throws ResourceAllocationExc
try {
postCreateSnapshot(volume.getId(), snapshotId, payload.getSnapshotPolicyId());

DataStoreRole dataStoreRole = getDataStoreRole(snapshot, _snapshotStoreDao, dataStoreMgr);
DataStoreRole dataStoreRole = getDataStoreRole(snapshot);

SnapshotDataStoreVO snapshotStoreRef = _snapshotStoreDao.findBySnapshot(snapshotId, dataStoreRole);
if (snapshotStoreRef == null) {
// The snapshot was not backed up to secondary. Find the snap on primary
snapshotStoreRef = _snapshotStoreDao.findBySnapshot(snapshotId, DataStoreRole.Primary);
if (snapshotStoreRef == null) {
throw new CloudRuntimeException("Could not find snapshot");
}
throw new CloudRuntimeException(String.format("Could not find snapshot %s [%s] on [%s]", snapshot.getName(), snapshot.getUuid(), snapshot.getLocationType()));
}
UsageEventUtils.publishUsageEvent(EventTypes.EVENT_SNAPSHOT_CREATE, snapshot.getAccountId(), snapshot.getDataCenterId(), snapshotId, snapshot.getName(), null, null,
snapshotStoreRef.getPhysicalSize(), volume.getSize(), snapshot.getClass().getName(), snapshot.getUuid());
Expand Down Expand Up @@ -1332,8 +1329,8 @@ private void updateSnapshotPayload(long storagePoolId, CreateSnapshotPayload pay
}
}

private DataStoreRole getDataStoreRole(Snapshot snapshot, SnapshotDataStoreDao snapshotStoreDao, DataStoreManager dataStoreMgr) {
SnapshotDataStoreVO snapshotStore = snapshotStoreDao.findBySnapshot(snapshot.getId(), DataStoreRole.Primary);
private DataStoreRole getDataStoreRole(Snapshot snapshot) {
SnapshotDataStoreVO snapshotStore = _snapshotStoreDao.findBySnapshot(snapshot.getId(), DataStoreRole.Primary);

if (snapshotStore == null) {
return DataStoreRole.Image;
Expand All @@ -1346,15 +1343,15 @@ private DataStoreRole getDataStoreRole(Snapshot snapshot, SnapshotDataStoreDao s

if (mapCapabilities != null) {
String value = mapCapabilities.get(DataStoreCapabilities.STORAGE_SYSTEM_SNAPSHOT.toString());
Boolean supportsStorageSystemSnapshots = new Boolean(value);
Boolean supportsStorageSystemSnapshots = Boolean.valueOf(value);

Comment thread
sureshanaparti marked this conversation as resolved.
if (supportsStorageSystemSnapshots) {
return DataStoreRole.Primary;
}
}

StoragePoolVO storagePoolVO = _storagePoolDao.findById(storagePoolId);
if ((storagePoolVO.getPoolType() == StoragePoolType.RBD || storagePoolVO.getPoolType() == StoragePoolType.PowerFlex) && !BackupSnapshotAfterTakingSnapshot.value()) {
if (storagePoolVO.getPoolType() == StoragePoolType.RBD) {
return DataStoreRole.Primary;
}

Expand Down