diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-05 06:08:20 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-05 06:08:20 +0300 |
| commit | b2814abdec5fc79e34936d651e7e7fc68858237f (patch) | |
| tree | 4b57ecd36c51ce564e8105b3938af7192e02fccc /app/workers | |
| parent | 92a2c36b8cbbe4a7c0991312c28aa088a15201e6 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/workers')
| -rw-r--r-- | app/workers/database/batched_background_migration/execution_worker.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/workers/database/batched_background_migration/execution_worker.rb b/app/workers/database/batched_background_migration/execution_worker.rb index 37b40c73ca6..53c92ab8969 100644 --- a/app/workers/database/batched_background_migration/execution_worker.rb +++ b/app/workers/database/batched_background_migration/execution_worker.rb @@ -11,7 +11,6 @@ module Database INTERVAL_VARIANCE = 5.seconds.freeze LEASE_TIMEOUT_MULTIPLIER = 3 - MAX_RUNNING_MIGRATIONS = 4 included do data_consistency :always @@ -21,7 +20,7 @@ module Database class_methods do def max_running_jobs - MAX_RUNNING_MIGRATIONS + Gitlab::CurrentSettings.database_max_running_batched_background_migrations end # We have to overirde this one, as we want |