Merge branch 'pks-gitaly-runtime-dir' into 'master'

Reintroduce migration to Gitaly runtime directory

See merge request gitlab-org/gitlab!83921

.gitlab/ci/global.gitlab-ci.yml

@@ -49,8 +49,8 @@
     - tmp/tests/gitaly/config.toml
     - tmp/tests/gitaly/gitaly2.config.toml
     - tmp/tests/gitaly/internal/
-    - tmp/tests/gitaly/internal_gitaly2/
-    - tmp/tests/gitaly/internal_sockets/
+    - tmp/tests/gitaly/run/
+    - tmp/tests/gitaly/run2/
     - tmp/tests/gitaly/Makefile
     - tmp/tests/gitaly/praefect.config.toml
     - tmp/tests/gitaly/ruby/

.gitlab/ci/rails.gitlab-ci.yml

@@ -206,8 +206,8 @@ setup-test-env:
       - ${TMP_TEST_FOLDER}/gitaly/config.toml
       - ${TMP_TEST_FOLDER}/gitaly/gitaly2.config.toml
       - ${TMP_TEST_FOLDER}/gitaly/internal/
-      - ${TMP_TEST_FOLDER}/gitaly/internal_gitaly2/
-      - ${TMP_TEST_FOLDER}/gitaly/internal_sockets/
+      - ${TMP_TEST_FOLDER}/gitaly/run/
+      - ${TMP_TEST_FOLDER}/gitaly/run2/
       - ${TMP_TEST_FOLDER}/gitaly/Makefile
       - ${TMP_TEST_FOLDER}/gitaly/praefect.config.toml
       - ${TMP_TEST_FOLDER}/gitaly/ruby/

doc/administration/gitaly/configure_gitaly.md

@@ -300,7 +300,7 @@ disable enforcement. For more information, see the documentation on configuring
    ```toml
    listen_addr = '0.0.0.0:8075'
 
-   internal_socket_dir = '/var/opt/gitlab/gitaly'
+   runtime_dir = '/var/opt/gitlab/gitaly'
 
    [logging]
    format = 'json'
@@ -308,6 +308,9 @@ disable enforcement. For more information, see the documentation on configuring
    dir = '/var/log/gitaly'
    ```
 
+    For GitLab 14.9 and earlier, set `internal_socket_dir = '/var/opt/gitlab/gitaly'` instead
+    of `runtime_dir`.
+
 1. Append the following to `/home/git/gitaly/config.toml` for each respective Gitaly server:
 
    On `gitaly1.internal`:

lib/gitlab/setup_helper.rb

@@ -124,9 +124,9 @@ module Gitlab
 
           config[:storage] = storages
 
-          internal_socket_dir = options[:internal_socket_dir] || File.join(gitaly_dir, 'internal_sockets')
-          FileUtils.mkdir(internal_socket_dir) unless File.exist?(internal_socket_dir)
-          config[:internal_socket_dir] = internal_socket_dir
+          runtime_dir = options[:runtime_dir] || File.join(gitaly_dir, 'run')
+          FileUtils.mkdir(runtime_dir) unless File.exist?(runtime_dir)
+          config[:runtime_dir] = runtime_dir
 
           config[:'gitaly-ruby'] = { dir: File.join(gitaly_dir, 'ruby') } if gitaly_ruby
           config[:'gitlab-shell'] = { dir: Gitlab.config.gitlab_shell.path }

spec/support/helpers/gitaly_setup.rb

@@ -267,7 +267,7 @@ module GitalySetup
       { 'default' => repos_path },
       force: true,
       options: {
-        internal_socket_dir: File.join(gitaly_dir, "internal_gitaly2"),
+        runtime_dir: File.join(gitaly_dir, "run2"),
         gitaly_socket: "gitaly2.socket",
         config_filename: "gitaly2.config.toml"
       }