| Issue 2246: | Gerrit botched refs/heads/master due to some concurrent access bug? | |
| 4 people starred this issue and may be notified of changes. | Back to list |
************************************************************ ***** NOTE: THIS BUG TRACKER IS FOR GERRIT CODE REVIEW ***** ***** DO NOT SUBMIT BUGS FOR CHROME, ANDROID, INTERNAL ***** ***** ISSUES WITH YOUR COMPANY'S GERRIT SETUP, ETC. ***** ***** THOSE ISSUE BELONG IN DIFFERENT ISSUE TRACKERS! ***** ************************************************************ Affected Version: 2.7 What steps will reproduce the problem? I don't currently know if the bug is reproducable. It occured due our normal workflow What is the expected output? What do you see instead? What do we see: Patch sets are marked as merged, get to the remote tree, but aren't merged there due to lack of refs/heads/master. Expected output: Patch sets would be merged into master branch. Please provide any additional information below. I managed to restore that repo to the working order by picking a latest merged commit and making it the head of the master branch, then rebasing everything else that should be in the master branch on top of it. Initially I got the following backtrace: [2013-11-05 18:25:35,344] ERROR com.google.gerrit.server.git.ChangeMergeQueue : Merge attempt for puppet,refs/heads/m aster failed com.google.gerrit.server.git.MergeException: Cannot merge 00fa9e478058839a6132a52ecf9907cd4370671e at com.google.gerrit.server.git.CherryPick._run(CherryPick.java:124) at com.google.gerrit.server.git.SubmitStrategy.run(SubmitStrategy.java:99) at com.google.gerrit.server.git.MergeOp.preMerge(MergeOp.java:380) at com.google.gerrit.server.git.MergeOp.merge(MergeOp.java:285) at com.google.gerrit.server.git.ChangeMergeQueue$2.call(ChangeMergeQueue.java:207) at com.google.gerrit.server.git.ChangeMergeQueue$2.call(ChangeMergeQueue.java:204) at com.google.gerrit.server.util.RequestScopePropagator$5.call(RequestScopePropagator.java:222) at com.google.gerrit.server.util.RequestScopePropagator$4.call(RequestScopePropagator.java:201) at com.google.gerrit.server.git.PerThreadRequestScope$Propagator$1.call(PerThreadRequestScope.java:75) at com.google.gerrit.server.git.ChangeMergeQueue.mergeImpl(ChangeMergeQueue.java:204) at com.google.gerrit.server.git.ChangeMergeQueue.access$200(ChangeMergeQueue.java:53) at com.google.gerrit.server.git.ChangeMergeQueue$MergeEntry.run(ChangeMergeQueue.java:247) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:334) at java.util.concurrent.FutureTask.run(FutureTask.java:166) at java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.access$101(ScheduledThreadPoolExecutor.java:165) at java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.run(ScheduledThreadPoolExecutor.java:266) at com.google.gerrit.server.git.WorkQueue$Task.run(WorkQueue.java:337) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1110) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:603) at java.lang.Thread.run(Thread.java:636) Caused by: com.google.gwtorm.server.OrmConcurrencyException: Concurrent modification detected at com.google.gwtorm.jdbc.JdbcAccess.execute(JdbcAccess.java:440) at com.google.gwtorm.jdbc.JdbcAccess.updateAsBatch(JdbcAccess.java:261) at com.google.gwtorm.jdbc.JdbcAccess.update(JdbcAccess.java:214) at com.google.gerrit.server.git.CherryPick.writeCherryPickCommit(CherryPick.java:168) at com.google.gerrit.server.git.CherryPick._run(CherryPick.java:84) ... 20 more Then I noticed that Gerrit was complaining about missing refs/heads/master. [2013-11-06 00:02:56,176] ERROR com.google.gerrit.server.git.ChangeMergeQueue : Merge attempt for puppet3,refs/heads/ master failed com.google.gerrit.server.git.MergeException: Cannot update refs/heads/master at com.google.gerrit.server.git.MergeOp.updateBranch(MergeOp.java:710) at com.google.gerrit.server.git.MergeOp.merge(MergeOp.java:286) at com.google.gerrit.server.git.ChangeMergeQueue$2.call(ChangeMergeQueue.java:207) at com.google.gerrit.server.git.ChangeMergeQueue$2.call(ChangeMergeQueue.java:204) at com.google.gerrit.server.util.RequestScopePropagator$5.call(RequestScopePropagator.java:222) at com.google.gerrit.server.util.RequestScopePropagator$4.call(RequestScopePropagator.java:201) at com.google.gerrit.server.git.PerThreadRequestScope$Propagator$1.call(PerThreadRequestScope.java:75) at com.google.gerrit.server.git.ChangeMergeQueue.mergeImpl(ChangeMergeQueue.java:204) at com.google.gerrit.server.git.ChangeMergeQueue.access$200(ChangeMergeQueue.java:53) at com.google.gerrit.server.git.ChangeMergeQueue$MergeEntry.run(ChangeMergeQueue.java:247) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:334) at java.util.concurrent.FutureTask.run(FutureTask.java:166) at java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.access$101(ScheduledThreadPoolExecuto r.java:165) at java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.run(ScheduledThreadPoolExecutor.java: 266) at com.google.gerrit.server.git.WorkQueue$Task.run(WorkQueue.java:337) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1110) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:603) at java.lang.Thread.run(Thread.java:636) Caused by: java.io.IOException: REJECTED at com.google.gerrit.server.git.MergeOp.updateBranch(MergeOp.java:707) ... 18 more
Dec 6, 2013
Project Member
#1
dougk....@gmail.com
Jun 14, 2014
(No comment was entered for this change.)
Status:
Duplicate
Mergedinto: 2034 |
|
| ► Sign in to add a comment |