-
andyf
I'm now getting the same failing gerrit behaviour as rzezeski reported recently
-
andyf
error: remote unpack failed: error Missing tree 1d7a8b7ebbc1933fb023ae22621e4bdc34fd2654
-
andyf
maybe something to do with a newer git version, I'll try the --no-thin
-
andyf
yes, that worked
-
jbk
is git maybe defaulting to thin?
-
jbk
w/ the newer version
-
andyf
I can't see anything in the release notes. My client recently upgraded from 2.37.3 -> 2.37.5
-
rmustacc
andyf: I found in the past a git fetch of the remote was fine.
-
rmustacc
And cleared it up.
-
jclulow
Yeah I frequently do "git fetch --all --prune" before I do anything else
-
jclulow
FWIW we run "git gc" against the repository each day
-
jclulow
To keep it from growing forever
-
jclulow
Maybe that's having an impact
-
sommerfeld
any cases where we've done history-changing operations (like git commit --amend or rebase) on published branchese?
-
sommerfeld
(would be interesting to know what the missing tree actually was - it might be present in the client repository)
-
richlowe
not for years.
-
richlowe
usually when we've missed a tree like this it's because there's disagreement about where the master branch points
-
sommerfeld
git ls-tree 1d7a8b7ebbc1933fb023ae22621e4bdc34fd2654 in my checkout shows some version of what looks to be ./usr/src/uts/intel/io/vmm
-
sommerfeld
but that's not the most recent version of that tree
-
sommerfeld
but it's the version of usr/src/uts/intel/io/vmm in f2357d972e19ef505ad57ff2f0ee340fa2214015 ("15236 viona ring page holds should heed pause/resume")
-
sommerfeld
(you can see this with git ls-tree f2357d972e19ef505ad57ff2f0ee340fa2214015:usr/src/uts/intel/io
-
sommerfeld
)
-
sommerfeld
that's a pretty recent commit (December 2022 author date..)
-
sommerfeld
committed January 4th 2023
-
sommerfeld
tree was was most recent version of that subtree until 62ac5a8a4bcebad1d1c5639636a038087707a5e0 ("15251 panic in vlapic_get_ccr after live migration / 15312 bhyve has overzealous vlapic ID check") committed on January 10th 2023.
-
» jclulow runs "git fsck" on the repository
-
sommerfeld
(in case you're wondering how I found the commits: git log --oneline -- usr/src/uts/intel/io/vmm | while read commit rest
-
sommerfeld
do
-
sommerfeld
echo $commit; git ls-tree ${commit}:usr/src/uts/intel/io | (grep 1d7a8b7ebbc; exit 0)
-
sommerfeld
done
-
sommerfeld
(the (grep ... ; exit 0) is to avoid having my shell warn me about failing greps)
-
jclulow
the old one-two, grep || true
-
sommerfeld
lots of ways to spell that.
-
jclulow
So there are a handful of dangling commits
-
sommerfeld
gc failure dropping something that was actually referenced? eek.
-
jclulow
I don't think so
-
jclulow
I think it's an artefact of commits submitted for review being actual commits under magic refs
-
richlowe
we've definitely definitely seen this before transiently
-
jclulow
(that is: I believe the five dangling commits are changes that are not integrated, and is presumably an artefact of an incomplete submission)
-
jclulow
The other issue I dunno about
-
jclulow
But I expect I have never seen it because I fetch aggressively
-
jclulow
It could also be because I'm a slacker that doesn't do that much work
-
jclulow
:D
-
richlowe
same, on both counts
-
richlowe
my git stuff keeps itself current for me
-
richlowe
I think the time I saw something like this I had a 'master' that gerrit didn't, or vice versa.
-
sommerfeld
i'm curious as to where "error: remote unpack failed: error Missing tree 1d7a8b7ebbc1933fb023ae22621e4bdc34fd2654" came from. Something logged by gerrit or by the git client doing the push?
-
sommerfeld
(or, well, git-as-run-by-gerrit)
-
gitomat
[illumos-gate] 15345 Fix function prototype in in.routed/if.c -- Marco van Wieringen <marco.van.wieringen⊙pen>
-
andyf
Thanks, I'll try doing a pull from the gerrit upstream, I don't do that routinely. This was a new commit in a branch just taken from master, so I was surprised that it didn't work
-
sommerfeld
I think a pull from gerrit gives the client a better idea of what gerrit does and doesn't have already..
-
sommerfeld
(pull before push, that is..)
-
jclulow
Midvale Repository for the Gifted
-
jbk
:)
-
richlowe
jclulow: hey, but while you're in there, great time for that upgrade... :)
-
jclulow
oh goodness my fridge is running brb
-
jbk
heh.. always fun when you're doing a test, pretty sure it should be harmless and the network link to that location dies seconds after you run your command :)
-
richlowe
did everything get untangled now then?
-
jbk
jclulow: i'd imagine it can't get too far
-
sommerfeld
most gifted thing I've seen Gerrit do is attempt to create reviews for every single existing commit in the repo when it was confused about where I was pushing to.
-
jclulow
I think it might have some safeties against users making that error now
-
jclulow
(touch wood)
-
richlowe
I have twice now almost pushed a large feature branch by mistake, because habit of which workspace I'm in
-
richlowe
luckily, I also habitually -nv
-
tomww
:)
-
sommerfeld
jclulow: this happened >10 years ago and my typo might well have been one of the incidents motivating the creation of the safeties.
-
richlowe
did anyone want more time to look at #15260 or #15361? (fenix?)
-
fenix
BUG 15260: ld crashes if group members are stripped by -s (In Progress)
-
fenix
-
richlowe
and the other, bot...
-
andyf
illumos 15361 (fenix) ?
-
fenix
BUG 15361: ld doesn't fill out PT_DYNAMIC sufficiently for binutils 2.40 (In Progress)
-
fenix