diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-31 18:08:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-31 18:08:42 +0300 |
| commit | c27acb1d376f7127cd33eadcc8f5683ed55262bc (patch) | |
| tree | 685c31391dca71a73782b5c8626f4ef5b582dc21 /lib/gitlab/database | |
| parent | 1808454313ed75c92e1384466e8c83bfbc8ae25e (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/database')
| -rw-r--r-- | lib/gitlab/database/with_lock_retries.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/database/with_lock_retries.rb b/lib/gitlab/database/with_lock_retries.rb index 37f7e8fbdac..2f36bfa1480 100644 --- a/lib/gitlab/database/with_lock_retries.rb +++ b/lib/gitlab/database/with_lock_retries.rb @@ -147,11 +147,11 @@ module Gitlab end def current_lock_timeout_in_ms - timing_configuration[current_iteration - 1][0].in_milliseconds + Integer(timing_configuration[current_iteration - 1][0].in_milliseconds) end def current_sleep_time_in_seconds - timing_configuration[current_iteration - 1][1].to_i + timing_configuration[current_iteration - 1][1].to_f end end end |