Attachment 888095 Details for Bug 1076833 – Patch to fix this bug on top of previous patch. Move 'stat' and 'chmod' to the very end after all extraction and makedumpfile processing. Fix bug introduced where if makedumpfile ran it would always report 'saved 0 bytes' when it may have saved signfica

Patch to fix this bug on top of previous patch. Move 'stat' and 'chmod' to the very end after all extraction and makedumpfile processing. Fix bug introduced where if makedumpfile ran it would always report 'saved 0 bytes' when it may have saved signfica

0001-Move-stat-and-chmod-after-all-vmcore-extraction-and-.patch (text/plain), 2.88 KB, created by Dave Wysochanski on 2014-04-21 13:51:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dave Wysochanski

Created: 2014-04-21 13:51:11 UTC

Size: 2.88 KB

patch

obsolete

>From 70308c12e4aade9e8f301a6367a040af60b865cd Mon Sep 17 00:00:00 2001
>From: Dave Wysochanski <dwysocha@redhat.com>
>Date: Mon, 21 Apr 2014 08:15:30 -0400
>Subject: [PATCH] Move stat and chmod after all vmcore extraction and stripping is done.
>
>The previous attempt at fixing the following bug was incorrect:
>https://bugzilla.redhat.com/show_bug.cgi?id=1076833
>
>Move the stat and chmod to the very end, after all vmcore extraction
>and stripping (makedumpfile) processing is done.  The previous patch
>did not catch the case where makedumpfile was run, and also messed
>up the log message which calculated the space saved by makedumpfile
>(it always said "Makedumpfile ... saved 0 bytes" after the last change).
>
>Moving the stat and the chmod to the very end of all processing is
>where it should be.
>Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1076833
>
>Signed-off-by: Dave Wysochanski <dwysocha@redhat.com>
>---
> src/lib/retrace.py |   19 ++++++++++---------
> 1 files changed, 10 insertions(+), 9 deletions(-)
>
>diff --git a/src/lib/retrace.py b/src/lib/retrace.py
>index 2908ac0..a96aa01 100644
>--- a/src/lib/retrace.py
>+++ b/src/lib/retrace.py
>@@ -1744,15 +1744,6 @@ class RetraceTask:
>                 else:
>                     log_debug("Vmcore dump level is %d" % dump_level)
> 
>-                st = os.stat(vmcore)
>-                if (st.st_mode & stat.S_IRGRP) == 0:
>-                    try:
>-                        os.chmod(vmcore, st.st_mode | stat.S_IRGRP)
>-                    except Exception as ex:
>-                        log_warn("File '%s' is not group readable and chmod"
>-                                 " failed. The process will continue but if"
>-                                 " it fails this is the likely cause."
>-                                 % vmcore)
>                 skip_makedumpfile = CONFIG["VmcoreDumpLevel"] <= 0 or CONFIG["VmcoreDumpLevel"] >= 32
>                 if (dump_level is not None and
>                     (dump_level & CONFIG["VmcoreDumpLevel"]) == CONFIG["VmcoreDumpLevel"]):
>@@ -1765,6 +1756,16 @@ class RetraceTask:
>                     strip_vmcore(vmcore, kernelver)
>                     dur = int(time.time() - start)
> 
>+                st = os.stat(vmcore)
>+                if (st.st_mode & stat.S_IRGRP) == 0:
>+                    try:
>+                        os.chmod(vmcore, st.st_mode | stat.S_IRGRP)
>+                    except Exception as ex:
>+                        log_warn("File '%s' is not group readable and chmod"
>+                                 " failed. The process will continue but if"
>+                                 " it fails this is the likely cause."
>+                                 % vmcore)
>+                if not skip_makedumpfile:
>                     log_info("Stripped size: %s" % human_readable_size(st.st_size))
>                     log_info("Makedumpfile took %d seconds and saved %s" % (dur, human_readable_size(oldsize - st.st_size)))
> 
>-- 
>1.7.1
>

Actions: View

Attachments on bug 1076833: 875615 | 888095