From 3a6b468cfc1ac097255ce520fad689ce5208d7cb Mon Sep 17 00:00:00 2001 From: Adam Grare Date: Tue, 27 Feb 2018 12:01:00 -0500 Subject: [PATCH] Enhance logging around snapshot create/delete Log the snapshot ref to INFO for both create and delete https://bugzilla.redhat.com/show_bug.cgi?id=1549299 --- lib/VolumeManager/VolMgrPlatformSupportLinux.rb | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/VolumeManager/VolMgrPlatformSupportLinux.rb b/lib/VolumeManager/VolMgrPlatformSupportLinux.rb index 8e707b69..a996e007 100644 --- a/lib/VolumeManager/VolMgrPlatformSupportLinux.rb +++ b/lib/VolumeManager/VolMgrPlatformSupportLinux.rb @@ -40,25 +40,27 @@ def preMount desc = @ost.snapshotDescription ? @ost.snapshotDescription : "EVM Snapshot" st = Time.now @snMor = @vimVm.createEvmSnapshot(desc, "false", true, @ost.snapshot_create_free_space) - $log.info "VolMgrPlatformSupportLinux.preMount: VM snapshot created in [#{Time.now - st}] seconds" + $log.info "VolMgrPlatformSupportLinux.preMount: VM snapshot [#{@snMor}] created in [#{Time.now - st}] seconds" $log.debug "VolMgrPlatformSupportLinux.preMount: snMor = \"#{@snMor}\"" end def postMount - $log.debug "VolMgrPlatformSupportLinux.postMount Enter: force = #{@ost.force}, @vimVm.nil? = #{@vimVm.nil?}" + log_prefix = "VolMgrPlatformSupportLinux.postMount" + $log.debug "#{log_prefix} Enter: force = #{@ost.force}, @vimVm.nil? = #{@vimVm.nil?}" return unless @ost.force return unless @vimVm if @ost.force if !@snMor - $log.warn "VolMgrPlatformSupportLinux.postMount: VM not snapped: #{@cfgFile}" + $log.warn "#{log_prefix}: VM not snapped: #{@cfgFile}" else - $log.debug "VolMgrPlatformSupportLinux.postMount: removing snapshot snMor = \"#{@snMor}\"" + $log.debug "#{log_prefix}: removing snapshot snMor = \"#{@snMor}\"" begin @vimVm.removeSnapshot(@snMor, "false", true, @ost.snapshot_remove_free_space) + $log.info "#{log_prefix}: VM snapshot [#{@snMor}] removed" rescue => err - $log.warn "VolMgrPlatformSupportLinux.postMount: failed to remove snapshot for VM: #{@cfgFile}" - $log.warn "VolMgrPlatformSupportLinux.postMount: #{err}" + $log.warn "#{log_prefix}: failed to remove snapshot for VM: #{@cfgFile}" + $log.warn "#{log_prefix}: #{err}" end end end