3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git_deploy: notify attempts to fix loose objects 

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2022-10-19 19:32:54 -04:00
parent c7e290a3cd
commit 74f43cad6e
No known key found for this signature in database
GPG Key ID: 5A1EB336DFB4C71B
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
moonraker/components/update_manager/git_deploy.py
View File

@ -285,7 +285,7 @@ class GitRepo:
'commits_behind', []) 'commits_behind', [])
self.tag_data: Dict[str, Any] = storage.get('tag_data', {}) self.tag_data: Dict[str, Any] = storage.get('tag_data', {})
self.diverged: bool = storage.get("diverged", False) self.diverged: bool = storage.get("diverged", False)
self.repo_veriified: bool = storage.get( self.repo_verified: bool = storage.get(
"verified", storage.get("is_valid", False) "verified", storage.get("is_valid", False)
) )
@ -309,7 +309,7 @@ class GitRepo:
'commits_behind': self.commits_behind, 'commits_behind': self.commits_behind,
'tag_data': self.tag_data, 'tag_data': self.tag_data,
'diverged': self.diverged, 'diverged': self.diverged,
'verified': self.repo_veriified 'verified': self.repo_verified
} }
async def initialize(self, need_fetch: bool = True) -> None: async def initialize(self, need_fetch: bool = True) -> None:
@ -664,7 +664,7 @@ class GitRepo:
if self.diverged: if self.diverged:
invalids.append("Repo has diverged from remote") invalids.append("Repo has diverged from remote")
if not invalids: if not invalids:
self.repo_veriified = True self.repo_verified = True
return invalids return invalids
def _verify_repo(self, check_remote: bool = False) -> None: def _verify_repo(self, check_remote: bool = False) -> None:
@ -763,7 +763,7 @@ class GitRepo:
async def clone(self) -> None: async def clone(self) -> None:
async with self.git_operation_lock: async with self.git_operation_lock:
if not self.repo_veriified: if not self.repo_verified:
raise self.server.error( raise self.server.error(
"Repo has not been verified, clone aborted" "Repo has not been verified, clone aborted"
) )
@ -924,7 +924,11 @@ class GitRepo:
return return
await self._check_lock_file_exists(remove=True) await self._check_lock_file_exists(remove=True)
async def _repair_loose_objects(self) -> bool: async def _repair_loose_objects(self, notify: bool = False) -> bool:
if notify:
self.cmd_helper.notify_update_response(
"Attempting to repair loose objects..."
)
try: try:
await self.cmd_helper.run_cmd_with_response( await self.cmd_helper.run_cmd_with_response(
"find .git/objects/ -type f -empty | xargs rm", "find .git/objects/ -type f -empty | xargs rm",
@ -933,8 +937,16 @@ class GitRepo:
"fetch --all -p", retries=1, fix_loose=False) "fetch --all -p", retries=1, fix_loose=False)
await self._run_git_cmd("fsck --full", timeout=300., retries=1) await self._run_git_cmd("fsck --full", timeout=300., retries=1)
except Exception: except Exception:
logging.exception("Attempt to repair loose objects failed") msg = (
"Attempt to repair loose objects failed, "
"hard recovery is required"
)
logging.exception(msg)
if notify:
self.cmd_helper.notify_update_response(msg)
return False return False
if notify:
self.cmd_helper.notify_update_response("Loose objects repaired")
return True return True
async def _run_git_cmd_async(self, async def _run_git_cmd_async(self,
@ -974,7 +986,7 @@ class GitRepo:
return return
elif fix_loose: elif fix_loose:
if GIT_OBJ_ERR in "\n".join(self.git_messages): if GIT_OBJ_ERR in "\n".join(self.git_messages):
ret = await self._repair_loose_objects() ret = await self._repair_loose_objects(notify=True)
if ret: if ret:
break break
# since the attept to repair failed, bypass retries # since the attept to repair failed, bypass retries