From de9cfdcc760f84f68cf2da83d74877bd57ff5eb3 Mon Sep 17 00:00:00 2001
From: Changzheng Liu <cliu@gitlab.com>
Date: Wed, 22 May 2024 11:49:17 -0700
Subject: [PATCH] Remove deprecated es indexer param chema-version-commits
---
GITLAB_ELASTICSEARCH_INDEXER_VERSION | 2 +-
ee/lib/gitlab/elastic/indexer.rb | 1 -
ee/spec/lib/gitlab/elastic/indexer_spec.rb | 4 ----
3 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/GITLAB_ELASTICSEARCH_INDEXER_VERSION b/GITLAB_ELASTICSEARCH_INDEXER_VERSION
index 0062ac971805..831446cbd27a 100644
--- a/GITLAB_ELASTICSEARCH_INDEXER_VERSION
+++ b/GITLAB_ELASTICSEARCH_INDEXER_VERSION
@@ -1 +1 @@
-5.0.0
+5.1.0
diff --git a/ee/lib/gitlab/elastic/indexer.rb b/ee/lib/gitlab/elastic/indexer.rb
index 2023ebb7834c..2521a91d7eef 100644
--- a/ee/lib/gitlab/elastic/indexer.rb
+++ b/ee/lib/gitlab/elastic/indexer.rb
@@ -195,7 +195,6 @@ def build_blob_specific_flags
%W[--repository-access-level=#{container.repository_access_level}].tap do |c|
c << "--hashed-root-namespace-id=#{project.namespace.hashed_root_namespace_id}"
c << "--schema-version-blob=#{BLOB_SCHEMA_VERSION}"
- c << '--schema-version-commits'
c << "--schema-version-commit=#{COMMIT_SCHEMA_VERSION}"
c << "--archived=#{project.archived}" if migration_finished?(:add_archived_to_commits) &&
diff --git a/ee/spec/lib/gitlab/elastic/indexer_spec.rb b/ee/spec/lib/gitlab/elastic/indexer_spec.rb
index 4f936411b6b3..6345a1a99a29 100644
--- a/ee/spec/lib/gitlab/elastic/indexer_spec.rb
+++ b/ee/spec/lib/gitlab/elastic/indexer_spec.rb
@@ -173,7 +173,6 @@
"--repository-access-level=#{project.repository_access_level}",
"--hashed-root-namespace-id=#{project.namespace.hashed_root_namespace_id}",
"--schema-version-blob=2308",
- '--schema-version-commits',
"--schema-version-commit=2306",
"--archived=#{project.archived}",
"--traversal-ids=#{project.namespace_ancestry}",
@@ -216,7 +215,6 @@
"--repository-access-level=#{project.repository_access_level}",
"--hashed-root-namespace-id=#{project.namespace.hashed_root_namespace_id}",
"--schema-version-blob=2308",
- '--schema-version-commits',
"--schema-version-commit=2306",
"--traversal-ids=#{project.namespace_ancestry}",
"#{project.repository.disk_path}.git"
@@ -258,7 +256,6 @@
"--repository-access-level=#{project.repository_access_level}",
"--hashed-root-namespace-id=#{project.namespace.hashed_root_namespace_id}",
"--schema-version-blob=2308",
- '--schema-version-commits',
"--schema-version-commit=2306",
"--traversal-ids=#{project.namespace_ancestry}",
"#{project.repository.disk_path}.git"
@@ -295,7 +292,6 @@
"--repository-access-level=#{project.repository_access_level}",
"--hashed-root-namespace-id=#{project.namespace.hashed_root_namespace_id}",
"--schema-version-blob=2308",
- '--schema-version-commits',
"--schema-version-commit=2306",
"--archived=#{project.archived}",
"--traversal-ids=#{project.namespace_ancestry}",
--
GitLab