Merge branch 'remove-sidekiq-scripts' into 'master'

Make bin/background_jobs use Sidekiq cluster

See merge request gitlab-org/gitlab!69734

bin/background_jobs

 #!/usr/bin/env bash
 
-cd $(dirname $0)/.. || exit 1
+cd $(dirname $0)/..
+app_root=$(pwd)
+sidekiq_workers=${SIDEKIQ_WORKERS:-1}
+sidekiq_pidfile="$app_root/tmp/pids/sidekiq-cluster.pid"
+sidekiq_logfile="$app_root/log/sidekiq.log"
+gitlab_user=$(ls -l config.ru | awk '{print $3}')
 
-if [ -n "$SIDEKIQ_WORKERS" ] ; then
-  exec bin/background_jobs_sk_cluster "$@"
-else
-  exec bin/background_jobs_sk "$@"
-fi
+warn()
+{
+  echo "$@" 1>&2
+}
+
+get_sidekiq_pid()
+{
+  if [ ! -f $sidekiq_pidfile ]; then
+    warn "No pidfile found at $sidekiq_pidfile; is Sidekiq running?"
+    return
+  fi
+
+  cat $sidekiq_pidfile
+}
+
+stop()
+{
+  sidekiq_pid=$(get_sidekiq_pid)
+
+  if [ $sidekiq_pid ]; then
+    kill -TERM $sidekiq_pid
+  fi
+}
+
+restart()
+{
+  if [ -f $sidekiq_pidfile ]; then
+    stop
+  fi
+
+  warn "Sidekiq output will be written to $sidekiq_logfile"
+  start_sidekiq "$@" >> $sidekiq_logfile 2>&1
+}
+
+start_sidekiq()
+{
+  cmd="exec"
+  chpst=$(command -v chpst)
+
+  if [ -n "$chpst" ]; then
+    cmd="${cmd} ${chpst} -P"
+  fi
+
+  # sidekiq-cluster expects '*' '*' arguments (one wildcard for each process).
+  for (( i=1; i<=$sidekiq_workers; i++ ))
+  do
+    processes_args+=("*")
+  done
+
+  ${cmd} bin/sidekiq-cluster "${processes_args[@]}" -P $sidekiq_pidfile -e $RAILS_ENV "$@"
+}
+
+action="$1"
+shift
+
+case "$action" in
+  stop)
+    stop
+    ;;
+  start)
+    restart "$@" &
+    ;;
+  start_foreground)
+    start_sidekiq "$@"
+    ;;
+  restart)
+    restart "$@" &
+    ;;
+  *)
+    echo "Usage: RAILS_ENV=<env> SIDEKIQ_WORKERS=<n> $0 {stop|start|start_foreground|restart}"
+esac

bin/background_jobs_sk

-#!/usr/bin/env bash
-
-cd $(dirname $0)/..
-app_root=$(pwd)
-sidekiq_pidfile="$app_root/tmp/pids/sidekiq.pid"
-sidekiq_logfile="$app_root/log/sidekiq.log"
-sidekiq_config="$app_root/config/sidekiq_queues.yml"
-gitlab_user=$(ls -l config.ru | awk '{print $3}')
-
-warn()
-{
-  echo "$@" 1>&2
-}
-
-stop()
-{
-  bundle exec sidekiqctl stop $sidekiq_pidfile >> $sidekiq_logfile 2>&1
-}
-
-restart()
-{
-  if [ -f $sidekiq_pidfile ]; then
-    stop
-  fi
-
-  pkill -u $gitlab_user -f 'sidekiq [0-9]'
-  start_sidekiq -P $sidekiq_pidfile -d -L $sidekiq_logfile "$@" >> $sidekiq_logfile 2>&1
-}
-
-# Starts on foreground but output to the logfile instead stdout.
-start_silent()
-{
-  start_sidekiq "$@" >> $sidekiq_logfile 2>&1
-}
-
-start_sidekiq()
-{
-  cmd="exec"
-  chpst=$(command -v chpst)
-
-  if [ -n "$chpst" ]; then
-    cmd="${cmd} ${chpst} -P"
-  fi
-
-  ${cmd} bundle exec sidekiq -C "${sidekiq_config}" -e $RAILS_ENV "$@"
-}
-
-case "$1" in
-  stop)
-    stop
-    ;;
-  start)
-    restart "$@"
-    ;;
-  start_silent)
-    warn "Deprecated: Will be removed at 13.0 (see https://gitlab.com/gitlab-org/gitlab/-/issues/196731)."
-    start_silent
-    ;;
-  start_foreground)
-    start_sidekiq "$@"
-    ;;
-  restart)
-    restart "$@"
-    ;;
-  *)
-    echo "Usage: RAILS_ENV=<env> $0 {stop|start|start_silent|start_foreground|restart}"
-esac

bin/background_jobs_sk_cluster

-#!/usr/bin/env bash
-
-cd $(dirname $0)/..
-app_root=$(pwd)
-sidekiq_pidfile="$app_root/tmp/pids/sidekiq-cluster.pid"
-sidekiq_logfile="$app_root/log/sidekiq.log"
-gitlab_user=$(ls -l config.ru | awk '{print $3}')
-
-warn()
-{
-  echo "$@" 1>&2
-}
-
-get_sidekiq_pid()
-{
-  if [ ! -f $sidekiq_pidfile ]; then
-    warn "No pidfile found at $sidekiq_pidfile; is Sidekiq running?"
-    return
-  fi
-
-  cat $sidekiq_pidfile
-}
-
-stop()
-{
-  sidekiq_pid=$(get_sidekiq_pid)
-
-  if [ $sidekiq_pid ]; then
-    kill -TERM $sidekiq_pid
-  fi
-}
-
-restart()
-{
-  if [ -f $sidekiq_pidfile ]; then
-    stop
-  fi
-
-  warn "Sidekiq output will be written to $sidekiq_logfile"
-  start_sidekiq "$@" >> $sidekiq_logfile 2>&1
-}
-
-start_sidekiq()
-{
-  cmd="exec"
-  chpst=$(command -v chpst)
-
-  if [ -n "$chpst" ]; then
-    cmd="${cmd} ${chpst} -P"
-  fi
-
-  # sidekiq-cluster expects '*' '*' arguments (one wildcard for each process).
-  for (( i=1; i<=$SIDEKIQ_WORKERS; i++ ))
-  do
-    processes_args+=("*")
-  done
-
-  ${cmd} bin/sidekiq-cluster "${processes_args[@]}" -P $sidekiq_pidfile -e $RAILS_ENV "$@"
-}
-
-case "$1" in
-  stop)
-    stop
-    ;;
-  start)
-    restart "$@" &
-    ;;
-  start_foreground)
-    start_sidekiq "$@"
-    ;;
-  restart)
-    restart "$@" &
-    ;;
-  *)
-    echo "Usage: RAILS_ENV=<env> SIDEKIQ_WORKERS=<n> $0 {stop|start|start_foreground|restart}"
-esac