tccli支持多进程并发 (#107)

* tccli支持多进程并发

* fix test case

* 新增 os.rename逻辑

* fix lint

Author: HS-Gray

tccli/configure.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+import copy
 import os
 import sys
 import six
@@ -47,6 +47,9 @@ def _init_configure(self, profile_name, input_data, extra={}):
         is_exist, config_path = self._profile_existed(profile_name)
         if is_exist:
             conf_data = Utils.load_json_msg(config_path)
+            old_data = copy.deepcopy(conf_data)
+        else:
+            old_data = None
 
         if profile_name.endswith(".configure") and OptionsDefine.SysParam not in conf_data:
             conf_data[OptionsDefine.SysParam] = {}
@@ -84,7 +87,8 @@ def _init_configure(self, profile_name, input_data, extra={}):
                                          "Received input format: %s\n "
                                          "Valid input format eg. set cvm.version 2017-03-12"
                                          % (err, k))
-        Utils.dump_json_msg(config_path, conf_data)
+        if conf_data != old_data:
+            Utils.dump_json_msg(config_path, conf_data)
 
     def _checkout_config(self, profile_name):
         is_conexit, config_path = self._profile_existed(profile_name + ".configure")

tccli/main.py

@@ -90,4 +90,3 @@ def main():
 
 if __name__ == "__main__":
     main()
-

tccli/utils.py

@@ -3,6 +3,7 @@
 import json
 import time
 import os
+import uuid
 import tccli.options_define as options_define
 
 
@@ -84,12 +85,19 @@ def dump_json_msg(filename, data):
         file_dir = os.path.split(filename)[0]
         if not os.path.isdir(file_dir):
             os.makedirs(file_dir)
-        with open(filename, "w") as f:
+
+        temp_file = filename + uuid.uuid4().hex + ".tmp"
+        with open(temp_file, "w") as f:
             json.dump(data, f,
                       indent=2,
                       separators=(',', ': '),
                       ensure_ascii=False,
                       sort_keys=True)
+        try:
+            os.rename(temp_file, filename)
+        except Exception:
+            os.remove(temp_file)
+            raise Exception("write configure file failed")
 
     @staticmethod
     def get_call_mode():

tests/test_cvm.py

@@ -1,3 +1,5 @@
+from multiprocessing import Process, Queue
+from tccli.command import CLICommand
 from utils import TestCli
 
 def test_describe_regions():
@@ -51,3 +53,24 @@ def test_create_image_dry_run_with_unfold_argument():
     test_cli = TestCli()
     test_cli.equal(cmd, expect)
 
+
+def test_multi_process():
+    queue = Queue()
+    def run_cvm_describe_regions(idx, q):
+        args = ["cvm", "DescribeRegions"]
+        try:
+            CLICommand()(args)
+            q.put(0)
+        except Exception:
+            q.put(255)
+
+    processes = []
+    for i in range(10):
+        p = Process(target=run_cvm_describe_regions, args=(i, queue))
+        p.start()
+        processes.append(p)
+    for p in processes:
+        p.join()
+    while not queue.empty():
+        ret = queue.get()
+        assert ret == 0