rscgrp-spawn: prevent spawn from committing rscdef/voldef

LINBIT · Jan 12, 2021 · f65c4e8 · f65c4e8
1 parent badba82
commit f65c4e8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/...r/src/main/java/com/linbit/linstor/core/apicallhandler/controller/CtrlApiCallHandler.java b/...r/src/main/java/com/linbit/linstor/core/apicallhandler/controller/CtrlApiCallHandler.java
@@ -227,7 +227,8 @@ public ApiCallRc createResourceDefinition(
                 peerSlotsRef,
                 rscGrpNameRef,
                 false,
-                apiCallRc
+                apiCallRc,
+                true
             );
         }
         return apiCallRc;

diff --git a/...main/java/com/linbit/linstor/core/apicallhandler/controller/CtrlRscDfnApiCallHandler.java b/...main/java/com/linbit/linstor/core/apicallhandler/controller/CtrlRscDfnApiCallHandler.java
@@ -175,7 +175,8 @@ public ResourceDefinition createResourceDefinition(
         Short peerSlotsRef,
         String rscGrpNameStr,
         boolean throwOnError,
-        ApiCallRcImpl apiCallRc
+        ApiCallRcImpl apiCallRc,
+        boolean commit
     )
     {
         ApiCallRcImpl responses = new ApiCallRcImpl();
@@ -228,7 +229,10 @@ public ResourceDefinition createResourceDefinition(
 
             resourceDefinitionRepository.put(apiCtx, rscDfn);
 
-            ctrlTransactionHelper.commit();
+            if (commit)
+            {
+                ctrlTransactionHelper.commit();
+            }
 
             for (VolumeDefinition vlmDfn : createdVlmDfns)
             {

diff --git a/...main/java/com/linbit/linstor/core/apicallhandler/controller/CtrlRscGrpApiCallHandler.java b/...main/java/com/linbit/linstor/core/apicallhandler/controller/CtrlRscGrpApiCallHandler.java
@@ -801,7 +801,8 @@ private Flux<ApiCallRc> spawnInTransaction(
                 null,
                 rscGrpNameRef,
                 true,
-                apiCallRc
+                apiCallRc,
+                definitionsOnlyRef
             );
 
             if (autoPlaceConfig != null && autoPlaceConfig.getReplicaCount() != null && !definitionsOnlyRef)