From 9f2c2c33d38f00f2b6b3ec6f147a6a908ae3887b Mon Sep 17 00:00:00 2001 From: Moritz Graf Date: Sat, 17 Oct 2026 07:39:40 +0200 Subject: [PATCH] fix(datastore): increase backend probe timeout to 3s and rebase before push --- skills/datastore/scripts/datastore.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/skills/datastore/scripts/datastore.py b/skills/datastore/scripts/datastore.py index 4064acc..f4da416 100755 --- a/skills/datastore/scripts/datastore.py +++ b/skills/datastore/scripts/datastore.py @@ -124,7 +124,7 @@ class DatastoreEngine: base = self.backend_url.replace("/duckdb-api/v1", "") test_url = f"{base}/healthz" req = urllib.request.Request(test_url, method="GET") - with urllib.request.urlopen(req, timeout=1.0) as r: + with urllib.request.urlopen(req, timeout=3.0) as r: if r.status == 200: self.use_backend = True logger.info(f"DatastoreEngine using single-writer backend at {self.backend_url}") @@ -505,7 +505,8 @@ class DatastoreEngine: subprocess.run(["git", "-C", str(repo_dir), "add", str(self.data_dir)], check=False, capture_output=True) res = subprocess.run(["git", "-C", str(repo_dir), "commit", "-m", f"{commit_msg} [skip ci]"], check=False, capture_output=True) if res.returncode == 0: - subprocess.run(["git", "-C", str(repo_dir), "push", "origin", "main"], check=False, capture_output=True, timeout=10) + subprocess.run(["git", "-C", str(repo_dir), "pull", "--rebase", "--autostash", "origin", "main"], check=False, capture_output=True, timeout=20) + subprocess.run(["git", "-C", str(repo_dir), "push", "origin", "main"], check=False, capture_output=True, timeout=20) except Exception as e: logger.debug(f"Git auto-sync skipped/failed: {e}")