* [nfsometer PATCH 1/2] cmd.py: redefine CmdErrorCode @ 2016-02-22 21:02 Scott Mayhew 2016-02-22 21:02 ` [nfsometer PATCH 2/2] trace.py: Add some more error handling to probe_mounts() Scott Mayhew 0 siblings, 1 reply; 3+ messages in thread From: Scott Mayhew @ 2016-02-22 21:02 UTC (permalink / raw) To: dros; +Cc: linux-nfs Redefine CmdErrorCode so the error code itself can be checked. Signed-off-by: Scott Mayhew <smayhew@redhat.com> --- nfsometerlib/cmd.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/nfsometerlib/cmd.py b/nfsometerlib/cmd.py index 9b6dbdd..a2ebcef 100644 --- a/nfsometerlib/cmd.py +++ b/nfsometerlib/cmd.py @@ -25,7 +25,15 @@ class CmdError(Exception): pass class CmdErrorCode(CmdError): - pass + def __init__(self, cmd, code, errstr): + self.cmd = cmd + self.code = code + self.errstr = errstr + + def __str__(self): + return str.format( + 'command "{:s}" exited with non-zero status: {:d}{:s}', + self.cmd, self.code, self.errstr) class CmdErrorOut(CmdError): pass @@ -67,8 +75,7 @@ def cmd(args, raiseerrorcode=True, raiseerrorout=True, instr='', errstr = '\n%s' % errstr if raiseerrorcode and ret != 0: - raise CmdErrorCode('command "%s" exited with non-zero status: %u%s' % - (args, ret, errstr)) + raise CmdErrorCode(args, ret, errstr) if raiseerrorout and errstr: raise CmdErrorOut('command "%s" has output to stderr: %s' % -- 2.4.3 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* [nfsometer PATCH 2/2] trace.py: Add some more error handling to probe_mounts() 2016-02-22 21:02 [nfsometer PATCH 1/2] cmd.py: redefine CmdErrorCode Scott Mayhew @ 2016-02-22 21:02 ` Scott Mayhew 2016-03-02 18:40 ` Weston Andros Adamson 0 siblings, 1 reply; 3+ messages in thread From: Scott Mayhew @ 2016-02-22 21:02 UTC (permalink / raw) To: dros; +Cc: linux-nfs An nfsometer run can fail very early into the process due to things like directory permissions, kerberos creds, and root squashing. Try to give the user some idea why the failure occurred instead of dumping a backtrace. Signed-off-by: Scott Mayhew <smayhew@redhat.com> --- nfsometerlib/trace.py | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 84 insertions(+), 1 deletion(-) diff --git a/nfsometerlib/trace.py b/nfsometerlib/trace.py index cd1d3c3..0ab9f85 100644 --- a/nfsometerlib/trace.py +++ b/nfsometerlib/trace.py @@ -20,6 +20,7 @@ import multiprocessing import signal import random import atexit +import pwd from cmd import * from config import * @@ -517,6 +518,77 @@ def probe_detect(probe_trace_dir, mountopt): return detect +def _is_auth_gss(): + lines = [ x.strip() for x in file('/proc/self/mountstats') ] + mounted_on = ' mounted on %s with ' % MOUNTDIR + start = -1 + end = -1 + + for i, line in enumerate(lines): + if line.find(mounted_on) >= 0: + assert start == -1 + start = i + elif start >= 0 and line.startswith('device '): + assert end == -1 + end = i + + if end < 0: + end = len(lines) + + if start >= 0: + lines = lines[start:end] + else: + return False + + for line in lines: + if line.startswith('sec:'): + label, data = line.split(':') + data = data.strip() + if data.startswith('flavor=6'): + return True + return False + +def _has_creds(): + return os.stat(os.path.join(RUNNING_TRACE_DIR, + 'klist_user.start')).st_size != 1 + +def _has_tkt(server): + princ = re.compile('nfs/' + server + '\S+$') + lines = [ x.strip() for x in file(os.path.join(RUNNING_TRACE_DIR, + 'klist_user.start')) ] + for i, line in enumerate(lines): + if re.search(princ, line): + return True + return False + +def _eperm_helper(opts): + server, path = opts.serverpath.split(':') + if _is_auth_gss(): + if _has_creds(): + if _has_tkt(server): + info = str.format( + ' Check {:s} on {:s} and ensure user {:s} has the correct' + ' permission.', path, server, + pwd.getpwuid(os.getuid())[0]) + else: + info = str.format( + ' No nfs service ticket for {:s} in user {:s}\'s' + ' credential cache.', server, + pwd.getpwuid(os.getuid())[0]) + else: + info = str.format( + ' User {:s} has no kerberos credentials.', + pwd.getpwuid(os.getuid())[0]) + elif os.getuid() == 0: + info = str.format( + ' Check for root squashing in the export options for {:s} on' + ' {:s}.', path, server) + else: + info = str.format( + ' Check {:s} on {:s} and ensure user {:s} has the correct' + ' permission.', path, server, pwd.getpwuid(os.getuid())[0]) + return info + # # public api commands # @@ -746,7 +818,18 @@ def probe_mounts(opts): start(m, opts.serverpath, '__nfsometer-probe', [], [], is_probe=True) fpath = os.path.join(RUNROOT, '__nfsometer-probe') - cmd('mkdir -p "%s"' % RUNROOT) + try: + cmd('mkdir -p "%s"' % RUNROOT) + except CmdErrorCode, e: + msg = str.format('"mkdir -p {:s}" failed.', RUNROOT) + # try to hint why it failed + if e.code == errno.EPERM: + msg += _eperm_helper(opts) + else: + msg += e.errstr + warn(msg) + # and bail out right now + sys.exit(1) f = file(fpath, 'w+') f.write('nfsometer probe to determine server features: %s' % m) -- 2.4.3 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [nfsometer PATCH 2/2] trace.py: Add some more error handling to probe_mounts() 2016-02-22 21:02 ` [nfsometer PATCH 2/2] trace.py: Add some more error handling to probe_mounts() Scott Mayhew @ 2016-03-02 18:40 ` Weston Andros Adamson 0 siblings, 0 replies; 3+ messages in thread From: Weston Andros Adamson @ 2016-03-02 18:40 UTC (permalink / raw) To: Scott Mayhew; +Cc: linux-nfs list These look good, thanks! I’ll merge and cut a new release soon. -dros > On Feb 22, 2016, at 4:02 PM, Scott Mayhew <smayhew@redhat.com> wrote: > > An nfsometer run can fail very early into the process due to things like > directory permissions, kerberos creds, and root squashing. Try to give > the user some idea why the failure occurred instead of dumping a > backtrace. > > Signed-off-by: Scott Mayhew <smayhew@redhat.com> > --- > nfsometerlib/trace.py | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 84 insertions(+), 1 deletion(-) > > diff --git a/nfsometerlib/trace.py b/nfsometerlib/trace.py > index cd1d3c3..0ab9f85 100644 > --- a/nfsometerlib/trace.py > +++ b/nfsometerlib/trace.py > @@ -20,6 +20,7 @@ import multiprocessing > import signal > import random > import atexit > +import pwd > > from cmd import * > from config import * > @@ -517,6 +518,77 @@ def probe_detect(probe_trace_dir, mountopt): > > return detect > > +def _is_auth_gss(): > + lines = [ x.strip() for x in file('/proc/self/mountstats') ] > + mounted_on = ' mounted on %s with ' % MOUNTDIR > + start = -1 > + end = -1 > + > + for i, line in enumerate(lines): > + if line.find(mounted_on) >= 0: > + assert start == -1 > + start = i > + elif start >= 0 and line.startswith('device '): > + assert end == -1 > + end = i > + > + if end < 0: > + end = len(lines) > + > + if start >= 0: > + lines = lines[start:end] > + else: > + return False > + > + for line in lines: > + if line.startswith('sec:'): > + label, data = line.split(':') > + data = data.strip() > + if data.startswith('flavor=6'): > + return True > + return False > + > +def _has_creds(): > + return os.stat(os.path.join(RUNNING_TRACE_DIR, > + 'klist_user.start')).st_size != 1 > + > +def _has_tkt(server): > + princ = re.compile('nfs/' + server + '\S+$') > + lines = [ x.strip() for x in file(os.path.join(RUNNING_TRACE_DIR, > + 'klist_user.start')) ] > + for i, line in enumerate(lines): > + if re.search(princ, line): > + return True > + return False > + > +def _eperm_helper(opts): > + server, path = opts.serverpath.split(':') > + if _is_auth_gss(): > + if _has_creds(): > + if _has_tkt(server): > + info = str.format( > + ' Check {:s} on {:s} and ensure user {:s} has the correct' > + ' permission.', path, server, > + pwd.getpwuid(os.getuid())[0]) > + else: > + info = str.format( > + ' No nfs service ticket for {:s} in user {:s}\'s' > + ' credential cache.', server, > + pwd.getpwuid(os.getuid())[0]) > + else: > + info = str.format( > + ' User {:s} has no kerberos credentials.', > + pwd.getpwuid(os.getuid())[0]) > + elif os.getuid() == 0: > + info = str.format( > + ' Check for root squashing in the export options for {:s} on' > + ' {:s}.', path, server) > + else: > + info = str.format( > + ' Check {:s} on {:s} and ensure user {:s} has the correct' > + ' permission.', path, server, pwd.getpwuid(os.getuid())[0]) > + return info > + > # > # public api commands > # > @@ -746,7 +818,18 @@ def probe_mounts(opts): > start(m, opts.serverpath, '__nfsometer-probe', [], [], is_probe=True) > fpath = os.path.join(RUNROOT, '__nfsometer-probe') > > - cmd('mkdir -p "%s"' % RUNROOT) > + try: > + cmd('mkdir -p "%s"' % RUNROOT) > + except CmdErrorCode, e: > + msg = str.format('"mkdir -p {:s}" failed.', RUNROOT) > + # try to hint why it failed > + if e.code == errno.EPERM: > + msg += _eperm_helper(opts) > + else: > + msg += e.errstr > + warn(msg) > + # and bail out right now > + sys.exit(1) > > f = file(fpath, 'w+') > f.write('nfsometer probe to determine server features: %s' % m) > -- > 2.4.3 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-nfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-03-02 18:40 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-02-22 21:02 [nfsometer PATCH 1/2] cmd.py: redefine CmdErrorCode Scott Mayhew 2016-02-22 21:02 ` [nfsometer PATCH 2/2] trace.py: Add some more error handling to probe_mounts() Scott Mayhew 2016-03-02 18:40 ` Weston Andros Adamson
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).