diff options
| author | pcarrier <pcarrier@ef72aa8b-4018-0410-8976-d6e080ef94d8> | 2010-11-27 16:48:07 +0000 |
|---|---|---|
| committer | pcarrier <pcarrier@ef72aa8b-4018-0410-8976-d6e080ef94d8> | 2010-11-27 16:48:07 +0000 |
| commit | 3cc003d16e43a267b89a419a3fcfe76863f6511f (patch) | |
| tree | 3791555d7f7edf929f1d2e99a92ee53293c9061e | |
| parent | 383863ef10bc46d5ddc7ca3a943861d9f5624ce2 (diff) | |
| download | sos-3cc003d16e43a267b89a419a3fcfe76863f6511f.tar.gz | |
WIP: moving towards a cluster module compatible with RHEL6
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@1031 ef72aa8b-4018-0410-8976-d6e080ef94d8
| -rw-r--r-- | sos/plugins/cluster.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sos/plugins/cluster.py b/sos/plugins/cluster.py index b9c8145b..26a127aa 100644 --- a/sos/plugins/cluster.py +++ b/sos/plugins/cluster.py @@ -255,7 +255,7 @@ class cluster(sos.plugintools.PluginBase): if self.getOption('lockdump'): self.do_lockdump() def do_lockdump(self): - status, output, time= self.callExtProg("cman_tool services") + status, output, time = self.callExtProg("cman_tool services") if status: # command somehow failed return False @@ -267,10 +267,11 @@ class cluster(sos.plugintools.PluginBase): elif rhelver == 5: regex = r'^dlm\s+[^\s]+\s+([^\s]+)\s.*$' - reg=re.compile(regex,re.MULTILINE) + reg=re.compile(regex, re.MULTILINE) for lockspace in reg.findall(output): - ret, out, time = self.callExtProg("echo %s > /proc/cluster/dlm_locks" % lockspace) - self.collectOutputNow("cat /proc/cluster/dlm_locks", root_symlink = "dlm_locks_%s" % lockspace) + ret, out, time = self.callExtProg("echo %s > /proc/cluster/dlm_locks" % lockspace) + self.collectOutputNow("cat /proc/cluster/dlm_locks", + suggest_filename = "dlm_locks_%s" % lockspace) def get_locking_proto(self): # FIXME: what's the best way to find out ? @@ -279,7 +280,8 @@ class cluster(sos.plugintools.PluginBase): def do_gfslockdump(self): for mntpoint in self.doRegexFindAll(r'^\S+\s+([^\s]+)\s+gfs\s+.*$', "/proc/mounts"): - self.collectExtOutput("/sbin/gfs_tool lockdump %s" % mntpoint, root_symlink = "gfs_lockdump_" + self.mangleCommand(mntpoint) ) + self.collectExtOutput("/sbin/gfs_tool lockdump %s" % mntpoint, + suggest_filename = "gfs_lockdump_" + self.mangleCommand(mntpoint)) def do_rgmanager_bt(self): # FIXME: threads backtrace via SIGALRM |