Support multiple Redis instances based on queue type

5 files changed, 120 insertions, 25 deletions

diff --git a/lib/gitlab/health_checks/redis/cache_check.rb b/lib/gitlab/health_checks/redis/cache_check.rb
new file mode 100644
index 00000000000..a28658d42d4
--- /dev/null
+++ b/lib/gitlab/health_checks/redis/cache_check.rb
@@ -0,0 +1,31 @@
+module Gitlab
+  module HealthChecks
+    module Redis
+      class CacheCheck
+        extend SimpleAbstractCheck
+
+        class << self
+          def check_up
+            check
+          end
+
+          private
+
+          def metric_prefix
+            'redis_cache_ping'
+          end
+
+          def is_successful?(result)
+            result == 'PONG'
+          end
+
+          def check
+            catch_timeout 10.seconds do
+              Gitlab::Redis::Cache.with(&:ping)
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/health_checks/redis/queues_check.rb b/lib/gitlab/health_checks/redis/queues_check.rb
new file mode 100644
index 00000000000..f97d50d3947
--- /dev/null
+++ b/lib/gitlab/health_checks/redis/queues_check.rb
@@ -0,0 +1,31 @@
+module Gitlab
+  module HealthChecks
+    module Redis
+      class QueuesCheck
+        extend SimpleAbstractCheck
+
+        class << self
+          def check_up
+            check
+          end
+
+          private
+
+          def metric_prefix
+            'redis_queues_ping'
+          end
+
+          def is_successful?(result)
+            result == 'PONG'
+          end
+
+          def check
+            catch_timeout 10.seconds do
+              Gitlab::Redis::Queues.with(&:ping)
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/health_checks/redis/redis_check.rb b/lib/gitlab/health_checks/redis/redis_check.rb
new file mode 100644
index 00000000000..fe4e3c4a3ab
--- /dev/null
+++ b/lib/gitlab/health_checks/redis/redis_check.rb
@@ -0,0 +1,27 @@
+module Gitlab
+  module HealthChecks
+    module Redis
+      class RedisCheck
+        extend SimpleAbstractCheck
+
+        class << self
+          private
+
+          def metric_prefix
+            'redis_ping'
+          end
+
+          def is_successful?(result)
+            result == 'PONG'
+          end
+
+          def check
+            ::Gitlab::HealthChecks::Redis::CacheCheck.check_up &&
+              ::Gitlab::HealthChecks::Redis::QueuesCheck.check_up &&
+              ::Gitlab::HealthChecks::Redis::SharedStateCheck.check_up
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/health_checks/redis/shared_state_check.rb b/lib/gitlab/health_checks/redis/shared_state_check.rb
new file mode 100644
index 00000000000..e3244392902
--- /dev/null
+++ b/lib/gitlab/health_checks/redis/shared_state_check.rb
@@ -0,0 +1,31 @@
+module Gitlab
+  module HealthChecks
+    module Redis
+      class SharedStateCheck
+        extend SimpleAbstractCheck
+
+        class << self
+          def check_up
+            check
+          end
+
+          private
+
+          def metric_prefix
+            'redis_shared_state_ping'
+          end
+
+          def is_successful?(result)
+            result == 'PONG'
+          end
+
+          def check
+            catch_timeout 10.seconds do
+              Gitlab::Redis::SharedState.with(&:ping)
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/health_checks/redis_check.rb b/lib/gitlab/health_checks/redis_check.rb
deleted file mode 100644
index 57bbe5b3ad0..00000000000
--- a/lib/gitlab/health_checks/redis_check.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-module Gitlab
-  module HealthChecks
-    class RedisCheck
-      extend SimpleAbstractCheck
-
-      class << self
-        private
-
-        def metric_prefix
-          'redis_ping'
-        end
-
-        def is_successful?(result)
-          result == 'PONG'
-        end
-
-        def check
-          catch_timeout 10.seconds do
-            Gitlab::Redis.with(&:ping)
-          end
-        end
-      end
-    end
-  end
-end