Skip to content

fix(drbd): use actual device path in res file during toggle-disk #473

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
+5 −1
Closed

fix(drbd): use actual device path in res file during toggle-disk #473

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
6 changes: 5 additions & 1 deletion satellite/src/main/java/com/linbit/linstor/layer/drbd/resfiles/ConfFileBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -894,12 +894,16 @@ private void appendVlmIfPresent(DrbdVlmData<Resource> vlmData, AccessContext loc
if (((Volume) vlmData.getVolume()).getFlags().isUnset(localAccCtx, Volume.Flags.DELETE))
{
final String disk;
// Check if we're in toggle-disk operation (adding disk to diskless resource)
boolean isDiskAdding = vlmData.getVolume().getAbsResource().getStateFlags().isSomeSet(
localAccCtx, Resource.Flags.DISK_ADD_REQUESTED, Resource.Flags.DISK_ADDING);
if ((!isPeerRsc && vlmData.getDataDevice() == null) ||
(isPeerRsc &&
// FIXME: vlmData.getRscLayerObject().getFlags should be used here
vlmData.getVolume().getAbsResource().disklessForDrbdPeers(accCtx)
) ||
(!isPeerRsc &&
// For toggle-disk: if dataDevice is set and we're adding disk, use the actual device
(!isPeerRsc && !isDiskAdding &&
// FIXME: vlmData.getRscLayerObject().getFlags should be used here
vlmData.getVolume().getAbsResource().isDrbdDiskless(accCtx)
)
Expand Down