Merge pull request #2654 from codeenigma/Gitlab-stop-fix-PR-2.x

Gitlab-stop-fix

Author: drazenCE

ce-dev/ansible/vars/gitlab/ce_deploy.yml

@@ -3,4 +3,4 @@ ce_deploy:
   own_repository_branch: 1.x
   username: deploy
   local_dir: /home/deploy/ce-deploy
-  ce_provision_dir: /home/ce-dev/ce-provision
+  ce_provision_dir: /home/controller/ce-provision

roles/debian/gitlab/tasks/main.yml

@@ -93,6 +93,19 @@
     mode: "0666"
   when: is_local
 
+- name: Stop Sidekiq specifically first
+  ansible.builtin.command:
+    cmd: /opt/gitlab/bin/gitlab-ctl stop sidekiq
+  register: _sidekiq_stop
+  failed_when: false
+  async: 180
+  poll: 5
+
+- name: Force stop Sidekiq if it's stuck.
+  ansible.builtin.command:
+    cmd: /opt/gitlab/bin/gitlab-ctl kill sidekiq
+  when: _sidekiq_stop is failed
+
 - name: Stop Gitlab.
   ansible.builtin.command: /opt/gitlab/bin/gitlab-ctl stop
   when: gitlab.force_stop