Skip to content

fix(drbd): create metadata during toggle-disk from diskless to diskful #474

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

Closed
kvaps wants to merge 1 commit into from
Closed

fix(drbd): create metadata during toggle-disk from diskless to diskful #474

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
23 changes: 18 additions & 5 deletions 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 @@ -501,10 +501,13 @@ private boolean processChild(
boolean isDiskless = drbdRscData.getAbsResource().isDrbdDiskless(workerCtx);
StateFlags<Flags> rscFlags = drbdRscData.getAbsResource().getStateFlags();
boolean isDiskRemoving = rscFlags.isSet(workerCtx, Resource.Flags.DISK_REMOVING);
// Check if we're in toggle-disk operation (adding disk to diskless resource)
boolean isDiskAdding = rscFlags.isSomeSet(workerCtx, Resource.Flags.DISK_ADD_REQUESTED, Resource.Flags.DISK_ADDING);

boolean contProcess = isDiskless;

boolean processChildren = !isDiskless || isDiskRemoving;
// Process children when: has disk, removing disk, OR adding disk (toggle-disk)
boolean processChildren = !isDiskless || isDiskRemoving || isDiskAdding;
// do not process children when ONLY DRBD_DELETE flag is set (DELETE flag is still unset)
processChildren &= (!rscFlags.isSet(workerCtx, Resource.Flags.DRBD_DELETE) ||
rscFlags.isSet(workerCtx, Resource.Flags.DELETE));
Expand Down Expand Up @@ -697,7 +700,11 @@ else if (isNeitherResizeFlagsSet(drbdVlmData))
{
// hasMetaData needs to be run after child-resource processed
List<DrbdVlmData<Resource>> createMetaData = new ArrayList<>();
if (!drbdRscData.getAbsResource().isDrbdDiskless(workerCtx) && !skipDisk)
// Check if we're in toggle-disk operation (adding disk to diskless resource)
boolean isDiskAddingForMd = drbdRscData.getAbsResource().getStateFlags()
.isSomeSet(workerCtx, Resource.Flags.DISK_ADD_REQUESTED, Resource.Flags.DISK_ADDING);
// Create metadata when: has disk OR adding disk (toggle-disk), and skipDisk is disabled
if ((!drbdRscData.getAbsResource().isDrbdDiskless(workerCtx) || isDiskAddingForMd) && !skipDisk)
{
// do not try to create meta data while the resource is diskless or skipDisk is enabled
for (DrbdVlmData<Resource> drbdVlmData : checkMetaData)
Expand Down Expand Up @@ -1114,8 +1121,10 @@ private List<DrbdVlmData<Resource>> detachVolumesIfNecessary(DrbdRscData<Resourc
{
List<DrbdVlmData<Resource>> checkMetaData = new ArrayList<>();
Resource rsc = drbdRscData.getAbsResource();
// Include DISK_ADD_REQUESTED/DISK_ADDING for toggle-disk scenario where we need to check/create metadata
if (!rsc.isDrbdDiskless(workerCtx) ||
rsc.getStateFlags().isSet(workerCtx, Resource.Flags.DISK_REMOVING)
rsc.getStateFlags().isSet(workerCtx, Resource.Flags.DISK_REMOVING) ||
rsc.getStateFlags().isSomeSet(workerCtx, Resource.Flags.DISK_ADD_REQUESTED, Resource.Flags.DISK_ADDING)
)
{
// using a dedicated list to prevent concurrentModificationException
Expand Down Expand Up @@ -1311,8 +1320,12 @@ private boolean hasMetaData(DrbdVlmData<Resource> drbdVlmData)

// Assume that meta data is there and do not create meta data if the check is disabled (checkMetaData),
// except if there is no disk, because when adding a disk, meta data for a disk must be created
// despite the DRBD logic still saying it is diskless
hasMetaData = !drbdVlmData.checkMetaData() && drbdVlmData.hasDisk();
// despite the DRBD logic still saying it is diskless.
// Also force metadata check when DISK_ADD_REQUESTED/DISK_ADDING flag is set (retry scenario
// where storage exists but no metadata).
boolean isDiskAddingState = drbdVlmData.getRscLayerObject().getAbsResource().getStateFlags()
.isSomeSet(workerCtx, Resource.Flags.DISK_ADD_REQUESTED, Resource.Flags.DISK_ADDING);
hasMetaData = !drbdVlmData.checkMetaData() && drbdVlmData.hasDisk() && !isDiskAddingState;
if (!hasMetaData)
{
if (mdUtils.hasMetaData())
Expand Down