My favorites | Sign in
Project Home Downloads Wiki Issues Source
New issue   Search
for
  Advanced search   Search tips   Subscriptions
Issue 2302: Merged commit disappeared
14 people starred this issue and may be notified of changes. Back to list
Status:  New
Owner:  ----


Sign in to add a comment
 
Reported by org...@gmail.com, Dec 3, 2013
Affected Version: 2.7

What steps will reproduce the problem?
1. Merge many commits simultaneously (I opened many tabs then switched and submitted all of them quickly)
2. One commit has disappeared.

Please provide any additional information below.
Using cherry-pick strategy.
Dec 3, 2013
#1 org...@gmail.com
By "disappeared" I mean:

* Original branch had A--B
* Submitted C and D
* Branch now has A--B--D

All commits appear with Merged status on gerrit.
Jan 30, 2014
#2 l...@diamand.org
I seem to be seeing something similar. I've had about 5 commit disappear. The symptoms seem to be that

- one commit is merged, but never actually goes in
- another commit gets submitted, but never goes beyond "submitted, merge pending".

Interestingly I'm seeing a lot of nfs errors in dmesg:

[4239896.363164]  [<ffffffffa0157530>] ? nfs_wait_bit_uninterruptible+0x0/0x20 [nfs]
[4239896.363175]  [<ffffffffa015753e>] nfs_wait_bit_uninterruptible+0xe/0x20 [nfs]
[4239896.363184]  [<ffffffffa0157530>] ? nfs_wait_bit_uninterruptible+0x0/0x20 [nfs]
[4239896.363197]  [<ffffffffa015751f>] nfs_wait_on_request+0x2f/0x40 [nfs]
[4239896.363204]  [<ffffffffa015d296>] nfs_try_to_update_request+0xb6/0x160 [nfs]
[4239896.363211]  [<ffffffffa0157569>] ? nfs_release_request+0x19/0x20 [nfs]
[4239896.363217]  [<ffffffffa01577ff>] ? nfs_unlock_request+0x2f/0x50 [nfs]
[4239896.363224]  [<ffffffffa015d37d>] nfs_writepage_setup+0x3d/0x1e0 [nfs]
[4239896.363237]  [<ffffffffa015d5b4>] nfs_updatepage+0x94/0x1a0 [nfs]
[4239896.363243]  [<ffffffffa0157569>] ? nfs_release_request+0x19/0x20 [nfs]
[4239896.363249]  [<ffffffffa014ceba>] nfs_write_end+0x5a/0x2c0 [nfs]

Kernel is 2.6.32. But that may just be coincidence.

Oct 17, 2014
Project Member #6 bassem.rabil
We experienced a similar behaviour with Gerrit 2.9, where we had 3 consecutive changes, i.e. Change A, change B, and change C. These were submitted using web UI with only 20 secs difference, and change B ended up reseting the branch head to an older version which was the original parent of change A. 

Having git gc running regularly on the repository affected, this resulted in losing the previous commits on the branch tip because of this branch tip reset. 


Any updates/progress on this bug? I would suggest increasing the priority of this bug as it affects the integrity of the git repository badly. 
Oct 17, 2014
Project Member #7 huga...@gmail.com
(No comment was entered for this change.)
Labels: -Priority-Minor Priority-Critical
Jan 30, 2015
Project Member #8 huga...@gmail.com
We had another occurrence of this problem with the strategy Rebase-If-Necessary (Gerrit version 2.9.4).

This time, 6 commits disappeared.


Sign in to add a comment

Powered by Google Project Hosting