Skip to content

fix: retry mkfs on next reconciliation if interrupted #481

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

fix: retry mkfs on next reconciliation if interrupted #481

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion satellite/src/main/java/com/linbit/linstor/layer/drbd/DrbdLayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1770,7 +1770,6 @@ private void condInitialOrSkipSync(DrbdRscData<Resource> drbdRscData)

// Set the resource primary (--force) to trigger an initial sync of all
// fat provisioned volumes
rsc.unsetCreatePrimary();
if (haveFatVlm)
{
errorReporter.logTrace("Setting resource primary on %s", drbdRscData.getSuffixedResourceName());
Expand All @@ -1795,6 +1794,7 @@ private void condInitialOrSkipSync(DrbdRscData<Resource> drbdRscData)
throw new StorageException("Failed to become secondary again after creating filesystem", exc);
}
}
rsc.unsetCreatePrimary();
}
}
catch (InvalidKeyException invalidKeyExc)
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/com/linbit/linstor/storage/utils/MkfsUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ public static void makeFileSystemOnMarked(
{
if (rsc.getLayerData(wrkCtx).checkFileSystem())
{
rsc.getLayerData(wrkCtx).disableCheckFileSystem();
for (AbsVolume<Resource> vlm : rsc.streamVolumes().collect(Collectors.toList()))
{
VolumeDefinition vlmDfn = vlm.getVolumeDefinition();
Expand Down Expand Up @@ -251,6 +250,7 @@ public static void makeFileSystemOnMarked(
// else Check for mismatch?
}
}
rsc.getLayerData(wrkCtx).disableCheckFileSystem();
}
}

Expand Down