tools repo
Closed, ResolvedPublic
Actions

Assigned To

Authored By

	Ejegg
	May 17 2023, 7:38 PM

Description

First noticed on this patch on March 11:
https://gerrit.wikimedia.org/r/c/wikimedia/fundraising/tools/+/919256/3
It was the second in a chain where the first was passing tests and it directly followed the first in my git history. No more rebasing on top of the first was possible in the gerrit UI as 'this change is already up to date with its parent', yet it got the V-1 Merge Failed "This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset."

After the parent patch was merged I was able to get V+2 on 919256 with 'recheck'. Gerrit is now giving a spurious V-1 to the following patch in that chain: https://gerrit.wikimedia.org/r/c/wikimedia/fundraising/tools/+/920360/2 (also up to date with its parent).

Currently also happening to https://gerrit.wikimedia.org/r/c/wikimedia/fundraising/tools/+/919249 which I had just rebased on top of master prior to giving C+2.

Prior to May 11, we hadn't made any commits to that repo since last November, so the breakage may have happened any time since then.

Related Objects

Mentioned In: T339854: Update code references to contribution_tracking: update_silverpop_staging in Silverpop exporter
Mentioned Here: T239693: Support renaming repositories in Gerrit

Event Timeline

Ejegg created this task.May 17 2023, 7:38 PM

Restricted Application added a subscriber: Aklapper. · View Herald TranscriptMay 17 2023, 7:38 PM

happened twice on https://gerrit.wikimedia.org/r/c/wikimedia/fundraising/tools/+/925848/

Currently blocking merge of https://gerrit.wikimedia.org/r/c/wikimedia/fundraising/tools/+/931268/

happened couple times on https://gerrit.wikimedia.org/r/c/wikimedia/fundraising/tools/+/931268

AnnWF mentioned this in T339854: Update code references to contribution_tracking: update_silverpop_staging in Silverpop exporter.Jun 21 2023, 4:37 PM

Yes that is a known issue in Zuul due to Gerrit repository names overlapping. We have two zuul-merger processes cloning the repositories and one of them (contint1002) had the clash:

hashar@contint1002:/srv/zuul/git/wikimedia/fundraising/tools$ ls -la
total 12
drwxr-xr-x 3 zuul zuul 4096 Jan 31 22:37 ./
drwxr-xr-x 7 zuul zuul 4096 Jan 31 22:37 ../
drwxr-xr-x 5 zuul zuul 4096 Feb  9 22:44 DjangoBannerStats/

Which is that wikimedia/fundraising/tools/DjangoBannerStats got cloned, that thus creates the parent directory wikimedia/fundraising/tools which in turns prevent git clone from cloning wikimedia/fundraising/tools.git since the directory exist!

I have deleted the repository:

ssh contint1002.wikimedia.org sudo rm -fR /srv/zuul/git/wikimedia/fundraising/tools/DjangoBannerStats

@hashar Thanks for finding that, and thanks for the temporary fix!

We really want to get rid of that DjangoBannerStats tool, but since we haven't found the time to operationalize its successor we should probably just move the repo to a different path. Could you help us move it to just /wikimedia/fundraising/DjangoBannerStats, please?

Could you help us move it to just /wikimedia/fundraising/DjangoBannerStats, please?

We unfortunately don't have a process to move a repository (T239693). Which I should probably finally solve one day since nowadays there is a plugin in Gerrit to rename repository.

At least the root cause is fixed for now.

hashar closed this task as Resolved.Mar 29 2024, 12:05 PM

hashar claimed this task.

Gerrit gives spurious V-1 Merge Failed in wikimedia/fundraising/tools repoClosed, ResolvedPublicActions

Description

Related Objects

Event Timeline

Gerrit gives spurious V-1 Merge Failed in wikimedia/fundraising/tools repo
Closed, ResolvedPublic
Actions