fix(helmbroker): file lock

Author: duanhongyi

rootfs/helmbroker/broker.py

@@ -66,24 +66,6 @@ def provision(self,
             get_addon_path(details.service_id, details.plan_id))
         shutil.copytree(addon_chart_path, chart_path)
         shutil.copytree(addon_plan_path, plan_path)
-        data = {
-            "id": instance_id,
-            "details": {
-                "service_id": details.service_id,
-                "plan_id": details.plan_id,
-                "context": details.context,
-                "parameters": details.parameters if details.parameters else {},
-            },
-            "last_operation": {
-                "state": OperationState.IN_PROGRESS.value,
-                "operation": "provision",
-                "description": (
-                    "provision %s in progress at %s" % (
-                        instance_id, time.time()))
-            }
-        }
-        with InstanceLock(instance_id):
-            dump_instance_meta(instance_id, data)
         provision.delay(instance_id, details)
         return ProvisionedServiceSpec(state=ProvisionState.IS_ASYNC)
 

rootfs/helmbroker/tasks.py

@@ -18,6 +18,24 @@
 @app.task(serializer='pickle')
 def provision(instance_id: str, details: ProvisionDetails):
     with InstanceLock(instance_id):
+        # create instance.json
+        dump_instance_meta(instance_id, {
+            "id": instance_id,
+            "details": {
+                "service_id": details.service_id,
+                "plan_id": details.plan_id,
+                "context": details.context,
+                "parameters": details.parameters if details.parameters else {},
+            },
+            "last_operation": {
+                "state": OperationState.IN_PROGRESS.value,
+                "operation": "provision",
+                "description": (
+                    "provision %s in progress at %s" % (
+                        instance_id, time.time()))
+            }
+        })
+
         chart_path = get_chart_path(instance_id)
         bind_yaml = f'{chart_path}/templates/bind.yaml'
         if os.path.exists(bind_yaml):

rootfs/helmbroker/utils.py

@@ -287,7 +287,7 @@ def merge_parameters(parameters):
         return set(list(parameters.keys()) + raw_para_keys)
 
     if not parameters or not allow_parameters:
-        return ""
+        return "", ""
     parameters = merge_parameters(copy.deepcopy(parameters))
     return (
         ",".join(_verify_allow_parameters(allow_parameters, parameters)),