From eae6ac1594650e613dc69ba81bf5803bd4437384 Mon Sep 17 00:00:00 2001
From: Max Fan <mfan@gitlab.com>
Date: Fri, 11 Aug 2023 15:45:07 -0700
Subject: [PATCH 1/4] Adding decompress_archive_file_timeout to application
 settings

Timeout has a default of 210 seconds. Updating documentation and UI.

Changelog: added
---
 app/helpers/application_settings_helper.rb         |  1 +
 app/models/application_setting.rb                  |  4 ++++
 app/models/application_setting_implementation.rb   |  1 +
 .../_account_and_limit.html.haml                   |  4 ++++
 ..._archive_file_timeout_to_application_setting.rb |  7 +++++++
 db/schema_migrations/20230814181359                |  1 +
 db/structure.sql                                   |  1 +
 .../settings/account_and_limit_settings.md         | 14 ++++++++++++++
 doc/api/settings.md                                |  3 +++
 lib/api/settings.rb                                |  1 +
 .../decompressed_archive_size_validator.rb         | 13 ++++++++-----
 locale/gitlab.pot                                  |  9 +++++++++
 .../decompressed_archive_size_validator_spec.rb    |  2 +-
 spec/models/application_setting_spec.rb            |  4 ++++
 spec/requests/api/settings_spec.rb                 |  3 +++
 15 files changed, 62 insertions(+), 6 deletions(-)
 create mode 100644 db/migrate/20230814181359_add_decompress_archive_file_timeout_to_application_setting.rb
 create mode 100644 db/schema_migrations/20230814181359

diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb
index a45425474b5e23..ef2233307eda45 100644
--- a/app/helpers/application_settings_helper.rb
+++ b/app/helpers/application_settings_helper.rb
@@ -238,6 +238,7 @@ def visible_attributes
       :container_expiration_policies_enable_historic_entries,
       :container_registry_expiration_policies_caching,
       :container_registry_token_expire_delay,
+      :decompress_archive_file_timeout,
       :default_artifacts_expire_in,
       :default_branch_name,
       :default_branch_protection,
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index f67efaf4f589d2..9c2101c50d4a48 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -300,6 +300,10 @@ def self.kroki_formats_attributes
     presence: true,
     numericality: { only_integer: true, greater_than: 0 }
 
+  validates :decompress_archive_file_timeout,
+    presence: true,
+    numericality: { only_integer: true, greater_than_or_equal_to: 0 }
+
   validates :repository_storages, presence: true
   validate :check_repository_storages
   validate :check_repository_storages_weighted
diff --git a/app/models/application_setting_implementation.rb b/app/models/application_setting_implementation.rb
index f6bf535158a833..d24da3d4237de2 100644
--- a/app/models/application_setting_implementation.rb
+++ b/app/models/application_setting_implementation.rb
@@ -53,6 +53,7 @@ def defaults # rubocop:disable Metrics/AbcSize
         container_registry_vendor: '',
         container_registry_version: '',
         custom_http_clone_url_root: nil,
+        decompress_archive_file_timeout: 210,
         default_artifacts_expire_in: '30 days',
         default_branch_name: nil,
         default_branch_protection: Settings.gitlab['default_branch_protection'],
diff --git a/app/views/admin/application_settings/_account_and_limit.html.haml b/app/views/admin/application_settings/_account_and_limit.html.haml
index d8d6af606ac453..d518c4d5e1b323 100644
--- a/app/views/admin/application_settings/_account_and_limit.html.haml
+++ b/app/views/admin/application_settings/_account_and_limit.html.haml
@@ -37,6 +37,10 @@
       = f.label :max_decompressed_archive_size, s_('Import|Maximum decompressed size (MiB)'), class: 'label-light'
       = f.number_field :max_decompressed_archive_size, class: 'form-control gl-form-input', title: s_('Import|Maximum size of decompressed archive.'), data: { toggle: 'tooltip', container: 'body' }
       %span.form-text.text-muted= _('Set to 0 for no size limit.')
+    .form-group
+      = f.label :decompress_archive_file_timeout, s_('Import|Timeout for decompressing archived files (seconds)'), class: 'label-light'
+      = f.number_field :decompress_archive_file_timeout, class: 'form-control gl-form-input', title: s_('Import|Timeout for decompressing archived files.'), data: { toggle: 'tooltip', container: 'body' }
+      %span.form-text.text-muted= _('Set to 0 to disable timeout.')
     .form-group
       = f.label :session_expire_delay, _('Session duration (minutes)'), class: 'label-light'
       = f.number_field :session_expire_delay, class: 'form-control gl-form-input', title: _('Maximum duration of a session.'), data: { toggle: 'tooltip', container: 'body' }
