Check tmp_dir with or without geo

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

@@ -166,17 +166,9 @@ add_command_under_category 'pg-upgrade', 'database',
   deprecation_message if @db_worker.target_version.major.to_f < 11
   unless options[:skip_disk_check]
-    check_dirs = []
-
-    if pg_enabled || patroni_enabled
-      check_dirs << @db_worker.data_dir
-      check_dirs << @db_worker.tmp_dir
-    end
-
-    if geo_enabled
-      check_dirs << @attributes['gitlab']['geo-postgresql']['data_dir']
-      check_dirs << "#{@db_worker.tmp_dir}/geo-data" unless @db_worker.tmp_dir.nil?
-    end
+    check_dirs = [@db_worker.tmp_dir]
+    check_dirs << @db_worker.data_dir if pg_enabled || patroni_enabled
+    check_dirs << @attributes['gitlab']['geo-postgresql']['data_dir'] if geo_enabled
     check_dirs.compact.uniq.each do |dir|
       unless GitlabCtl::Util.progress_message(