add cleaner

Author: duanhongyi

rootfs/helmbroker/broker.py

@@ -116,7 +116,7 @@ def deprovision(self,
         if not async_allowed:
             raise ErrAsyncRequired()
 
-        deprovision.delay(instance_id, details)
+        deprovision.delay(instance_id)
         return DeprovisionServiceSpec(is_async=True)
 
     def last_operation(self,

rootfs/helmbroker/cleaner.py

@@ -0,0 +1,25 @@
+import os
+import time
+import logging
+import shutil
+from .config import INSTANCES_PATH
+from .meta import load_instance_meta
+from .tasks import deprovision
+from openbrokerapi.service_broker import *
+
+
+logger = logging.getLogger(__name__)
+
+def clean_instance():
+    for instance_id in os.listdir(INSTANCES_PATH):
+        if os.path.exists(os.path.join(INSTANCES_PATH, instance_id, "instance.json")):
+            data = load_instance_meta(instance_id)
+            interval = time.time() - data["last_modified_time"]
+            if interval > 3600 * 24 and data["last_operation"]["state"] != OperationState.SUCCEEDED:
+                deprovision.delay(instance_id)
+        else:
+            shutil.rmtree(os.path.join(INSTANCES_PATH, instance_id), ignore_errors=True)
+
+
+if __name__ == "__main__":
+    clean_instance()

rootfs/helmbroker/meta.py

@@ -1,5 +1,6 @@
 import os
 import json
+import time
 from jsonschema import validate
 from .config import INSTANCES_PATH
 
@@ -23,7 +24,8 @@
                 "state": {"type": "string"},
                 "description": {"type": "string"}
             }
-        }
+        },
+        "last_modified_time": {"type": "number"}
     },
 }
 
@@ -37,6 +39,7 @@ def load_instance_meta(instance_id):
 
 
 def dump_instance_meta(instance_id, data):
+    data["last_modified_time "] = time.time()
     file = os.path.join(INSTANCES_PATH, instance_id, "instance.json")
     validate(instance=data, schema=INSTANCE_META_SCHEMA)
     with open(file, "w") as f:
@@ -56,7 +59,8 @@ def dump_instance_meta(instance_id, data):
                 "state": {"type": "string"},
                 "description": {"type": "string"}
             }
-        }
+        },
+        "last_modified_time": {"type": "number"}
     }
 }
 
@@ -70,6 +74,7 @@ def load_binding_meta(instance_id):
 
 
 def dump_binding_meta(instance_id, data):
+    data["last_modified_time "] = time.time()
     file = os.path.join(INSTANCES_PATH, instance_id, "binding.json")
     validate(instance=data, schema=INSTANCE_META_SCHEMA)
     with open(file, "w") as f:

rootfs/helmbroker/tasks.py

@@ -1,7 +1,9 @@
 import os
 import time
 import yaml
+import shutil
 
+from .config import INSTANCES_PATH
 from .utils import command, get_plan_path, get_chart_path, get_cred_value
 from .meta import dump_instance_meta, dump_binding_meta, load_instance_meta
 from openbrokerapi.service_broker import *
@@ -137,7 +139,7 @@ def bind(instance_id: str,
     dump_binding_meta(instance_id, data)
 
 
-def deprovision(instance_id: str, details: DeprovisionDetails):
+def deprovision(instance_id: str):
     data = load_instance_meta(instance_id)
     data["last_operation"]["state"] = OperationState.IN_PROGRESS
     data["last_operation"]["description"] = "deprovision %s in progress at %s" % (instance_id, time.time())
@@ -155,4 +157,5 @@ def deprovision(instance_id: str, details: DeprovisionDetails):
         data["last_operation"]["description"] = "deprovision error:\n%s" % output
     else:
         data["last_operation"]["state"] = OperationState.SUCCEEDED
-        data["last_operation"]["description"] = "deprovision succeeded at %s" % time.time()
+        data["last_operation"]["description"] = "deprovision succeeded at %s" % time.time()
+        shutil.rmtree(os.path.join(INSTANCES_PATH, instance_id), ignore_errors=True)