aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorastokes <astokes@ef72aa8b-4018-0410-8976-d6e080ef94d8>2010-05-19 15:16:16 +0000
committerastokes <astokes@ef72aa8b-4018-0410-8976-d6e080ef94d8>2010-05-19 15:16:16 +0000
commitd8896689ae4ee0add4e364177ee8f206d67a923f (patch)
tree23ad19004fddc8335c8fe634ec917962d53bb32d
parent80ccc800d1ef7ce4cf3b9199b390b8fbcd9c024d (diff)
downloadsos-d8896689ae4ee0add4e364177ee8f206d67a923f.tar.gz
moved corosync data from cluster into corosync plugin
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@961 ef72aa8b-4018-0410-8976-d6e080ef94d8
-rw-r--r--sos/plugins/cluster.py12
-rw-r--r--sos/plugins/openais.py31
2 files changed, 0 insertions, 43 deletions
diff --git a/sos/plugins/cluster.py b/sos/plugins/cluster.py
index 2a181eff..67fa9dfd 100644
--- a/sos/plugins/cluster.py
+++ b/sos/plugins/cluster.py
@@ -20,7 +20,6 @@ import glob
class cluster(sos.plugintools.PluginBase):
"""cluster suite and GFS related information
"""
-
optionList = [("gfslockdump", 'gather output of gfs lockdumps', 'slow', False),
('lockdump', 'gather dlm lockdumps', 'slow', False)]
@@ -43,11 +42,6 @@ class cluster(sos.plugintools.PluginBase):
def has_gfs(self):
return (len(self.doRegexFindAll(r'^\S+\s+\S+\s+gfs\s+.*$', "/etc/mtab")) > 0)
- def sig_corosync_pid(self, name="corosync"):
- stat, out, run = self.callExtProg("pidof %s" % (name,))
- if stat == 0:
- self.callExtProg("kill -s 12 %s" % (out.strip(),))
-
def diagnose(self):
rhelver = self.policy().rhelVersion()
@@ -236,10 +230,6 @@ class cluster(sos.plugintools.PluginBase):
self.collectExtOutput("cman_tool -a nodes")
self.collectOutputNow("group_tool ls -g1")
self.collectOutputNow("group_tool dump")
- self.collectExtOutput("corosync-quorumtool -l")
- self.collectExtOutput("corosync-quorumtool -s")
- self.collectExtOutput("corosync-cpgtool")
- self.collectExtOutput("corosync-objctl -a")
self.collectExtOutput("ccs_tool lsnode")
self.collectExtOutput("fence_tool ls -n")
self.collectExtOutput("dlm_tool ls -n")
@@ -248,8 +238,6 @@ class cluster(sos.plugintools.PluginBase):
self.collectExtOutput("dlm_tool dump", root_symlink="dlm_controld.txt")
self.collectExtOutput("gfs_control dump", root_symlink="gfs_controld.txt")
self.collectExtOutput("dlm_tool log_plock", root_symlink="log_plock.txt")
- # Signal corosync to capture diagnostic data to corosync.log
- self.sig_corosync_pid()
self.addCopySpec("/var/log/cluster")
self.collectExtOutput("clustat")
diff --git a/sos/plugins/openais.py b/sos/plugins/openais.py
deleted file mode 100644
index 1d0f08bc..00000000
--- a/sos/plugins/openais.py
+++ /dev/null
@@ -1,31 +0,0 @@
-### This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-import sos.plugintools
-import os
-
-class openais(sos.plugintools.PluginBase):
- """openais related information
- """
- def checkenabled(self):
- if self.isInstalled("openais"):
- ret, openais_ver, rtime = self.callExtProg("rpm -q --queryformat='%{VERSION}' openais")
- v, r, m = openais_ver.split('.')
- if int(r) >= 80 and int(m) >= 6:
- return True
- return False
-
- def setup(self):
- self.addCopySpec("/etc/corosync")
- return