Unable to automatically apply merge requests
Closed
Unable to automatically apply merge requests
Created by: dpasqualin
Hi, I'm unable to automatically apply merge requests. The system gets stuck on the "Checking for ability to automatically merge… " message. This feature was used to work last week. I didn't change anything specifically on the gitlab installation and it just stopped to work.
I've already tried to create the satellites but it didn't work.
What I get on the log file that might be useful is the following:
MergeRequest Load (1.2ms) SELECT `merge_requests`.* FROM `merge_requests` WHERE `merge_requests`.`target_project_id` = 205 AND `merge_requests`.`id` = 7 LIMIT 1
Errno::ENOLCK (No locks available - /home/git/gitlab-satellites/tmp/satellite_205.lock):
lib/gitlab/satellite/satellite.rb:62:in `flock'
lib/gitlab/satellite/satellite.rb:62:in `block in lock'
lib/gitlab/satellite/satellite.rb:60:in `open'
lib/gitlab/satellite/satellite.rb:60:in `lock'
lib/gitlab/satellite/action.rb:23:in `block in in_locked_and_timed_satellite'
lib/gitlab/satellite/action.rb:22:in `in_locked_and_timed_satellite'
lib/gitlab/satellite/merge_action.rb:14:in `can_be_merged?'
app/models/merge_request.rb:124:in `check_if_can_be_merged'
app/controllers/projects/merge_requests_controller.rb:90:in `automerge_check'
app/controllers/application_controller.rb:54:in `set_current_user_for_thread'
I'm using gitlab 6.3, and here is the check:
Checking Environment ...
Git configured for git user? ... yes
Has python2? ... yes
python2 is supported version? ... yes
Checking Environment ... Finished
Checking GitLab Shell ...
GitLab Shell version >= 1.7.9 ? ... OK (1.7.9)
Repo base directory exists? ... yes
Repo base directory is a symlink? ... no
Repo base owned by git:git? ... yes
Repo base access is drwxrws---? ... yes
update hook up-to-date? ... yes
update hooks in repos are links: ...
... all ok ...
Running /home/git/gitlab-shell/bin/check
Check GitLab API access: OK
Check directories and files:
/home/git/repositories: OK
/home/git/.ssh/authorized_keys: OK
/usr/bin/redis-cli: OK
gitlab-shell self-check successful
Checking GitLab Shell ... Finished
Checking Sidekiq ...
Running? ... yes
Number of Sidekiq processes ... 1
Checking Sidekiq ... Finished
Checking GitLab ...
Database config exists? ... yes
Database is SQLite ... no
All migrations up? ... yes
GitLab config exists? ... yes
GitLab config outdated? ... no
Log directory writable? ... yes
Tmp directory writable? ... yes
Init script exists? ... yes
Init script up-to-date? ... yes
projects have namespace: ...
... all ok...
Projects have satellites? ...
... all ok...
Redis version >= 2.0.0? ... yes
Your git bin path is "/usr/bin/git"
Git version >= 1.7.10 ? ... yes (1.7.10)
Checking GitLab ... Finished
Please register or sign in to reply