Skip to content

<fix>[xinfini]: clean leftover mappings before activate #4226

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-2 wants to merge 1 commit into
base: 5.5.28
Choose a base branch
from
Open

<fix>[xinfini]: clean leftover mappings before activate #4226

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
18 changes: 16 additions & 2 deletions plugin/xinfini/src/main/java/org/zstack/xinfini/XInfiniApiHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,9 +416,20 @@ protected boolean onFailure(Throwable t) {

private <T extends XInfiniResponse> void retryUtilResourceDeleted(XInfiniRequest req,
Class<T> rsp) {
retryUtilResourceDeleted(req, rsp, 150, 2);
}

private <T extends XInfiniResponse> void retryUtilResourceDeleted(XInfiniRequest req,
Class<T> rsp,
int retryTimes,
int retryInterval) {
new Retry<Void>() {
{
times = retryTimes;
interval = retryInterval;
}

@Override
@RetryCondition(times = 150, interval = 2)
protected Void call() {
T r = XInfiniApiHelper.this.call(req, rsp);
if (!r.resourceIsDeleted()) {
Expand Down Expand Up @@ -731,7 +742,10 @@ public void deleteVolumeClientGroupMapping(int mapId) {

GetVolumeClientGroupMappingRequest gReq = new GetVolumeClientGroupMappingRequest();
gReq.setId(mapId);
retryUtilResourceDeleted(gReq, GetVolumeClientGroupMappingResponse.class);
// the storage tears mappings down asynchronously path by path and cannot be
// operated on while deleting; observed taking over 30 minutes, so wait long
// enough to cover the teardown window
retryUtilResourceDeleted(gReq, GetVolumeClientGroupMappingResponse.class, 1800, 2);
}

public List<IscsiGatewayClientGroupMappingModule> queryIscsiGatewayClientGroupMappingByGroupId(int groupId) {
Expand Down