opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 避免删除不存在的快照出错

Browse Source
This commit is contained in:
ioito
2019-09-16 17:11:10 +08:00
parent 858736cfdc
commit 6f4af695bd
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/hostman/storageman/storage_rbd.go
+14 -1
View File
@@ -442,7 +442,20 @@ func (s *SRbdStorage) createSnapshot(pool string, diskId string, snapshotId stri
func (s *SRbdStorage) deleteSnapshot(pool string, diskId string, snapshotId string) error {
_, err := s.withImage(pool, diskId, func(image *rbd.Image) (interface{}, error) {
snapshot := image.GetSnapshot(snapshotId)
snapshots, err := image.GetSnapshotNames()
if err != nil {
return nil, errors.Wrapf(err, "image.GetSnapshotNames()")
}
var snapshot *rbd.Snapshot
for _, snapInfo := range snapshots {
if snapInfo.Name == snapshotId {
snapshot = image.GetSnapshot(snapshotId)
break
}
}
if snapshot == nil { //not found snapshot
return nil, nil
}
isProtect, err := snapshot.IsProtected()
if err != nil {
return nil, errors.Wrap(err, "snapshot is protected")