diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-16 00:06:25 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-16 00:06:25 +0300 |
| commit | 0ff031c7f4e2c7fe1b671b30fef569eb3fbea942 (patch) | |
| tree | 0493e9faf4bb9d69c06226901cea12f22714a92a /app/models | |
| parent | 7b8ec6e718331dd1f8330f08f49f01ba2c20b84c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/concerns/atomic_internal_id.rb | 3 | ||||
| -rw-r--r-- | app/models/internal_id.rb | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/models/concerns/atomic_internal_id.rb b/app/models/concerns/atomic_internal_id.rb index 7a7e485a95a..64df265dc25 100644 --- a/app/models/concerns/atomic_internal_id.rb +++ b/app/models/concerns/atomic_internal_id.rb @@ -57,8 +57,7 @@ module AtomicInternalId end define_method("track_#{scope}_#{column}!") do - iid_always_track = Feature.enabled?(:iid_always_track, default_enabled: true) - return unless @internal_id_needs_tracking || iid_always_track + return unless @internal_id_needs_tracking scope_value = internal_id_read_scope(scope) return unless scope_value diff --git a/app/models/internal_id.rb b/app/models/internal_id.rb index 946a3aafe18..8d3eeaf2461 100644 --- a/app/models/internal_id.rb +++ b/app/models/internal_id.rb @@ -54,7 +54,7 @@ class InternalId < ApplicationRecord last_value end - # Temporary instrumentation to track for-update locks + # Instrumentation to track for-update locks def update_and_save_counter strong_memoize(:update_and_save_counter) do Gitlab::Metrics.counter(:gitlab_internal_id_for_update_lock, 'Number of ROW SHARE (FOR UPDATE) locks on individual records from internal_ids') |