diff --git a/files/gitlab-ctl-commands-ee/lib/geo/promote_to_primary.rb b/files/gitlab-ctl-commands-ee/lib/geo/promote_to_primary.rb index 884a4236506d43c5d2bab3576153a8ec89a54068_ZmlsZXMvZ2l0bGFiLWN0bC1jb21tYW5kcy1lZS9saWIvZ2VvL3Byb21vdGVfdG9fcHJpbWFyeS5yYg==..f73a46a22af7562537bff6cd2cadd39a06e1179c_ZmlsZXMvZ2l0bGFiLWN0bC1jb21tYW5kcy1lZS9saWIvZ2VvL3Byb21vdGVfdG9fcHJpbWFyeS5yYg== 100644 --- a/files/gitlab-ctl-commands-ee/lib/geo/promote_to_primary.rb +++ b/files/gitlab-ctl-commands-ee/lib/geo/promote_to_primary.rb @@ -76,10 +76,10 @@ puts 'Reconfiguring...'.color(:yellow) puts - run_command('gitlab-ctl reconfigure') + run_command('gitlab-ctl reconfigure', live: true) end def promote_to_primary puts puts 'Running gitlab-rake geo:set_secondary_as_primary...'.color(:yellow) puts @@ -80,9 +80,10 @@ end def promote_to_primary puts puts 'Running gitlab-rake geo:set_secondary_as_primary...'.color(:yellow) puts - run_command('gitlab-rake geo:set_secondary_as_primary') + + run_command('gitlab-rake geo:set_secondary_as_primary', live: true) end @@ -87,7 +88,7 @@ end - def run_command(cmd) - GitlabCtl::Util.run_command(cmd) + def run_command(cmd, live: false) + GitlabCtl::Util.run_command(cmd, live: live) end def key_path diff --git a/spec/gitlab-ctl-commands-ee/lib/geo/promote_to_primary_spec.rb b/spec/gitlab-ctl-commands-ee/lib/geo/promote_to_primary_spec.rb index 884a4236506d43c5d2bab3576153a8ec89a54068_c3BlYy9naXRsYWItY3RsLWNvbW1hbmRzLWVlL2xpYi9nZW8vcHJvbW90ZV90b19wcmltYXJ5X3NwZWMucmI=..f73a46a22af7562537bff6cd2cadd39a06e1179c_c3BlYy9naXRsYWItY3RsLWNvbW1hbmRzLWVlL2xpYi9nZW8vcHJvbW90ZV90b19wcmltYXJ5X3NwZWMucmI= 100644 --- a/spec/gitlab-ctl-commands-ee/lib/geo/promote_to_primary_spec.rb +++ b/spec/gitlab-ctl-commands-ee/lib/geo/promote_to_primary_spec.rb @@ -28,7 +28,9 @@ it 'calls all the subcommands' do stub_env - is_expected.to receive(:run_command).exactly(3).times + 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("touch #{postgres_trigger_file_path}").once command.execute end