Merge branch 'improve-pgbouncer-running-check' into 'master'

Improve pgbouncer running? method

See merge request gitlab-org/omnibus-gitlab!4557

changelogs/unreleased/improve-pgbouncer-running-check.yml

+---
+title: Improve pgbouncer running? method
+merge_request: 4557
+author:
+type: fixed

files/gitlab-cookbooks/gitlab-ee/recipes/pgbouncer.rb

@@ -93,6 +93,7 @@ execute 'generate databases.ini' do
     node['consul']['watchers'].include?('postgresql') &&
       File.exist?(node['gitlab']['pgbouncer']['databases_ini'])
   end
+  retries 3
 end
 execute 'reload pgbouncer' do

files/gitlab-ctl-commands-ee/lib/pgbouncer.rb

@@ -105,7 +105,9 @@ module Pgbouncer
     end
     def running?
-      GitlabCtl::Util.run_command('gitlab-ctl status pgbouncer').error?
+      true if show_databases
+    rescue GitlabCtl::Errors::ExecutionError
+      false
     end
     def database_paused?

spec/gitlab-ctl-commands-ee/lib/pgbouncer_spec.rb

@@ -97,4 +97,24 @@ RSpec.describe Pgbouncer::Databases do
       )
     end
   end
+
+  context 'with pgbouncer listening' do
+    before do
+      allow(@obj).to receive(:show_databases).and_return("nyan")
+    end
+
+    it 'should be running' do
+      expect(@obj.running?).to be true
+    end
+  end
+
+  context 'with pgbouncer not listening' do
+    before do
+      allow(@obj).to receive(:show_databases).and_raise(GitlabCtl::Errors::ExecutionError.new("nya", "nya", "neko"))
+    end
+
+    it 'should not be running' do
+      expect(@obj.running?).to be false
+    end
+  end
 end