etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 9777: introduce Error status for snapshot, if snapshot creation fails, it will be in Error status 

status 9777: resolved fixed
This commit is contained in:
anthony 2011-09-14 18:04:23 -07:00
parent 9ed43b1039
commit 16a97468c2
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/src/com/cloud/storage/Snapshot.java
View File

@ -55,7 +55,8 @@ public interface Snapshot extends ControlledEntity{
Creating,
CreatedOnPrimary,
BackingUp,
BackedUp;
BackedUp,
Error;
public String toString() {
return this.name();

26
server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
View File

@ -269,7 +269,7 @@ public class SnapshotManagerImpl implements SnapshotManager, SnapshotService, Ma
}
StoragePoolVO srcPool = _storagePoolDao.findById(volume.getPoolId());
ManageSnapshotCommand cmd = new ManageSnapshotCommand(snapshotId, volume.getPath(), srcPool, preSnapshotPath, snapshot.getName(), vmName);
ManageSnapshotAnswer answer = (ManageSnapshotAnswer) sendToPool(volume, cmd);
// Update the snapshot in the database
if ((answer != null) && answer.getResult()) {
@ -408,8 +408,14 @@ public class SnapshotManagerImpl implements SnapshotManager, SnapshotService, Ma
} else if (snapshot.getStatus() == Snapshot.Status.BackedUp) {
// For empty snapshot we set status to BackedUp in createSnapshotOnPrimary
backedUp = true;
} else {
snapshot.setStatus(Status.Error);
_snapshotDao.update(snapshot.getId(), snapshot);
throw new CloudRuntimeException("Failed to create snapshot: " + snapshot + " on primary storage");
}
if (!backedUp) {
snapshot.setStatus(Status.Error);
_snapshotDao.update(snapshot.getId(), snapshot);
throw new CloudRuntimeException("Created snapshot: " + snapshot + " on primary but failed to backup on secondary");
}
} else {
@ -426,8 +432,13 @@ public class SnapshotManagerImpl implements SnapshotManager, SnapshotService, Ma
v.getSize());
_usageEventDao.persist(usageEvent);
}
} else if (snapshot == null || !backedUp) {
_accountMgr.decrementResourceCount(owner.getId(), ResourceType.snapshot);
if( !backedUp ) {
snapshot.setStatus(Status.Error);
_snapshotDao.update(snapshot.getId(), snapshot);
} else {
_accountMgr.incrementResourceCount(owner.getId(), ResourceType.snapshot);
}
}
if ( volume != null ) {
@ -600,10 +611,6 @@ public class SnapshotManagerImpl implements SnapshotManager, SnapshotService, Ma
snapshot.setStatus(Snapshot.Status.BackedUp);
_snapshotDao.update(snapshotId, snapshot);
if (snapshot.isRecursive()) {
_accountMgr.incrementResourceCount(snapshot.getAccountId(), ResourceType.snapshot);
}
} else {
s_logger.warn("Failed to back up snapshot on secondary storage, deleting the record from the DB");
_snapshotDao.remove(snapshotId);
@ -644,6 +651,7 @@ public class SnapshotManagerImpl implements SnapshotManager, SnapshotService, Ma
SnapshotVO snapshot = _snapshotDao.findByIdIncludingRemoved(snapshotId);
// Even if the current snapshot failed, we should schedule the next
// recurring snapshot for this policy.
if (snapshot.isRecursive()) {
postCreateRecurringSnapshotForPolicy(userId, volumeId, snapshotId, policyId);
}
@ -1284,10 +1292,6 @@ public class SnapshotManagerImpl implements SnapshotManager, SnapshotService, Ma
(short) snapshotType.ordinal(), snapshotType.name(), volume.getSize(), hypervisorType);
SnapshotVO snapshot = _snapshotDao.persist(snapshotVO);
if (snapshot != null) {
_accountMgr.incrementResourceCount(volume.getAccountId(), ResourceType.snapshot);
}
return snapshot;
}