diff --git a/db/migrate/20230814181359_add_decompress_archive_file_timeout_to_application_setting.rb b/db/migrate/20230814181359_add_decompress_archive_file_timeout_to_application_setting.rb
new file mode 100644
index 00000000000000..24602708b2417e
--- /dev/null
+++ b/db/migrate/20230814181359_add_decompress_archive_file_timeout_to_application_setting.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddDecompressArchiveFileTimeoutToApplicationSetting < Gitlab::Database::Migration[2.1]
+  def change
+    add_column :application_settings, :decompress_archive_file_timeout, :integer, default: 210, null: false
+  end
+end
diff --git a/db/schema_migrations/20230814181359 b/db/schema_migrations/20230814181359
new file mode 100644
index 00000000000000..17086601248ad2
--- /dev/null
+++ b/db/schema_migrations/20230814181359
@@ -0,0 +1 @@
+2765c209b9347c0c76257a1af473edd6aebdc3f8d6dce3eed4d089e700c36808
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 7d9f78de7a54c9..0380805513d064 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -11932,6 +11932,7 @@ CREATE TABLE application_settings (
     max_decompressed_archive_size integer DEFAULT 25600 NOT NULL,
     ci_max_total_yaml_size_bytes integer DEFAULT 157286400 NOT NULL,
     prometheus_alert_db_indicators_settings jsonb,
+    decompress_archive_file_timeout integer DEFAULT 210 NOT NULL,
     CONSTRAINT app_settings_container_reg_cleanup_tags_max_list_size_positive CHECK ((container_registry_cleanup_tags_service_max_list_size >= 0)),
     CONSTRAINT app_settings_container_registry_pre_import_tags_rate_positive CHECK ((container_registry_pre_import_tags_rate >= (0)::numeric)),
     CONSTRAINT app_settings_dep_proxy_ttl_policies_worker_capacity_positive CHECK ((dependency_proxy_ttl_group_policy_worker_capacity >= 0)),
diff --git a/doc/administration/settings/account_and_limit_settings.md b/doc/administration/settings/account_and_limit_settings.md
index 3d632880113fe1..e5440d4f23c20b 100644
--- a/doc/administration/settings/account_and_limit_settings.md
+++ b/doc/administration/settings/account_and_limit_settings.md
@@ -155,6 +155,20 @@ To modify the maximum decompressed file size for imports in GitLab:
 1. Expand **Account and limit**.
 1. Set another value for **Maximum decompressed size (MiB)**.
 
+## Timeout for decompressing archived files
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128218) in GitLab 16.4.
+
+When you [import a project](../../user/project/settings/import_export.md), you can specify the maximum time out for decompressing imported archives. The default value is 210 seconds.
+
+To modify the maximum decompressed file size for imports in GitLab:
+
+1. On the left sidebar, expand the top-most chevron (**{chevron-down}**).
+1. Select **Admin Area**.
+1. Select **Settings > General**.
+1. Expand **Account and limit**.
+1. Set another value for **Timeout for decompressing archived files (seconds)**.
+
 ## Personal access token prefix
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/20968) in GitLab 13.7.
diff --git a/doc/api/settings.md b/doc/api/settings.md
index f43693c26f877e..71491729083fca 100644
--- a/doc/api/settings.md
+++ b/doc/api/settings.md
@@ -65,6 +65,7 @@ Example response:
   "container_registry_expiration_policies_caching": true,
   "container_registry_expiration_policies_worker_capacity": 4,
   "container_registry_token_expire_delay": 5,
+  "decompress_archive_file_timeout": 210,
   "repository_storages_weighted": {"default": 100},
   "plantuml_enabled": false,
   "plantuml_url": null,
@@ -208,6 +209,7 @@ Example response:
   "container_registry_expiration_policies_caching": true,
   "container_registry_expiration_policies_worker_capacity": 4,
   "container_registry_token_expire_delay": 5,
+  "decompress_archive_file_timeout": 210,
   "package_registry_cleanup_policies_worker_capacity": 2,
   "repository_storages": ["default"],
   "plantuml_enabled": false,
