Merge branch '5660-pg_upgrade_with_tmp_dir' into 'master'

pg-upgrade: Do not check data_dir free space for for --tmp-data_dir

Closes #5660

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

Merged-by: Balasankar 'Balu' C <[email protected]>
Approved-by: Hossein Pursultani <[email protected]>
Approved-by: Balasankar 'Balu' C <[email protected]>
Co-authored-by: Andrew Patterson <[email protected]>

Author: balasankarc

files/gitlab-ctl-commands/lib/gitlab_ctl/pg_upgrade.rb

@@ -48,8 +48,8 @@ def tmp_data_dir
       @tmp_data_dir = @tmp_dir ? "#{@tmp_dir}/data" : data_dir
     end
 
-    def enough_free_space?(dir)
-      space_needed(dir) <= space_free(dir)
+    def enough_free_space?(dir, needed)
+      needed <= space_free(dir)
     end
 
     def space_needed(dir)

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

@@ -189,18 +189,25 @@
     Kernel.exit 0
   end
 
+  total_space_needed = 0 # in MiB
   unless options[:skip_disk_check]
-    check_dirs = [@db_worker.tmp_dir]
-    check_dirs << @db_worker.data_dir if pg_enabled || patroni_enabled
-    check_dirs << File.join(@attributes['gitlab']['geo_postgresql']['dir'], 'data') if geo_enabled
+    check_dirs = {}
+    check_dirs[@db_worker.data_dir] = 0 if pg_enabled || patroni_enabled
+    check_dirs[File.join(@attributes['gitlab']['geo_postgresql']['dir'], 'data')] = 0 if geo_enabled
+    check_dirs.each_key do |dir|
+      check_dirs[dir] = @db_worker.space_needed(dir)
+      total_space_needed += check_dirs[dir]
+    end
+    # We need space for all databases if using --tmp-dir.
+    check_dirs = { @db_worker.tmp_dir => total_space_needed } if @db_worker.tmp_dir
 
-    check_dirs.compact.uniq.each do |dir|
+    check_dirs.each do |dir, space_needed|
       unless GitlabCtl::Util.progress_message(
         "Checking if disk for directory #{dir} has enough free space for PostgreSQL upgrade"
       ) do
-        @db_worker.enough_free_space?(dir)
+        @db_worker.enough_free_space?(dir, space_needed)
       end
-        log "Upgrade requires #{@db_worker.space_needed(dir)}MB, but only #{@db_worker.space_free(dir)}MB is free."
+        log "Upgrade requires #{space_needed}MB, but only #{@db_worker.space_free(dir)}MB is free."
         Kernel.exit 1
       end
       next

spec/chef/gitlab-ctl-commands/lib/gitlab_ctl_pg_upgrade_spec.rb

@@ -68,7 +68,7 @@ def stub_postgresql_json_attributes(config = nil)
           "df -P --block-size=1m #{@dbw.data_dir} | awk '{print $4}'", nil, 123
         ).and_return("Available\n220000")
 
-        expect(@dbw.enough_free_space?(@dbw.data_dir)).to eq(false)
+        expect(@dbw.enough_free_space?(@dbw.data_dir, 440000)).to eq(false)
       end
 
       it 'detects when there is enough available disk space for upgrade' do
@@ -80,7 +80,7 @@ def stub_postgresql_json_attributes(config = nil)
           "df -P --block-size=1m #{@dbw.data_dir} | awk '{print $4}'", nil, 123
         ).and_return("Available\n250000")
 
-        expect(@dbw.enough_free_space?(@dbw.data_dir)).to eq(true)
+        expect(@dbw.enough_free_space?(@dbw.data_dir, 100000)).to eq(true)
       end
     end