diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-25 11:15:03 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-25 11:15:03 +0000 |
| commit | f68acbacd9f7635abc3c4f8f4b3ebd1c011c76e3 (patch) | |
| tree | 44ca89f4e6dadbb94e77ff6b9744538783ea00eb /CHANGELOG | |
| parent | d0e74984631ece8579fe26262ad94c17a934ee26 (diff) | |
| parent | bd2991b4618528a719b03c46ceb7befb230f0dd9 (diff) | |
| download | gitlab-ce-f68acbacd9f7635abc3c4f8f4b3ebd1c011c76e3.tar.gz | |
Merge branch 'fix-stuck-forked-project-import' into 'master'
Fix bug where projects would appear to be stuck in the forked import state
A race condition existed between when Rails committed the `import_status` to
`started` and when the Sidekiq worker forked a project. If this fork were quick,
it's possible that the worker would attempt to move into the `finished` state
before the `started` state took effect.
As mentioned in https://github.com/mperham/sidekiq/wiki/Problems-and-Troubleshooting#cannot-find-modelname-with-id12345,
we can either delay the worker to ensure the DB has a chance to update, or use the nice `after_commit_queue` gem to schedule the task after the state machine commit. See:
* https://github.com/pluginaweek/state_machine/issues/191
* https://github.com/shellycloud/after_commit_queue
Closes #2736
See merge request !1434
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 99e327472f4..e93938054fe 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.1.0 (unreleased) + - Fix bug where projects would appear to be stuck in the forked import state (Stan Hu) - Show CI status on all pages where commits list is rendered - Automatically enable CI when push .gitlab-ci.yml file to repository - Move CI charts to project graphs area |