diff options
| author | astokes <astokes@ef72aa8b-4018-0410-8976-d6e080ef94d8> | 2010-07-21 18:56:48 +0000 |
|---|---|---|
| committer | astokes <astokes@ef72aa8b-4018-0410-8976-d6e080ef94d8> | 2010-07-21 18:56:48 +0000 |
| commit | bb7d614a2e2e4d770573c2c1fcc86ed44eeaf758 (patch) | |
| tree | d380e58cdd738083fb008690047f12a8e8c620a0 | |
| parent | 605183b61440b573693963774d3f0fe91b0056bd (diff) | |
| download | sos-bb7d614a2e2e4d770573c2c1fcc86ed44eeaf758.tar.gz | |
perhaps fix cluster diagnostic?
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@976 ef72aa8b-4018-0410-8976-d6e080ef94d8
| -rw-r--r-- | sos/plugins/cluster.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sos/plugins/cluster.py b/sos/plugins/cluster.py index e60ccf92..7c964802 100644 --- a/sos/plugins/cluster.py +++ b/sos/plugins/cluster.py @@ -34,7 +34,8 @@ class cluster(sos.plugintools.PluginBase): "gfs-utils", "gnbd", "kmod-gfs", "kmod-gnbd", "lvm2-cluster", "gfs2-utils" ] elif rhelver == 6: - self.packages = [ "luci", "ricci" ] + self.packages = [ "ricci", "corosync", "fenced", + "dlm_controld", "gfs_controld" ] self.files = [ "/etc/cluster/cluster.conf" ] return sos.plugintools.PluginBase.checkenabled(self) @@ -69,6 +70,10 @@ class cluster(sos.plugintools.PluginBase): serv_check.extend( [ "cman", "rgmanager" ] ) if self.has_gfs(): serv_check.extend( ["gfs", "clvmd"] ) + elif rhelver == 6: + serv_check.extend( [ "fenced", "corosync", "dlm_controld"] ) + if self.has_gfs(): + serv_check.extend( ["gfs_controld"] ) # check that kernel module packages are installed for # running kernel version @@ -156,7 +161,8 @@ class cluster(sos.plugintools.PluginBase): self.addDiagnose("one or more nodes have manual fencing agent configured (data integrity is not guaranteed)") # if fence_ilo or fence_drac, make sure acpid is not running - ret, hostname, time = self.callExtProg("/bin/uname -n").split(".")[0] + ret, hostname, time = self.callExtProg("/bin/uname -n") + hostname = hostname.split(".")[0] if len(xpathContext.xpathEval('/cluster/clusternodes/clusternode[@name = "%s" and /cluster/fencedevices/fencedevice[@agent="fence_rsa" or @agent="fence_drac"]/@name=fence/method/device/@name]' % hostname )): ret, out, time = self.callExtProg("/sbin/service acpid status") if ret == 0 or self.policy().runlevelDefault() in self.policy().runlevelByService("acpid"): |