diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-08-05 12:47:55 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-08-05 12:47:55 +0000 |
| commit | 1463201ffcd7f6c6abc43857c71dee2fd23e6045 (patch) | |
| tree | a3642f2a058bf311f31c0a07714e1480bcb7f85a /ee/lib | |
| parent | 790671ed96fb6f5208c9844a8368836fca080b7d (diff) | |
| parent | 7ee21e155c065619d3a3d1f07178e0c46a7c0626 (diff) | |
| download | gitlab-ce-1463201ffcd7f6c6abc43857c71dee2fd23e6045.tar.gz | |
Merge branch 'ab-remove-postgresql-switches' into 'master'
Further remove code branches by database type (EE)
See merge request gitlab-org/gitlab-ee!14824
Diffstat (limited to 'ee/lib')
| -rw-r--r-- | ee/lib/gitlab/database/load_balancing.rb | 1 | ||||
| -rw-r--r-- | ee/lib/gitlab/geo/health_check.rb | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/ee/lib/gitlab/database/load_balancing.rb b/ee/lib/gitlab/database/load_balancing.rb index 8df76abcf20..a48dd3e90d8 100644 --- a/ee/lib/gitlab/database/load_balancing.rb +++ b/ee/lib/gitlab/database/load_balancing.rb @@ -85,7 +85,6 @@ module Gitlab def self.enable? return false unless ::License.feature_available?(:db_load_balancing) return false if program_name == 'rake' || Sidekiq.server? - return false unless Database.postgresql? hosts.any? || service_discovery_enabled? end diff --git a/ee/lib/gitlab/geo/health_check.rb b/ee/lib/gitlab/geo/health_check.rb index f35eb6983e7..0bee98cce0a 100644 --- a/ee/lib/gitlab/geo/health_check.rb +++ b/ee/lib/gitlab/geo/health_check.rb @@ -6,8 +6,6 @@ module Gitlab include Gitlab::Utils::StrongMemoize def perform_checks - raise NotImplementedError.new('Geo is only compatible with PostgreSQL') unless Gitlab::Database.postgresql? - return '' unless Gitlab::Geo.secondary? return 'Geo database configuration file is missing.' unless Gitlab::Geo.geo_database_configured? return 'Geo node has a database that is writable which is an indication it is not configured for replication with the primary node.' unless Gitlab::Database.db_read_only? |