@@ -346,6 +348,7 @@ listed in the descriptions of the relevant settings.
 | `allow_account_deletion`                 | boolean          | no                                   | Enable [users to delete their accounts](../administration/settings/account_and_limit_settings.md#prevent-users-from-deleting-their-accounts). |
 | `deactivate_dormant_users`               | boolean          | no                                   | Enable [automatic deactivation of dormant users](../administration/moderate_users.md#automatically-deactivate-dormant-users). |
 | `deactivate_dormant_users_period`        | integer          | no                                   | Length of time (in days) after which a user is considered dormant. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/336747) in GitLab 15.3. |
+| `decompress_archive_file_timeout`        | integer          | no                                   | Default timeout for decompressing archived files, in seconds. Set to 0 to disable timeouts. |
 | `default_artifacts_expire_in`            | string           | no                                   | Set the default expiration time for each job's artifacts. |
 | `default_branch_name`                    | string           | no                                   | [Instance-level custom initial branch name](../user/project/repository/branches/default.md#instance-level-custom-initial-branch-name). [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/225258) in GitLab 13.2. |
 | `default_branch_protection`              | integer          | no                                   | Determine if developers can push to the default branch. Can take: `0` _(not protected, both users with the Developer role or Maintainer role can push new commits and force push)_, `1` _(partially protected, users with the Developer role or Maintainer role can push new commits, but cannot force push)_ or `2` _(fully protected, users with the Developer or Maintainer role cannot push new commits, but users with the Developer or Maintainer role can; no one can force push)_ as a parameter. Default is `2`. |
diff --git a/lib/api/settings.rb b/lib/api/settings.rb
index e2dc78fe84a818..61c6eb7d02a26a 100644
--- a/lib/api/settings.rb
+++ b/lib/api/settings.rb
@@ -45,6 +45,7 @@ def filter_attributes_using_license(attrs)
       optional :asset_proxy_whitelist, type: Array[String], coerce_with: Validations::Types::CommaSeparatedToArray.coerce, desc: 'Deprecated: Use :asset_proxy_allowlist instead. Assets that match these domain(s) will NOT be proxied. Wildcards allowed. Your GitLab installation URL is automatically whitelisted.'
       optional :asset_proxy_allowlist, type: Array[String], coerce_with: Validations::Types::CommaSeparatedToArray.coerce, desc: 'Assets that match these domain(s) will NOT be proxied. Wildcards allowed. Your GitLab installation URL is automatically allowed.'
       optional :container_registry_token_expire_delay, type: Integer, desc: 'Authorization token duration (minutes)'
+      optional :decompress_archive_file_timeout, type: Integer, desc: 'Default timeout for decompressing archived files, in seconds. Set to 0 to disable timeouts.'
       optional :default_artifacts_expire_in, type: String, desc: "Set the default expiration time for each job's artifacts"
       optional :default_ci_config_path, type: String, desc: 'The instance default CI/CD configuration file and path for new projects'
       optional :default_project_creation, type: Integer, values: ::Gitlab::Access.project_creation_values, desc: 'Determine if developers can create projects in the group'
diff --git a/lib/gitlab/import_export/decompressed_archive_size_validator.rb b/lib/gitlab/import_export/decompressed_archive_size_validator.rb
index 3609df89958bcf..23a0c9a1f71056 100644
--- a/lib/gitlab/import_export/decompressed_archive_size_validator.rb
+++ b/lib/gitlab/import_export/decompressed_archive_size_validator.rb
@@ -5,13 +5,12 @@ module ImportExport
     class DecompressedArchiveSizeValidator
       include Gitlab::Utils::StrongMemoize
 
-      TIMEOUT_LIMIT = 210.seconds
-
       ServiceError = Class.new(StandardError)
 
-      def initialize(archive_path:, max_bytes: self.class.max_bytes)
+      def initialize(archive_path:, max_bytes: self.class.max_bytes, timeout: self.class.timeout)
         @archive_path = archive_path
         @max_bytes = max_bytes
+        @timeout = timeout
       end
 
       def valid?
@@ -24,6 +23,10 @@ def self.max_bytes
         Gitlab::CurrentSettings.current_application_settings.max_decompressed_archive_size.megabytes
       end
 
+      def self.timeout
+        Gitlab::CurrentSettings.current_application_settings.decompress_archive_file_timeout
+      end
+
       private
 
       def validate
@@ -32,7 +35,7 @@ def validate
 
         validate_archive_path
 
-        Timeout.timeout(TIMEOUT_LIMIT) do
+        Timeout.timeout(@timeout) do
           stderr_r, stderr_w = IO.pipe
           stdout, wait_threads = Open3.pipeline_r(*command, pgroup: true, err: stderr_w)
 
@@ -70,7 +73,7 @@ def validate
 
         valid_archive
       rescue Timeout::Error
-        log_error('Timeout reached during archive decompression')
+        log_error("Timeout of #{@timeout} seconds reached during archive decompression")
 
         pgrps.each { |pgrp| Process.kill(-1, pgrp) } if pgrps
 
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index aa40012f77afb4..73eee05e89b25e 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -24241,6 +24241,12 @@ msgstr ""
 msgid "Import|There is not a valid Git repository at this URL. If your HTTP repository is not publicly accessible, verify your credentials."
 msgstr ""
 
+msgid "Import|Timeout for decompressing archived files (seconds)"
+msgstr ""
+
+msgid "Import|Timeout for decompressing archived files."
+msgstr ""
+
 msgid "Improve customer support with Service Desk"
 msgstr ""
 
@@ -43816,6 +43822,9 @@ msgstr ""
 msgid "Set to 0 for no size limit."
 msgstr ""
 
+msgid "Set to 0 to disable timeout."
+msgstr ""
+
 msgid "Set to auto-merge"
 msgstr ""
 
diff --git a/spec/lib/gitlab/import_export/decompressed_archive_size_validator_spec.rb b/spec/lib/gitlab/import_export/decompressed_archive_size_validator_spec.rb
index aceea70be92138..a73f5d44b50177 100644
--- a/spec/lib/gitlab/import_export/decompressed_archive_size_validator_spec.rb
+++ b/spec/lib/gitlab/import_export/decompressed_archive_size_validator_spec.rb
@@ -93,7 +93,7 @@
       end
 
       context 'when timeout occurs' do
-        let(:error_message) { 'Timeout reached during archive decompression' }
+        let(:error_message) { 'Timeout of 210 seconds reached during archive decompression' }
         let(:exception) { Timeout::Error }
 
         include_examples 'logs raised exception and terminates validator process group'
diff --git a/spec/models/application_setting_spec.rb b/spec/models/application_setting_spec.rb
index 5a70bec8b33aba..6214e5f60f91bd 100644
--- a/spec/models/application_setting_spec.rb
+++ b/spec/models/application_setting_spec.rb
@@ -25,6 +25,7 @@
     it { expect(setting.kroki_formats).to eq({}) }
     it { expect(setting.default_branch_protection_defaults).to eq({}) }
     it { expect(setting.max_decompressed_archive_size).to eq(25600) }
+    it { expect(setting.decompress_archive_file_timeout).to eq(210) }
   end
 
   describe 'validations' do
@@ -134,6 +135,9 @@
     it { is_expected.to validate_presence_of(:container_registry_import_target_plan) }
     it { is_expected.to validate_presence_of(:container_registry_import_created_before) }
 
+    it { is_expected.to validate_numericality_of(:decompress_archive_file_timeout).only_integer.is_greater_than_or_equal_to(0) }
+    it { is_expected.not_to allow_value(nil).for(:decompress_archive_file_timeout) }
+
     it { is_expected.to validate_numericality_of(:dependency_proxy_ttl_group_policy_worker_capacity).only_integer.is_greater_than_or_equal_to(0) }
     it { is_expected.not_to allow_value(nil).for(:dependency_proxy_ttl_group_policy_worker_capacity) }
 
diff --git a/spec/requests/api/settings_spec.rb b/spec/requests/api/settings_spec.rb
index 12af1fc1b7993c..7d630f1868155c 100644
--- a/spec/requests/api/settings_spec.rb
+++ b/spec/requests/api/settings_spec.rb
@@ -27,6 +27,7 @@
       expect(json_response['secret_detection_token_revocation_url']).to be_nil
       expect(json_response['secret_detection_revocation_token_types_url']).to be_nil
       expect(json_response['sourcegraph_public_only']).to be_truthy
+      expect(json_response['decompress_archive_file_timeout']).to eq(210)
       expect(json_response['default_preferred_language']).to be_a String
       expect(json_response['default_project_visibility']).to be_a String
       expect(json_response['default_snippet_visibility']).to be_a String
@@ -153,6 +154,7 @@
             enforce_terms: true,
             terms: 'Hello world!',
             performance_bar_allowed_group_path: group.full_path,
+            decompress_archive_file_timeout: 60,
             diff_max_patch_bytes: 300_000,
             diff_max_files: 2000,
             diff_max_lines: 50000,
@@ -234,6 +236,7 @@
         expect(json_response['enforce_terms']).to be(true)
         expect(json_response['terms']).to eq('Hello world!')
         expect(json_response['performance_bar_allowed_group_id']).to eq(group.id)
+        expect(json_response['decompress_archive_file_timeout']).to eq(60)
         expect(json_response['diff_max_patch_bytes']).to eq(300_000)
         expect(json_response['diff_max_files']).to eq(2000)
         expect(json_response['diff_max_lines']).to eq(50000)
-- 
GitLab


From 7f39c2edeec61030d6637ae3fe1cb0d8630265da Mon Sep 17 00:00:00 2001
From: Max Fan <mfan@gitlab.com>
Date: Thu, 17 Aug 2023 09:38:42 -0700
Subject: [PATCH 2/4] Adding disable_dd_transactions

---
 ...dd_decompress_archive_file_timeout_to_application_setting.rb | 2 ++
 db/schema_migrations/20230814181359                             | 1 -
 db/structure.sql                                                | 1 -
 doc/api/settings.md                                             | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 db/schema_migrations/20230814181359

diff --git a/db/migrate/20230814181359_add_decompress_archive_file_timeout_to_application_setting.rb b/db/migrate/20230814181359_add_decompress_archive_file_timeout_to_application_setting.rb
index 24602708b2417e..f57545424a635f 100644
--- a/db/migrate/20230814181359_add_decompress_archive_file_timeout_to_application_setting.rb
+++ b/db/migrate/20230814181359_add_decompress_archive_file_timeout_to_application_setting.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class AddDecompressArchiveFileTimeoutToApplicationSetting < Gitlab::Database::Migration[2.1]
+  disable_ddl_transaction!
+
   def change
     add_column :application_settings, :decompress_archive_file_timeout, :integer, default: 210, null: false
   end
diff --git a/db/schema_migrations/20230814181359 b/db/schema_migrations/20230814181359
deleted file mode 100644
index 17086601248ad2..00000000000000
--- a/db/schema_migrations/20230814181359
+++ /dev/null
@@ -1 +0,0 @@
-2765c209b9347c0c76257a1af473edd6aebdc3f8d6dce3eed4d089e700c36808
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 0380805513d064..7d9f78de7a54c9 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -11932,7 +11932,6 @@ CREATE TABLE application_settings (
     max_decompressed_archive_size integer DEFAULT 25600 NOT NULL,
     ci_max_total_yaml_size_bytes integer DEFAULT 157286400 NOT NULL,
     prometheus_alert_db_indicators_settings jsonb,
-    decompress_archive_file_timeout integer DEFAULT 210 NOT NULL,
     CONSTRAINT app_settings_container_reg_cleanup_tags_max_list_size_positive CHECK ((container_registry_cleanup_tags_service_max_list_size >= 0)),
     CONSTRAINT app_settings_container_registry_pre_import_tags_rate_positive CHECK ((container_registry_pre_import_tags_rate >= (0)::numeric)),
     CONSTRAINT app_settings_dep_proxy_ttl_policies_worker_capacity_positive CHECK ((dependency_proxy_ttl_group_policy_worker_capacity >= 0)),
diff --git a/doc/api/settings.md b/doc/api/settings.md
index 71491729083fca..6d21f0b120d4ef 100644
--- a/doc/api/settings.md
+++ b/doc/api/settings.md
@@ -348,7 +348,7 @@ listed in the descriptions of the relevant settings.
 | `allow_account_deletion`                 | boolean          | no                                   | Enable [users to delete their accounts](../administration/settings/account_and_limit_settings.md#prevent-users-from-deleting-their-accounts). |
 | `deactivate_dormant_users`               | boolean          | no                                   | Enable [automatic deactivation of dormant users](../administration/moderate_users.md#automatically-deactivate-dormant-users). |
 | `deactivate_dormant_users_period`        | integer          | no                                   | Length of time (in days) after which a user is considered dormant. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/336747) in GitLab 15.3. |
-| `decompress_archive_file_timeout`        | integer          | no                                   | Default timeout for decompressing archived files, in seconds. Set to 0 to disable timeouts. |
+| `decompress_archive_file_timeout`        | integer          | no                                   | Default timeout for decompressing archived files, in seconds. Set to 0 to disable timeouts. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/129161) in GitLab 16.4. |
 | `default_artifacts_expire_in`            | string           | no                                   | Set the default expiration time for each job's artifacts. |
 | `default_branch_name`                    | string           | no                                   | [Instance-level custom initial branch name](../user/project/repository/branches/default.md#instance-level-custom-initial-branch-name). [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/225258) in GitLab 13.2. |
 | `default_branch_protection`              | integer          | no                                   | Determine if developers can push to the default branch. Can take: `0` _(not protected, both users with the Developer role or Maintainer role can push new commits and force push)_, `1` _(partially protected, users with the Developer role or Maintainer role can push new commits, but cannot force push)_ or `2` _(fully protected, users with the Developer or Maintainer role cannot push new commits, but users with the Developer or Maintainer role can; no one can force push)_ as a parameter. Default is `2`. |
-- 
GitLab


From b134542285862d297f03c1505dcf48c12ecc9747 Mon Sep 17 00:00:00 2001
From: Max Fan <mfan@gitlab.com>
Date: Thu, 17 Aug 2023 09:42:34 -0700
Subject: [PATCH 3/4] Running regenerate-schema

---
 db/schema_migrations/20230814181359 | 1 +
 db/structure.sql                    | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 db/schema_migrations/20230814181359

diff --git a/db/schema_migrations/20230814181359 b/db/schema_migrations/20230814181359
new file mode 100644
index 00000000000000..17086601248ad2
--- /dev/null
+++ b/db/schema_migrations/20230814181359
@@ -0,0 +1 @@
+2765c209b9347c0c76257a1af473edd6aebdc3f8d6dce3eed4d089e700c36808
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 7d9f78de7a54c9..c8e6bb6d88415d 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -11930,8 +11930,9 @@ CREATE TABLE application_settings (
     sentry_clientside_traces_sample_rate double precision DEFAULT 0.0 NOT NULL,
     protected_paths_for_get_request text[] DEFAULT '{}'::text[] NOT NULL,
     max_decompressed_archive_size integer DEFAULT 25600 NOT NULL,
-    ci_max_total_yaml_size_bytes integer DEFAULT 157286400 NOT NULL,
     prometheus_alert_db_indicators_settings jsonb,
+    ci_max_total_yaml_size_bytes integer DEFAULT 157286400 NOT NULL,
+    decompress_archive_file_timeout integer DEFAULT 210 NOT NULL,
     CONSTRAINT app_settings_container_reg_cleanup_tags_max_list_size_positive CHECK ((container_registry_cleanup_tags_service_max_list_size >= 0)),
     CONSTRAINT app_settings_container_registry_pre_import_tags_rate_positive CHECK ((container_registry_pre_import_tags_rate >= (0)::numeric)),
     CONSTRAINT app_settings_dep_proxy_ttl_policies_worker_capacity_positive CHECK ((dependency_proxy_ttl_group_policy_worker_capacity >= 0)),
-- 
GitLab


From af24c83ff8208bdc976db554bbfdf306a1643570 Mon Sep 17 00:00:00 2001
From: Max Fan <mfan@gitlab.com>
Date: Mon, 21 Aug 2023 11:05:42 -0700
Subject: [PATCH 4/4] Moving prometheus_alert_db_indicators_settings down one

---
 db/structure.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/structure.sql b/db/structure.sql
index c8e6bb6d88415d..0380805513d064 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -11930,8 +11930,8 @@ CREATE TABLE application_settings (
     sentry_clientside_traces_sample_rate double precision DEFAULT 0.0 NOT NULL,
     protected_paths_for_get_request text[] DEFAULT '{}'::text[] NOT NULL,
     max_decompressed_archive_size integer DEFAULT 25600 NOT NULL,
-    prometheus_alert_db_indicators_settings jsonb,
     ci_max_total_yaml_size_bytes integer DEFAULT 157286400 NOT NULL,
+    prometheus_alert_db_indicators_settings jsonb,
     decompress_archive_file_timeout integer DEFAULT 210 NOT NULL,
     CONSTRAINT app_settings_container_reg_cleanup_tags_max_list_size_positive CHECK ((container_registry_cleanup_tags_service_max_list_size >= 0)),
     CONSTRAINT app_settings_container_registry_pre_import_tags_rate_positive CHECK ((container_registry_pre_import_tags_rate >= (0)::numeric)),
-- 
GitLab