Skip to content

<fix>[storage]: fix unstable DeleteSnapShotGroup2Case #4037

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
MatheMatrix wants to merge 1 commit into
base: zsv_5.1.0
Choose a base branch
from
Open

<fix>[storage]: fix unstable DeleteSnapShotGroup2Case #4037

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
49 changes: 28 additions & 21 deletions storage/src/main/java/org/zstack/storage/snapshot/VolumeSnapshotBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
package org.zstack.storage.snapshot;

import org.hibernate.exception.ConstraintViolationException;
import org.springframework.beans.factory.annotation.Autowire;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Configurable;
import org.springframework.dao.DataIntegrityViolationException;
import org.zstack.core.asyncbatch.While;
import org.zstack.core.cloudbus.CloudBus;
import org.zstack.core.cloudbus.CloudBusCallBack;
import org.zstack.core.cloudbus.MessageSafe;
import org.zstack.core.componentloader.PluginRegistry;
import org.zstack.core.db.DatabaseFacade;
import org.zstack.core.db.SQL;
import org.zstack.core.workflow.FlowChainBuilder;
import org.zstack.core.workflow.ShareFlow;
import org.zstack.header.core.Completion;
Expand All @@ -26,12 +25,10 @@
import org.zstack.header.storage.snapshot.*;
import org.zstack.header.storage.snapshot.VolumeSnapshotStatus.StatusEvent;
import org.zstack.utils.CollectionUtils;
import org.zstack.utils.ExceptionDSL;
import org.zstack.utils.Utils;
import org.zstack.utils.function.ForEachFunction;
import org.zstack.utils.logging.CLogger;

import javax.persistence.PersistenceException;
import java.util.Map;

/**
Expand Down Expand Up @@ -210,8 +207,21 @@ public void run(MessageReply rsp) {
*/

private void changeStatus(VolumeSnapshotStatus.StatusEvent event) {
self.setStatus(self.getStatus().nextState(event));
dbf.update(self);
String uuid = self.getUuid();
VolumeSnapshotVO latest = dbf.reload(self);
if (latest == null) {
logger.debug(String.format("volume snapshot[uuid=%s] is not found", uuid));
return;
}

VolumeSnapshotStatus next = latest.getStatus().nextState(event);
SQL.New(VolumeSnapshotVO.class)
.eq(VolumeSnapshotVO_.uuid, latest.getUuid())
.set(VolumeSnapshotVO_.status, next)
.update();

latest.setStatus(next);
self = latest;
}

private void handle(final VolumeSnapshotPrimaryStorageDeletionMsg msg) {
Expand All @@ -237,23 +247,20 @@ public void fail(ErrorCode errorCode) {
@Override
public void done(ErrorCodeList errorCodeList) {
VolumeSnapshotPrimaryStorageDeletionReply dreply = new VolumeSnapshotPrimaryStorageDeletionReply();
try {
updateDb();
} catch (DataIntegrityViolationException | PersistenceException e) {
if (!ExceptionDSL.isCausedBy(e, ConstraintViolationException.class) && !ExceptionDSL.isCausedBy(e, DataIntegrityViolationException.class)) {
throw e;
}
// volume snapshot group may has been removed, try again.
updateDb();
String uuid = self.getUuid();
VolumeSnapshotVO latest = dbf.reload(self);
if (latest == null) {
logger.debug(String.format("volume snapshot[uuid=%s] is not found", uuid));
bus.reply(msg, dreply);
return;
}
bus.reply(msg, dreply);
}

private void updateDb() {
self = dbf.reload(self);
self.setPrimaryStorageInstallPath(null);
self.setPrimaryStorageUuid(null);
dbf.update(self);
SQL.New(VolumeSnapshotVO.class)
.eq(VolumeSnapshotVO_.uuid, latest.getUuid())
.set(VolumeSnapshotVO_.primaryStorageInstallPath, null)
.set(VolumeSnapshotVO_.primaryStorageUuid, null)
.update();
bus.reply(msg, dreply);
}
});
}
Expand Down