Skip to content

Fix Git corruption recovery by moving fetch into retry context #56913

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
potiuk merged 2 commits into from
Oct 28, 2025
Merged

Fix Git corruption recovery by moving fetch into retry context #56913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a10bc6
Fix Git corruption recovery by moving fetch into retry context
dheerajturaga Oct 20, 2025
45fee52
Fix tests
dheerajturaga Oct 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion providers/git/src/airflow/providers/git/bundles/git.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,12 @@ def _clone_bare_repo_if_required(self) -> None:
env=self.hook.env if self.hook else None,
)
self.bare_repo = Repo(self.bare_repo_path)

# Fetch to ensure we have latest refs and validate repo integrity
self._fetch_bare_repo()
except (InvalidGitRepositoryError, GitCommandError) as e:
self._log.warning(
"Bare repository clone/open failed, cleaning up and retrying",
"Bare repository clone/open/fetch failed, cleaning up and retrying",
bare_repo_path=self.bare_repo_path,
exc=e,
)
Expand Down
7 changes: 5 additions & 2 deletions providers/git/tests/unit/git/bundles/test_git.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,8 @@ def test_refresh_with_git_connection(self, mock_gitRepo):
tracking_ref=GIT_DEFAULT_BRANCH,
)
bundle.initialize()
assert mock_gitRepo.return_value.remotes.origin.fetch.call_count == 2 # 1 in bare, 1 in main repo
# 1 in _clone_bare_repo_if_required, 1 in refresh() for bare repo, 1 in refresh() for working repo
assert mock_gitRepo.return_value.remotes.origin.fetch.call_count == 3
mock_gitRepo.return_value.remotes.origin.fetch.reset_mock()
bundle.refresh()
assert mock_gitRepo.return_value.remotes.origin.fetch.call_count == 2
Expand Down Expand Up @@ -730,7 +731,9 @@ def _fake_clone_from(*_, **kwargs):
EXPECTED_ENV = {"GIT_SSH_COMMAND": "ssh -i /id_rsa -o StrictHostKeyChecking=no"}

mock_gitRepo.clone_from.side_effect = _fake_clone_from
mock_gitRepo.return_value = types.SimpleNamespace()
# Mock needs to support the fetch operation called in _clone_bare_repo_if_required
mock_repo_instance = mock.MagicMock()
mock_gitRepo.return_value = mock_repo_instance

with mock.patch("airflow.providers.git.bundles.git.GitHook") as mock_githook:
mock_githook.return_value.repo_url = "git@github.com:apache/airflow.git"
Expand Down
Loading