[Gug-cvs] gug/gug/service/jc/lrms cm.py,1.17,1.18

[Roczei G. <ro...@us...>]

Update of /cvsroot/gug/gug/gug/service/jc/lrms
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv6886

Modified Files:
	cm.py 
Log Message:
bugfix


Index: cm.py
===================================================================
RCS file: /cvsroot/gug/gug/gug/service/jc/lrms/cm.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** cm.py	30 Apr 2007 20:24:01 -0000	1.17
--- cm.py	13 May 2007 21:55:36 -0000	1.18
***************
*** 7,11 ****
  from gug.common.ogsa_bes import *
  from gug.common.share import mkuid, import_class_from_string, gis_proxy, create_provision_task
! from gug.host.timed import Task  
  import os
  
--- 7,12 ----
  from gug.common.ogsa_bes import *
  from gug.common.share import mkuid, import_class_from_string, gis_proxy, create_provision_task
! from gug.host.timed import Task
! import time
  import os
  
***************
*** 38,42 ****
      def reject(self, jsdl_doc, new_jobs = 0):
          if self.cm is None:
!             print 'i have no Cluster Manager, rejection'
              return True
          free_cpu = int(dict(self.cm.info())['sum']['free_cpu'])
--- 39,43 ----
      def reject(self, jsdl_doc, new_jobs = 0):
          if self.cm is None:
!             print 'I have not any Cluster Managers, rejection'
              return True
          free_cpu = int(dict(self.cm.info())['sum']['free_cpu'])
***************
*** 78,87 ****
          
      def status(self, lrms_id):
!         st = self.cm.status([lrms_id])[0]
          ret = {'grid_id' : st[0], 'status' : st[1]['status'], 'error_message' : st[1]['error_message']}
          print ret
          return ret
  
- 
      def get_ce_data(self):
          if self.cm is None:
--- 79,94 ----
          
      def status(self, lrms_id):
!         while True:
!             try:
!                 st = self.cm.status([lrms_id])[0]
!                 break
!             except:
!                 time.sleep(1)
!                 continue
! 
          ret = {'grid_id' : st[0], 'status' : st[1]['status'], 'error_message' : st[1]['error_message']}
          print ret
          return ret
  
      def get_ce_data(self):
          if self.cm is None: