Merge branch '7841-pg_upgrade-fails-on-single-node-geo-secondary-gitlab-15-11-postgresql-12-13' into 'master'

Fix pg-upgrade failure on Geo secondary nodes

Closes #7841

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/6984

Merged-by: Balasankar 'Balu' C <[email protected]>
Approved-by: Andrew Patterson <[email protected]>
Approved-by: Balasankar 'Balu' C <[email protected]>
Reviewed-by: Ben Prescott_ <[email protected]>
Co-authored-by: Ben Prescott_ <[email protected]>
Co-authored-by: Ian Baum <[email protected]>

Author: 3 people

files/gitlab-ctl-commands/pg-upgrade.rb

@@ -276,11 +276,11 @@
     elsif @instance_type == :patroni_standby_leader
       patroni_standby_leader_upgrade
     end
-  elsif @roles.include?('geo-primary')
+  elsif @roles.include?('geo_primary')
     log 'Detected a GEO primary node'
     @instance_type = :geo_primary
     general_upgrade
-  elsif @roles.include?('geo-secondary')
+  elsif @roles.include?('geo_secondary')
     log 'Detected a Geo secondary node'
     @instance_type = :geo_secondary
     geo_secondary_upgrade(options[:tmp_dir], options[:timeout])
@@ -447,21 +447,22 @@ def geo_secondary_upgrade(tmp_dir, timeout)
     log('Upgrading the postgresql database')
     begin
       promote_database
-    rescue GitlabCtl::Errors::ExecutionError
-      die "There was an error promoting the database. Please check the logs"
+    rescue GitlabCtl::Errors::ExecutionError => e
+      log "STDOUT: #{e.stdout}"
+      log "STDERR: #{e.stderr}"
+      die "There was an error promoting the database from standby, please check the logs and output."
     end
 
     # Restart the database after promotion, and wait for it to be ready
     restart_database
     GitlabCtl::PostgreSQL.wait_for_postgresql(600)
 
     common_pre_upgrade
-
-    # Only disable maintenance_mode if geo-pg is not enabled
-    common_post_upgrade(!@geo_pg_enabled)
+    cleanup_data_dir
   end
 
   geo_pg_upgrade
+  common_post_upgrade
 end
 
 def geo_pg_upgrade
@@ -485,7 +486,6 @@ def geo_pg_upgrade
   rescue GitlabCtl::Errors::ExecutionError
     die "Error running pg_upgrade on secondary, please check logs"
   end
-  common_post_upgrade
 end
 
 def get_locale_encoding