fix: wait for mount status to be proper mode

Wait for the mount status to be read-write if we requested read-write
while it is being promoted to read-write from read-only.

Fixes #11969

Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>

Author: smira

internal/app/machined/pkg/automaton/blockautomaton/volume_mount.go

@@ -109,6 +109,10 @@ func waitForMountStatus(ctx context.Context, r controller.ReaderWriter, logger *
 		return nil, xerrors.NewTaggedf[automaton.Continue]("waiting for mount status to be established")
 	}
 
+	if mountStatus.TypedSpec().ReadOnly && !mountContext.options.ReadOnly {
+		return nil, xerrors.NewTaggedf[automaton.Continue]("volume is mounted read-only, but read-write was requested")
+	}
+
 	if !mountStatus.Metadata().Finalizers().Has(mountContext.requester) {
 		if err = r.AddFinalizer(ctx, mountStatus.Metadata(), mountContext.requester); err != nil {
 			return nil, fmt.Errorf("error adding finalizer: %w", err)

internal/app/machined/pkg/automaton/blockautomaton/volume_mount_test.go

@@ -121,3 +121,54 @@ func TestVolumeMounter(t *testing.T) {
 
 	assert.True(t, finished)
 }
+
+func TestVolumeMounterReadWrite(t *testing.T) {
+	t.Parallel()
+
+	logger := zaptest.NewLogger(t)
+	st := state.WrapCore(namespaced.NewState(inmem.Build))
+	ctx, cancel := context.WithTimeout(t.Context(), 10*time.Second)
+	t.Cleanup(cancel)
+
+	mountedCh := make(chan struct{})
+
+	volumeMounter := blockautomaton.NewVolumeMounter("rw", "volumeID", func(ctx context.Context, rw controller.ReaderWriter, l *zap.Logger, vms *block.VolumeMountStatus) error {
+		close(mountedCh)
+
+		return nil
+	})
+
+	const mountID = "rw-volumeID"
+
+	adapter := owned.New(st, "automaton")
+
+	// 1st run, should create the volume mount request
+	require.NoError(t, volumeMounter.Run(ctx, adapter, logger))
+
+	rtestutils.AssertResource(ctx, t, st, mountID, func(vmr *block.VolumeMountRequest, asrt *assert.Assertions) {
+		asrt.Equal("rw", vmr.TypedSpec().Requester)
+		asrt.Equal("volumeID", vmr.TypedSpec().VolumeID)
+		asrt.False(vmr.TypedSpec().ReadOnly)
+	})
+
+	require.NoError(t, st.AddFinalizer(ctx, block.NewVolumeMountRequest(block.NamespaceName, mountID).Metadata(), "test"))
+
+	vms := block.NewVolumeMountStatus(block.NamespaceName, mountID)
+	vms.TypedSpec().ReadOnly = true // volume is mounted read-only (from some other request)
+	require.NoError(t, st.Create(ctx, vms))
+
+	// no-op run, as the volume mount status is read-only
+	require.NoError(t, volumeMounter.Run(ctx, adapter, logger))
+
+	vms.TypedSpec().ReadOnly = false // volume is now mounted read-write
+	require.NoError(t, st.Update(ctx, vms))
+
+	// 2nd run, should put a finalizer on the volume mount status and call the callback 1st time, finishing the whole sequence
+	require.NoError(t, volumeMounter.Run(ctx, adapter, logger))
+
+	select {
+	case <-mountedCh:
+	case <-ctx.Done():
+		t.Fatal("timed out waiting for mount status callback")
+	}
+}