Merge bdd11c0 into 9217989

package/yast2-installation.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Dec  7 09:27:38 UTC 2020 - Ladislav Slezák <lslezak@suse.cz>
+
+- Do not cleanup the libzypp cache when the system has low memory,
+  incomplete cache confuses libzypp later (bsc#1179415)
+- 4.3.24
+
 -------------------------------------------------------------------
 Fri Dec  4 17:08:17 UTC 2020 - Stefan Schubert <schubi@suse.de>
 

package/yast2-installation.spec

@@ -16,7 +16,7 @@
 #
 
 Name:           yast2-installation
-Version:        4.3.23
+Version:        4.3.24
 Release:        0
 Group:          System/YaST
 License:        GPL-2.0-only

src/lib/installation/instsys_cleaner.rb

@@ -29,42 +29,11 @@ class InstsysCleaner
 
     Yast.import "Mode"
     Yast.import "Stage"
-    Yast.import "UI"
 
     # memory limit for removing the kernel modules from inst-sys (1GB)
     KERNEL_MODULES_WATERLINE = 1 << 30
     KERNEL_MODULES_MOUNT_POINT = "/parts/mp_0000".freeze
 
-    # memory limit for removing the libzypp metadata cache (<640MB in text mode, <1GB in GUI)
-    LIBZYPP_WATERLINE_TUI = 640 << 20
-    LIBZYPP_WATERLINE_GUI = 1 << 30
-    # the cache in inst-sys, the target system cache is at /mnt/...,
-    # in upgrade mode the target cache is kept
-    LIBZYPP_CACHE_PATH = "/var/cache/zypp/raw".freeze
-
-    # files which can be removed from the libzypp "raw" cache in inst-sys (globs),
-    # not needed for package installation
-    LIBZYPP_CLEANUP_PATTERNS = [
-      # repository meta data already included in the "solv" cache,
-      "*-deltainfo.xml.gz",
-      "*-primary.xml.gz",
-      "*-susedata.xml.gz",
-      "*-susedata.*.xml.gz",
-      "*-susedinfo.xml.gz",
-      "*-updateinfo.xml.gz",
-      # product licenses (already confirmed)
-      "*-license-*.tar.gz",
-      # application meta data
-      "*-appdata.xml.gz",
-      "*-appdata-icons.tar.gz",
-      "appdata-ignore.xml.gz",
-      "appdata-screenshots.tar"
-    ].freeze
-
-    def self.libzypp_waterline
-      Yast::UI.TextMode ? LIBZYPP_WATERLINE_TUI : LIBZYPP_WATERLINE_GUI
-    end
-
     # Remove some files in inst-sys to have more free space if the system
     # has too low memory. If the system has enough memory keep everything in place.
     # This method might remove the kernel modules from the system, make sure
@@ -81,38 +50,10 @@ def self.make_clean
 
       # run the cleaning actions depending on the available memory
       unmount_kernel_modules if memory < KERNEL_MODULES_WATERLINE
-      cleanup_zypp_cache if memory < libzypp_waterline
     end
 
     ########################## Internal methods ################################
 
-    # Remove the libzypp downloaded repository metadata.
-    # Libzypp has "raw" and "solv" caches, the "solv" is built from "raw"
-    # but it cannot be removed because libzypp keeps the files open.
-    # The "raw" files will be later downloaded automatically again when loading
-    # the repositories. But libzypp still need some files during package
-    # installation, we can only remove the known files, @see LIBZYPP_CLEANUP_PATTERNS
-    def self.cleanup_zypp_cache
-      log.info("Cleaning unused files in the libzypp cache (#{LIBZYPP_CACHE_PATH})")
-      saved_space = 0
-
-      LIBZYPP_CLEANUP_PATTERNS.each do |p|
-        files = Dir[File.join(LIBZYPP_CACHE_PATH, "**", p)]
-        next if files.empty?
-
-        files.each do |f|
-          log.debug("Removing cache file #{f}")
-          saved_space += File.size(f)
-          # make sure we do not collide with Yast::FileUtils...
-          ::FileUtils.rm(f)
-        end
-      end
-
-      # convert to kiB
-      saved_space /= 1024
-      log.info("Libzypp cache cleanup saved #{saved_space}kiB (#{saved_space / 1024}MiB)")
-    end
-
     # Remove the kernel modules squashfs image.
     # It assumes that all needed kernel drivers are already loaded and active
     # so we can remove the files to save some space.
@@ -183,6 +124,6 @@ def self.losetup_backing_file(device)
     end
 
     private_class_method :log_space_usage, :unmount_kernel_modules,
-      :cleanup_zypp_cache, :find_device, :losetup_backing_file
+      :find_device, :losetup_backing_file
   end
 end

test/instsys_cleaner_test.rb

@@ -16,10 +16,9 @@
         allow(Yast::Execute).to receive(:locally).with("free", "-m")
         allow(File).to receive(:size).and_return(0)
         allow(Dir).to receive(:[]).and_return([])
-        allow(Yast::UI).to receive(:TextMode).and_return(true)
       end
 
-      context "a bit less than 640MB memory in text mode" do
+      context "a bit less than 640MB memory" do
         before do
           # 512MB - 1B
           expect(Yast2::HwDetection).to receive(:memory).and_return((512 << 20) - 1)
@@ -30,50 +29,11 @@
           expect(FileUtils).to_not receive(:rm)
           described_class.make_clean
         end
-
-        it "removes the known files from the libzypp cache" do
-          file = "/var/cache/zypp/raw/SLES15-15-0/repodata/1234567890abcdef-appdata.xml.gz"
-          expect(Dir).to receive(:[]).with("/var/cache/zypp/raw/**/*-appdata.xml.gz")
-            .and_return([file])
-          expect(FileUtils).to receive(:rm).with(file)
-          described_class.make_clean
-        end
-      end
-
-      context "a bit less than 1GB memory in graphical mode" do
-        before do
-          # 1GB - 1B
-          expect(Yast2::HwDetection).to receive(:memory).and_return((1 << 30) - 1)
-          allow(described_class).to receive(:unmount_kernel_modules)
-          allow(Yast::UI).to receive(:TextMode).and_return(false)
-        end
-
-        it "removes the known files from the libzypp cache" do
-          file = "/var/cache/zypp/raw/SLES15-15-0/repodata/1234567890abcdef-appdata.xml.gz"
-          expect(Dir).to receive(:[]).with("/var/cache/zypp/raw/**/*-appdata.xml.gz")
-            .and_return([file])
-          expect(FileUtils).to receive(:rm).with(file)
-          described_class.make_clean
-        end
-      end
-
-      context "a bit less than 1GB memory in text mode" do
-        before do
-          # 1GB - 1B
-          expect(Yast2::HwDetection).to receive(:memory).and_return((1 << 30) - 1)
-          allow(described_class).to receive(:unmount_kernel_modules)
-        end
-
-        fit "does not remove the libzypp cache" do
-          expect(described_class).to_not receive(:cleanup_zypp_cache)
-          described_class.make_clean
-        end
       end
 
       it "removes the kernel modules if the memory is less than 1GB" do
         # 1GB - 1B
         expect(Yast2::HwDetection).to receive(:memory).and_return((1 << 30) - 1)
-        allow(described_class).to receive(:cleanup_zypp_cache)
 
         # the order of the executed commands is important, check it explicitly
         expect(File).to receive(:exist?).with("/parts/mp_0000/lib/modules").and_return(true).ordered
@@ -91,7 +51,6 @@
         # 2GB RAM
         expect(Yast2::HwDetection).to receive(:memory).and_return(2 << 30)
 
-        expect(described_class).to_not receive(:cleanup_zypp_cache)
         expect(described_class).to_not receive(:unmount_kernel_modules)
 
         described_class.make_clean
@@ -104,7 +63,6 @@
       end
 
       it "does not do anything" do
-        expect(described_class).to_not receive(:cleanup_zypp_cache)
         expect(described_class).to_not receive(:unmount_kernel_modules)
 
         described_class.make_clean