diff options
Diffstat (limited to 'db')
4 files changed, 43 insertions, 18 deletions
diff --git a/db/migrate/20231129173649_add_terraform_module_duplicates_allowed_to_namespace_package_settings.rb b/db/migrate/20231129173649_add_terraform_module_duplicates_allowed_to_namespace_package_settings.rb new file mode 100644 index 00000000000..ea465de5873 --- /dev/null +++ b/db/migrate/20231129173649_add_terraform_module_duplicates_allowed_to_namespace_package_settings.rb @@ -0,0 +1,35 @@ +# frozen_string_literal: true + +class AddTerraformModuleDuplicatesAllowedToNamespacePackageSettings < Gitlab::Database::Migration[2.2] + milestone '16.8' + disable_ddl_transaction! + + def up + with_lock_retries do + add_column(:namespace_package_settings, + :terraform_module_duplicates_allowed, + :boolean, + null: false, + default: false, + if_not_exists: true + ) + + add_column(:namespace_package_settings, + :terraform_module_duplicate_exception_regex, + :text, + null: false, + default: '', + if_not_exists: true + ) + end + + add_text_limit(:namespace_package_settings, :terraform_module_duplicate_exception_regex, 255) + end + + def down + with_lock_retries do + remove_column(:namespace_package_settings, :terraform_module_duplicates_allowed, if_exists: true) + remove_column(:namespace_package_settings, :terraform_module_duplicate_exception_regex, if_exists: true) + end + end +end diff --git a/db/post_migrate/20231204095802_change_i_code_review_create_mr_keys_from_redis_hll_to_redis.rb b/db/post_migrate/20231204095802_change_i_code_review_create_mr_keys_from_redis_hll_to_redis.rb index 66b5ec0698e..d006e0f3121 100644 --- a/db/post_migrate/20231204095802_change_i_code_review_create_mr_keys_from_redis_hll_to_redis.rb +++ b/db/post_migrate/20231204095802_change_i_code_review_create_mr_keys_from_redis_hll_to_redis.rb @@ -3,24 +3,10 @@ class ChangeICodeReviewCreateMrKeysFromRedisHllToRedis < Gitlab::Database::Migration[2.2] milestone '16.8' - disable_ddl_transaction! - restrict_gitlab_migration gitlab_schema: :gitlab_main - - REDIS_HLL_PREFIX = '{hll_counters}_i_code_review_create_mr' - REDIS_PREFIX = '{event_counters}_i_code_review_user_create_mr' - def up - # For each old (redis_hll) counter we find the corresponding target (redis) counter and add - # old value to migrate a metric. If the Redis counter does not exist, it will get created. - # Since the RedisHLL keys expire after 6 weeks, we will migrate 6 keys at the most. - Gitlab::Redis::SharedState.with do |redis| - redis.scan_each(match: "#{REDIS_HLL_PREFIX}-*") do |key| - redis_key = key.sub(REDIS_HLL_PREFIX, REDIS_PREFIX) - redis_hll_value = redis.pfcount(key) - - redis.incrby(redis_key, redis_hll_value) - end - end + # no-op + # + # Removed due to https://gitlab.com/gitlab-com/gl-infra/production/-/issues/17321 end def down diff --git a/db/schema_migrations/20231129173649 b/db/schema_migrations/20231129173649 new file mode 100644 index 00000000000..a70b975dab6 --- /dev/null +++ b/db/schema_migrations/20231129173649 @@ -0,0 +1 @@ +a18e718e99c23ae6db929929a905af0db72e3a3734d3c33e12ec2cdb44467f6d
\ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index 8d7f7c2af3c..84f5fa79ab9 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -19505,9 +19505,12 @@ CREATE TABLE namespace_package_settings ( nuget_duplicates_allowed boolean DEFAULT true NOT NULL, nuget_duplicate_exception_regex text DEFAULT ''::text NOT NULL, nuget_symbol_server_enabled boolean DEFAULT false NOT NULL, + terraform_module_duplicates_allowed boolean DEFAULT false NOT NULL, + terraform_module_duplicate_exception_regex text DEFAULT ''::text NOT NULL, CONSTRAINT check_31340211b1 CHECK ((char_length(generic_duplicate_exception_regex) <= 255)), CONSTRAINT check_d63274b2b6 CHECK ((char_length(maven_duplicate_exception_regex) <= 255)), - CONSTRAINT check_eedcf85c48 CHECK ((char_length(nuget_duplicate_exception_regex) <= 255)) + CONSTRAINT check_eedcf85c48 CHECK ((char_length(nuget_duplicate_exception_regex) <= 255)), + CONSTRAINT check_f10503f1ad CHECK ((char_length(terraform_module_duplicate_exception_regex) <= 255)) ); CREATE TABLE namespace_root_storage_statistics ( |