#56: Add retry of clone (#62)

cloud-labs-infra · Sep 8, 2023 · 2f35c0d · 2f35c0d
1 parent 920420b
commit 2f35c0d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/backup_github/backup.py b/backup_github/backup.py
@@ -2,6 +2,7 @@
 import os
 import shutil
 import subprocess
+import time
 from pathlib import Path
 from typing import Optional
 
@@ -107,6 +108,13 @@ def __save_repo_content(self, repository, dir):
             )
             try:
                 subprocess_handle(subprocess.call, ["git", "clone", "--bare", repo_url])
+                if not os.path.exists(f"{repository}.git"):
+                    time.sleep(10)
+                    subprocess_handle(
+                        subprocess.call, ["git", "clone", "--bare", repo_url]
+                    )
+                    if not os.path.exists(f"{repository}.git"):
+                        raise subprocess.CalledProcessError
             except subprocess.CalledProcessError:
                 shutil.rmtree(f"{dir}/{repository}")
                 logging.error(f"Repository {repository} backup error, will be skipped")

diff --git a/backup_github/utils.py b/backup_github/utils.py
@@ -22,8 +22,13 @@ def subprocess_handle(func, args):
     except subprocess.CalledProcessError as e:
         logging.error("Subprocess call error")
         logging.error("exit code: {}".format(e.returncode))
-        logging.error("stdout: {}".format(e.output.decode(sys.getfilesystemencoding())))
-        logging.error("stderr: {}".format(e.stderr.decode(sys.getfilesystemencoding())))
+        if e.output:
+            logging.error(
+                "stdout: {}".format(e.output.decode(sys.getfilesystemencoding()))
+            )
+            logging.error(
+                "stderr: {}".format(e.stderr.decode(sys.getfilesystemencoding()))
+            )
         raise e