Geo: More reliable disaster recovery

CHANGELOG.md

@@ -3,6 +3,9 @@
 The latest version of this file can be found at the master branch of the
 omnibus-gitlab repository.
+10.8.0
+- Geo: Error when primary promotion fails
+
 10.7.0
 - Geo: Increase default WAL standby settings from 30s to 60s
 - Geo: Add support for creating a user for the  pgbouncer on the Geo DB

files/gitlab-ctl-commands-ee/lib/geo/promote_to_primary.rb

@@ -41,7 +41,7 @@ module Geo
       puts 'Promoting the PostgreSQL to primary...'.color(:yellow)
       puts
-      run_command("/opt/gitlab/embedded/bin/gitlab-pg-ctl promote")
+      run_command("/opt/gitlab/embedded/bin/gitlab-pg-ctl promote", live: true).error!
     end
     def reconfigure

spec/gitlab-ctl-commands-ee/lib/geo/promote_to_primary_spec.rb

@@ -31,7 +31,9 @@ describe Geo::PromoteToPrimary, '#execute' do
     it 'calls all the subcommands' do
       is_expected.to receive(:run_command).with('gitlab-ctl reconfigure', live: true).once
       is_expected.to receive(:run_command).with('gitlab-rake geo:set_secondary_as_primary', live: true).once
-      is_expected.to receive(:run_command).with("/opt/gitlab/embedded/bin/gitlab-pg-ctl promote").once
+
+      shell_out_object = double.tap { |shell_out_object| expect(shell_out_object).to receive(:error!) }
+      is_expected.to receive(:run_command).with("/opt/gitlab/embedded/bin/gitlab-pg-ctl promote", live: true).once.and_return(shell_out_object)
       command.execute
     end