Skip to content

Fix storage cleanup corner case preventing VM deletion #5575

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
nvazquez merged 3 commits into from
Oct 16, 2021
Merged

Fix storage cleanup corner case preventing VM deletion #5575

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eaa3fdb
Fix storage cleanup corner case
nvazquez Oct 13, 2021
8d4dfa5
Improve deletion
nvazquez Oct 13, 2021
f883f43
Refactor
nvazquez Oct 14, 2021
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
2 changes: 2 additions & 0 deletions engine/schema/src/main/java/com/cloud/storage/dao/VolumeDaoImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,6 +683,8 @@ public boolean updateUuid(long srcVolId, long destVolId) {
srcVol.setUuid(null);
destVol.setUuid(uuid);
destVol.setInstanceId(instanceId);
// Prevent storage cleanup corner case of ROOT volume deletion
srcVol.setVolumeType(Type.DATADISK);
Copy link
Copy Markdown
Member

@yadvr yadvr Oct 13, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could that cause any regression, does this save the VO in DB?

Copy link
Copy Markdown
Contributor Author

@nvazquez nvazquez Oct 13, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Currently testing for regressions. This saves the removed volume after storage migrations in DB as datadisk. @weizhouapache and I are considering the approach taken on restore VM as well: https://github.com/apache/cloudstack/blob/main/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java#L7407-L7409

update(srcVolId, srcVol);
update(destVolId, destVol);
_tagsDao.updateResourceId(srcVolId, destVolId, ResourceObjectType.Volume);
Expand Down