fix config volume recreate fallback masking

Author: cursoragent

lib/builds/manager.go

@@ -784,14 +784,19 @@ func (m *manager) registerBuildConfigVolume(ctx context.Context, buildID, volID,
 SizeGb: 1,
 	}
 _, err:=m.volumeManager.CreateVolume(ctx, req)
+recreateAttempted:=false
 iferrors.Is(err, volumes.ErrAlreadyExists) {
 m.logger.Info("removing leftover config volume from crashed build attempt", "build_id", buildID, "volume", volID)
 ifdelErr:=m.deleteLeftoverBuildVolume(ctx, buildID, volID); delErr!=nil {
 returnfmt.Errorf("remove leftover config volume: %w", delErr)
  }
+recreateAttempted=true
 _, err=m.volumeManager.CreateVolume(ctx, req)
 	}
 iferr!=nil {
+ifrecreateAttempted {
+returnfmt.Errorf("create config volume: %w", err)
+ }
 // If volume creation fails, try to use the disk file directly
 // by copying it to the expected location
 volPath:=m.paths.VolumeData(volID)

lib/builds/manager_test.go

@@ -1248,6 +1248,43 @@ func TestRegisterBuildConfigVolume_AlreadyExists(t *testing.T) {
 assert.Equal(t, configData, copied)
 }
 
+// TestRegisterBuildConfigVolume_RecreateFailure verifies that when recreating a
+// deleted leftover config volume fails, the recreate error is surfaced rather
+// than silently masked by the copy-over fallback.
+funcTestRegisterBuildConfigVolume_RecreateFailure(t*testing.T) {
+mgr, _, volumeMgr, tempDir:=setupTestManager(t)
+deferos.RemoveAll(tempDir)
+
+buildID:="build-crash-config-fail"
+configVolID:="build-config-"+buildID
+
+configDiskPath:=filepath.Join(tempDir, "config.ext4")
+require.NoError(t, os.WriteFile(configDiskPath, []byte("fake-ext4-config-disk"), 0644))
+
+varcreateCallsint
+recreateErr:=fmt.Errorf("recreate failed")
+volumeMgr.createFunc=func(ctx context.Context, req volumes.CreateVolumeRequest) (*volumes.Volume, error) {
+createCalls++
+ifcreateCalls==1 {
+returnnil, volumes.ErrAlreadyExists
+ }
+returnnil, recreateErr
+	}
+volumeMgr.deleteFunc=func(ctx context.Context, idstring) error {
+delete(volumeMgr.volumes, id)
+returnnil
+	}
+
+err:=mgr.registerBuildConfigVolume(context.Background(), buildID, configVolID, configDiskPath)
+
+require.Error(t, err)
+assert.ErrorIs(t, err, recreateErr)
+assert.Contains(t, err.Error(), "create config volume")
+assert.Equal(t, 2, createCalls, "expected delete + retry of config volume creation")
+_, statErr:=os.Stat(mgr.paths.VolumeData(configVolID))
+assert.ErrorIs(t, statErr, os.ErrNotExist, "config volume data should not be copied when recreate fails")
+}
+
 funcTestExtractInternalBaseImageRepos(t*testing.T) {
 registryURL:="http://10.102.0.1:8085"