mirror of
git://sourceware.org/git/lvm2.git
synced 2024-12-21 13:34:40 +03:00
lvmdbusd: Instruct lvm to output debug to file for fullreport
Historically we have seen a few different errors which occur when we call fullreport. Failing exit code and JSON which is missing one or more keys. Instruct lvm to dump the debug to a file during fullreport calls when we fork & exec lvm. If we encounter an error, ouput the debug data. The reason this isn't being done when lvmshell is used is because we don't have an easy way to test the error paths. This change is complicated by the following: 1. We don't know if fullreport was good until we evaluate all the JSON. This is done a bit after we have called into lvm and returned. 2. We don't want to orphan the debug file used by lvm if the daemon is killed. Thus we try to minimize the window where the debug file hasn't already been unlinked. A RFE to pass an open FD to lvm for this purpose is outstanding. The temp. file is: -rw------. 1 root root /tmp/lvmdbusd.lvm.debug.XXXXXXXX.log
This commit is contained in:
parent
d42bdb07de
commit
85fcbfd9d7
@ -109,3 +109,7 @@ def exit_daemon():
|
||||
if run and loop:
|
||||
run.value = 0
|
||||
loop.quit()
|
||||
|
||||
|
||||
# Debug data for lvm
|
||||
lvmdebug = None
|
||||
|
@ -17,7 +17,7 @@ import os
|
||||
|
||||
from lvmdbusd import cfg
|
||||
from lvmdbusd.utils import pv_dest_ranges, log_debug, log_error, add_no_notify,\
|
||||
make_non_block, read_decoded, extract_stack_trace, LvmBug
|
||||
make_non_block, read_decoded, extract_stack_trace, LvmBug, add_config_option
|
||||
from lvmdbusd.lvm_shell_proxy import LVMShellProxy
|
||||
|
||||
try:
|
||||
@ -121,6 +121,12 @@ def call_lvm(command, debug=False, line_cb=None,
|
||||
command.insert(0, cfg.LVM_CMD)
|
||||
command = add_no_notify(command)
|
||||
|
||||
# If we are running the fullreport command, we will ask lvm to output the debug
|
||||
# data, so we can have the required information for lvm to debug the fullreport failures.
|
||||
if "fullreport" in command:
|
||||
fn = cfg.lvmdebug.setup()
|
||||
add_config_option(command, "--config", "log {level=7 file=%s syslog=0}" % fn)
|
||||
|
||||
process = Popen(command, stdout=PIPE, stderr=PIPE, close_fds=True,
|
||||
env=os.environ)
|
||||
|
||||
@ -163,6 +169,7 @@ def call_lvm(command, debug=False, line_cb=None,
|
||||
break
|
||||
|
||||
if process.returncode is not None:
|
||||
cfg.lvmdebug.lvm_complete()
|
||||
if debug or (process.returncode != 0 and (process.returncode != 5 and "fullreport" in command)):
|
||||
_debug_c(command, process.returncode, (stdout_text, stderr_text))
|
||||
|
||||
|
@ -171,6 +171,7 @@ class StateUpdate(object):
|
||||
cfg.exit_daemon()
|
||||
else:
|
||||
# Slow things down when encountering errors
|
||||
cfg.lvmdebug.complete()
|
||||
time.sleep(1)
|
||||
|
||||
while cfg.run.value != 0:
|
||||
@ -205,11 +206,16 @@ class StateUpdate(object):
|
||||
except SystemExit:
|
||||
break
|
||||
except LvmBug as bug:
|
||||
# If a lvm bug occurred, we will dump the lvm debug data if
|
||||
# we have it.
|
||||
cfg.lvmdebug.dump()
|
||||
log_error(str(bug))
|
||||
_handle_error()
|
||||
except Exception as e:
|
||||
log_error("update_thread: \n%s" % extract_stack_trace(e))
|
||||
_handle_error()
|
||||
finally:
|
||||
cfg.lvmdebug.complete()
|
||||
|
||||
# Make sure to unblock any that may be waiting before we exit this thread
|
||||
# otherwise they hang forever ...
|
||||
|
@ -138,6 +138,10 @@ def main():
|
||||
os.environ["LC_ALL"] = "C"
|
||||
os.environ["LVM_COMMAND_PROFILE"] = "lvmdbusd"
|
||||
|
||||
# Save off the debug data needed for lvm team to debug issues
|
||||
# only used for 'fullreport' at this time.
|
||||
cfg.lvmdebug = utils.LvmDebugData()
|
||||
|
||||
# Add simple command line handling
|
||||
cfg.args = process_args()
|
||||
|
||||
|
@ -18,6 +18,7 @@ import os
|
||||
import stat
|
||||
import string
|
||||
import datetime
|
||||
import tempfile
|
||||
|
||||
import dbus
|
||||
from lvmdbusd import cfg
|
||||
@ -614,6 +615,23 @@ def validate_tag(interface, tag):
|
||||
% (tag, _ALLOWABLE_TAG_CH))
|
||||
|
||||
|
||||
def add_config_option(cmdline, key, value):
|
||||
if 'help' in cmdline:
|
||||
return cmdline
|
||||
|
||||
if key in cmdline:
|
||||
for i, arg in enumerate(cmdline):
|
||||
if arg == key:
|
||||
if len(cmdline) <= i + 1:
|
||||
raise dbus.exceptions.DBusException("Missing value for --config option.")
|
||||
cmdline[i + 1] += " %s" % value
|
||||
break
|
||||
else:
|
||||
cmdline.extend([key, value])
|
||||
|
||||
return cmdline
|
||||
|
||||
|
||||
def add_no_notify(cmdline):
|
||||
"""
|
||||
Given a command line to execute we will see if `--config` is present, if it
|
||||
@ -627,20 +645,11 @@ def add_no_notify(cmdline):
|
||||
|
||||
# Only after we have seen an external event will we disable lvm from sending
|
||||
# us one when we call lvm
|
||||
rv = cmdline
|
||||
if cfg.got_external_event:
|
||||
if 'help' in cmdline:
|
||||
return cmdline
|
||||
rv = add_config_option(rv, "--config", "global/notify_dbus=0")
|
||||
|
||||
if '--config' in cmdline:
|
||||
for i, arg in enumerate(cmdline):
|
||||
if arg == '--config':
|
||||
if len(cmdline) <= i+1:
|
||||
raise dbus.exceptions.DBusException("Missing value for --config option.")
|
||||
cmdline[i+1] += " global/notify_dbus=0"
|
||||
break
|
||||
else:
|
||||
cmdline.extend(['--config', 'global/notify_dbus=0'])
|
||||
return cmdline
|
||||
return rv
|
||||
|
||||
|
||||
# The methods below which start with mt_* are used to execute the desired code
|
||||
@ -777,3 +786,46 @@ class LvmBug(RuntimeError):
|
||||
|
||||
def __str__(self):
|
||||
return "lvm bug encountered: %s" % ' '.join(self.args)
|
||||
|
||||
|
||||
class LvmDebugData:
|
||||
def __init__(self):
|
||||
self.fd = -1
|
||||
self.fn = None
|
||||
|
||||
def _remove_file(self):
|
||||
if self.fn is not None:
|
||||
os.unlink(self.fn)
|
||||
self.fn = None
|
||||
|
||||
def _close_fd(self):
|
||||
if self.fd != -1:
|
||||
os.close(self.fd)
|
||||
self.fd = -1
|
||||
|
||||
def setup(self):
|
||||
# Create a secure filename
|
||||
self.fd, self.fn = tempfile.mkstemp(suffix=".log", prefix="lvmdbusd.lvm.debug.")
|
||||
return self.fn
|
||||
|
||||
def lvm_complete(self):
|
||||
# Remove the file ASAP, so we decrease our odds of leaving it
|
||||
# around if the daemon gets killed by a signal -9
|
||||
self._remove_file()
|
||||
|
||||
def dump(self):
|
||||
# Read the file and log it to log_err
|
||||
if self.fd != -1:
|
||||
# How big could the verbose debug get?
|
||||
debug = os.read(self.fd, 1024*1024*5)
|
||||
debug_txt = debug.decode("utf-8")
|
||||
for line in debug_txt.split("\n"):
|
||||
log_error("lvm debug >>> %s" % line)
|
||||
self._close_fd()
|
||||
# In case lvm_complete doesn't get called.
|
||||
self._remove_file()
|
||||
|
||||
def complete(self):
|
||||
self._close_fd()
|
||||
# In case lvm_complete doesn't get called.
|
||||
self._remove_file()
|
||||
|
Loading…
Reference in New Issue
Block a user