[Cluster-devel] conga/luci/site/luci/Extensions cluster_adapte ...

[rmccabe at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2006-11-09 22:30:39

Modified files:
	luci/site/luci/Extensions: cluster_adapters.py 

Log message:
	fix for a bug in the busy wait that's hit when a node we're waiting for becomes unreachable

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/cluster_adapters.py.diff?cvsroot=cluster&r1=1.157&r2=1.158

--- conga/luci/site/luci/Extensions/cluster_adapters.py	2006/11/09 20:32:02	1.157
+++ conga/luci/site/luci/Extensions/cluster_adapters.py	2006/11/09 22:30:39	1.158
@@ -3420,20 +3420,17 @@
         rc = RicciCommunicator(ricci[0])
         if not rc:
           rc = None
-          raise RicciError, 'rc is None for %s' % ricci[0]
-      except RicciError, e:
+          luci_log.debug_verbose('ICB6b: rc is none')
+      except Exception, e:
         rc = None
         luci_log.debug_verbose('ICB7: ricci returned error in iCB for %s: %s' \
           % (cluname, str(e)))
-      except:
-        rc = None
-        luci_log.info('ICB8: ricci connection failed for cluster %s' % cluname)
 
       batch_id = None
       if rc is not None:
         try:
           batch_id = item[1].getProperty(BATCH_ID)
-          luci_log.debug_verbose('ICB8A: got batch_id %s from %s' \
+          luci_log.debug_verbose('ICB8: got batch_id %s from %s' \
               % (batch_id, item[0]))
         except Exception, e:
           try:
@@ -3545,8 +3542,18 @@
       node_report = {}
       node_report['isnodecreation'] = False
       ricci = item[0].split("____") #This removes the 'flag' suffix
-      rc = RicciCommunicator(ricci[0])
-      finished = checkBatch(rc, item[1].getProperty(BATCH_ID))
+
+      try:
+        rc = RicciCommunicator(ricci[0])
+      except Exception, e:
+        rc = None
+        finished = False
+        luci_log.debug_verbose('ICB15: ricci error: %s: %s' \
+          % (ricci[0], str(e)))
+
+      if rc is not None:
+        finished = checkBatch(rc, item[1].getProperty(BATCH_ID))
+
       if finished == True:
         flag_desc = item[1].getProperty(FLAG_DESC)
         if flag_desc is None: