CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: [EMAIL PROTECTED] 2007-07-26 21:03:42
Modified files:
luci/site/luci/Extensions: LuciClusterInfo.py
Log message:
Fix for an exception thrown as a result of hitting the condition
described in bz249715: ccsd not picking up new cluster.conf when adding a
cluster node
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/LuciClusterInfo.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.4.4&r2=1.1.4.5
--- conga/luci/site/luci/Extensions/LuciClusterInfo.py 2007/07/26 05:52:54
1.1.4.4
+++ conga/luci/site/luci/Extensions/LuciClusterInfo.py 2007/07/26 21:03:42
1.1.4.5
@@ -817,22 +817,19 @@
found = False
for item in status:
if (item['type'] == 'node') and (item['name'] == nodename):
+ if item['online'] == 'false':
+ nodestate = NODE_UNKNOWN
+ elif item['clustered'] == 'true':
+ nodestate = NODE_ACTIVE
+ else:
+ nodestate = NODE_INACTIVE
found = True
break
if found is False:
- item = {}
if LUCI_DEBUG_MODE is True:
- luci_log.debug_verbose('getNodeInfo1: Unable to resolve
node name in cluster status')
- return item
-
- # Now determine state of node...
- if item['online'] == 'false':
+ luci_log.debug_verbose('getNodeInfo1: Unable to find
node "%s" in cluster status' % nodename)
nodestate = NODE_UNKNOWN
- elif item['clustered'] == 'true':
- nodestate = NODE_ACTIVE
- else:
- nodestate = NODE_INACTIVE
infohash['nodestate'] = nodestate
infohash['nodename'] = nodename
@@ -899,12 +896,10 @@
infohash['fdoms'] = fdom_dict_list
- # return infohash
infohash['d_states'] = None
-
nodename_resolved = resolve_nodename(self, clustername, nodename)
+
if nodestate == NODE_ACTIVE or nodestate == NODE_INACTIVE:
- # call service module on node and find out which daemons are running
try:
rc = RicciCommunicator(nodename_resolved)
if not rc:
@@ -916,6 +911,7 @@
% (nodename_resolved, str(e)))
if rc is not None:
+ # call service module on node and find out which
daemons are running
dlist = list()
dlist.append('ccsd')
if not gulm_cluster:
