浏览代码

Fix race condtion in openshift_facts

If, for some reason, two facts processes were run simultaneously
on the same host, creating the directory could cause an exception.
This should help with that.

Fixes Bug 1385449
Samuel Munilla 8 年之前
父节点
当前提交
07113bc31f
共有 1 个文件被更改,包括 5 次插入2 次删除
  1. 5 2
      roles/openshift_facts/library/openshift_facts.py

+ 5 - 2
roles/openshift_facts/library/openshift_facts.py

@@ -1380,8 +1380,11 @@ def save_local_facts(filename, facts):
     """
     try:
         fact_dir = os.path.dirname(filename)
-        if not os.path.exists(fact_dir):
-            os.makedirs(fact_dir)
+        try:
+            os.makedirs(fact_dir)  # try to make the directory
+        except OSError as exception:
+            if exception.errno != errno.EEXIST:  # but it is okay if it is already there
+                raise  # pass any other exceptions up the chain
         with open(filename, 'w') as fact_file:
             fact_file.write(module.jsonify(facts))
         os.chmod(filename, 0o600)