Skip to content

<fix>[storage]: optimize snapshot group creation and deletion logic #2978

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: zsv_4.10.28
Choose a base branch
from
Open

<fix>[storage]: optimize snapshot group creation and deletion logic #2978

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
117 changes: 97 additions & 20 deletions storage/src/main/java/org/zstack/storage/snapshot/group/VolumeSnapshotGroupBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
import org.zstack.core.thread.ChainTask;
import org.zstack.core.thread.SyncTaskChain;
import org.zstack.core.thread.ThreadFacade;
import org.zstack.core.workflow.ShareFlow;
import org.zstack.core.workflow.ShareFlowChain;
import org.zstack.core.workflow.SimpleFlowChain;
import org.zstack.header.core.NoErrorCompletion;
import org.zstack.header.core.WhileDoneCompletion;
Expand All @@ -31,6 +33,8 @@
import org.zstack.header.storage.snapshot.group.*;
import org.zstack.header.vm.RestoreVmInstanceMsg;
import org.zstack.header.vm.VmInstanceConstant;
import org.zstack.header.vm.VmInstanceVO;
import org.zstack.header.vm.VmInstanceVO_;
import org.zstack.header.vm.devices.VmInstanceResourceMetadataManager;
import org.zstack.header.volume.VolumeType;
import org.zstack.header.volume.VolumeVO;
Expand Down Expand Up @@ -209,28 +213,101 @@ private void handle(DeleteVolumeSnapshotGroupInnerMsg msg) {
logger.debug(String.format("skip snapshots not belong to origin vm[uuid:%s]", self.getVmInstanceUuid()));
}

new While<>(snapshots).all((snapshot, compl) -> {
DeleteVolumeSnapshotMsg rmsg = new DeleteVolumeSnapshotMsg();
rmsg.setSnapshotUuid(snapshot.getUuid());
rmsg.setVolumeUuid(snapshot.getVolumeUuid());
rmsg.setTreeUuid(snapshot.getTreeUuid());
rmsg.setDeletionMode(msg.getDeletionMode());
rmsg.setScope(msg.getScope());
rmsg.setDirection(msg.getDirection());
bus.makeTargetServiceIdByResourceUuid(rmsg, VolumeSnapshotConstant.SERVICE_ID, getResourceIdToRouteMsg(snapshot));
bus.send(rmsg, new CloudBusCallBack(compl) {
@Override
public void run(MessageReply r) {
reply.addResult(new DeleteSnapshotGroupResult(rmsg.getSnapshotUuid(), rmsg.getVolumeUuid(), r.getError()));
compl.done();
}
});
}).run(new WhileDoneCompletion(msg) {
String vmUuid = self.getVmInstanceUuid();
String rootVolumeUuid = Q.New(VmInstanceVO.class).eq(VmInstanceVO_.uuid, vmUuid)
.select(VmInstanceVO_.rootVolumeUuid).findValue();

VolumeSnapshotVO rootVolumeSnapshot = snapshots.stream().filter(s -> s.getVolumeUuid().equals(rootVolumeUuid)).findFirst().orElse(null);
snapshots.removeIf(s -> s.getVolumeUuid().equals(rootVolumeUuid));

FlowChain chain = new ShareFlowChain();
chain.then(new ShareFlow() {
boolean skipDeleteRootVolumeSnapshot = false;

@Override
public void done(ErrorCodeList errorCodeList) {
bus.reply(msg, reply);
public void setup() {
flow(new NoRollbackFlow() {
String __name__ = "delete-data-volume-snapshots";

@Override
public void run(FlowTrigger trigger, Map data) {
new While<>(snapshots).all((snapshot, compl) -> {
DeleteVolumeSnapshotMsg rmsg = buildDeleteVolumeSnapshotMsg(snapshot, msg);
bus.makeTargetServiceIdByResourceUuid(rmsg, VolumeSnapshotConstant.SERVICE_ID, getResourceIdToRouteMsg(snapshot));
bus.send(rmsg, new CloudBusCallBack(compl) {
@Override
public void run(MessageReply r) {
if (r.getError() != null) {
skipDeleteRootVolumeSnapshot = true;
}
reply.addResult(new DeleteSnapshotGroupResult(rmsg.getSnapshotUuid(), rmsg.getVolumeUuid(), r.getError()));
compl.done();
}
});
}).run(new WhileDoneCompletion(msg) {
@Override
public void done(ErrorCodeList errorCodeList) {
trigger.next();
}
});
}
});

flow(new NoRollbackFlow() {
String __name__ = "delete-root-volume-snapshot";

@Override
public void run(FlowTrigger trigger, Map data) {
if (rootVolumeSnapshot == null) {
trigger.next();
return;
}

if (skipDeleteRootVolumeSnapshot) {
// skip delete root volume snapshot if delete data volume snapshot failed
logger.debug(String.format("skip delete root volume snapshot[uuid:%s] if delete data volume snapshot failed", rootVolumeSnapshot.getUuid()));
trigger.next();
return;
}

DeleteVolumeSnapshotMsg rmsg = buildDeleteVolumeSnapshotMsg(rootVolumeSnapshot, msg);
bus.makeTargetServiceIdByResourceUuid(rmsg, VolumeSnapshotConstant.SERVICE_ID, getResourceIdToRouteMsg(rootVolumeSnapshot));
bus.send(rmsg, new CloudBusCallBack(trigger) {
@Override
public void run(MessageReply r) {
reply.addResult(new DeleteSnapshotGroupResult(rmsg.getSnapshotUuid(), rmsg.getVolumeUuid(), r.getError()));
trigger.next();
}
});
}
});

done(new FlowDoneHandler(msg) {
@Override
public void handle(Map data) {
bus.reply(msg, reply);
}
});

error(new FlowErrorHandler(msg) {
@Override
public void handle(ErrorCode errCode, Map data) {
bus.reply(msg, reply);
}
});
}
});

private DeleteVolumeSnapshotMsg buildDeleteVolumeSnapshotMsg(VolumeSnapshotVO snapshot, DeleteVolumeSnapshotGroupInnerMsg msg) {
DeleteVolumeSnapshotMsg rmsg = new DeleteVolumeSnapshotMsg();
rmsg.setSnapshotUuid(snapshot.getUuid());
rmsg.setVolumeUuid(snapshot.getVolumeUuid());
rmsg.setTreeUuid(snapshot.getTreeUuid());
rmsg.setDeletionMode(msg.getDeletionMode());
rmsg.setScope(msg.getScope());
rmsg.setDirection(msg.getDirection());
return rmsg;
}
}).start();
}

private void handle(APIRevertVmFromSnapshotGroupMsg msg) {
Expand Down