Details
-
Bug
-
Resolution: Done
-
P3: Somewhat important
-
None
-
2014q2
-
None
Description
https://codereview.qt-project.org/87337 got stuck in STAGING state (probably triggered by the previous OOM fail and restart).
the Unstage button appears as requested, but pressing it triggers an error message telling me that "Change is staging" (or so), and it remains in this broken state.
still, the "Unstaged" comment is posted.
the merge failure itself looks like this, and probably needs to be investigated separately:
[2014-06-14 10:14:39,428] ERROR com.google.gerrit.server.git.ChangeMergeQueue : Merge attempt for qt/qtbase,refs/staging/dev failed com.google.gerrit.server.git.MergeException: Cannot update refs/staging/dev at com.google.gerrit.server.git.MergeOp.updateBranch(MergeOp.java:797) at com.google.gerrit.server.git.MergeOp.merge(MergeOp.java:373) 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:439) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303) at java.util.concurrent.FutureTask.run(FutureTask.java:138) at java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.access$301(ScheduledThreadPoolExecutor.java:98) at java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.run(ScheduledThreadPoolExecutor.java:206) at com.google.gerrit.server.git.WorkQueue$Task.run(WorkQueue.java:337) at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:895) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:918) at java.lang.Thread.run(Thread.java:662) Caused by: java.io.IOException: REJECTED at com.google.gerrit.server.git.MergeOp.updateBranch(MergeOp.java:794) ... 18 more
Attachments
Issue Links
- relates to
-
QTQAINFRA-890 changes don't get marked as merged despite successful merge
- Closed
-
QTQAINFRA-539 Changes with submodule conflict get stuck in STAGING state
- Closed