[Gug-cvs] gug/gug/service/jc/lrms condor.py, 1.16, 1.17 fork.py, 1.37, 1.38 cm.py, 1.18, 1.19

[Adrian T. <cs...@us...>]

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

Modified Files:
	condor.py fork.py cm.py 
Log Message:
Adding Decision Maker module
It is Integrated into the following services: Sched, CM, StM

Index: condor.py
===================================================================
RCS file: /cvsroot/gug/gug/gug/service/jc/lrms/condor.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** condor.py	31 Jan 2007 13:27:41 -0000	1.16
--- condor.py	27 Sep 2007 10:36:05 -0000	1.17
***************
*** 189,193 ****
          return False
  
!     def get_ce_data(self):
          allinfo = sysinfo.all_info()
          operating_system = allinfo['os']
--- 189,193 ----
          return False
  
!     def get_ce_data(self, new_jobs = 0):
          allinfo = sysinfo.all_info()
          operating_system = allinfo['os']
***************
*** 218,224 ****
              <OwnedCpuNum>%s</OwnedCpuNum>
              <JobNum>%s</JobNum>
          </ComputingElement>
          """ %  (operating_system, arch, cpunum, running_job, free_cpu_num, \
!                 owned_cpu_num, jobnum)
  
  if __name__ == '__main__':
--- 218,225 ----
              <OwnedCpuNum>%s</OwnedCpuNum>
              <JobNum>%s</JobNum>
+             <NewJobNumber>%s</NewJobNumber>
          </ComputingElement>
          """ %  (operating_system, arch, cpunum, running_job, free_cpu_num, \
!                 owned_cpu_num, jobnum, new_jobs)
  
  if __name__ == '__main__':

Index: fork.py
===================================================================
RCS file: /cvsroot/gug/gug/gug/service/jc/lrms/fork.py,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** fork.py	14 Mar 2007 06:41:55 -0000	1.37
--- fork.py	27 Sep 2007 10:36:05 -0000	1.38
***************
*** 85,89 ****
          return False
  
!     def get_ce_data(self):
          if self.exec_proxy is None:
              return ''
--- 85,89 ----
          return False
  
!     def get_ce_data(self, new_jobs = 0):
          if self.exec_proxy is None:
              return ''
***************
*** 91,94 ****
--- 91,95 ----
          self.ce_os = ce_data['os']
          self.ce_arch = ce_data['cpu_arch']
+         ce_data['new_jobs'] = new_jobs
          return """<ComputingElement>
                  <LRMSType>Fork</LRMSType>
***************
*** 102,105 ****
--- 103,107 ----
                  <LoadAvg>%(load_avg)s</LoadAvg>
                  <RunningJob>%(running_jobs)s</RunningJob>
+                 <NewJobNumber>%(new_jobs)s</NewJobNumber>
                  <FreeCpuNum>%(free_cpu)s</FreeCpuNum>
                  <OwnedCpuNum>%(owned_cpu)s</OwnedCpuNum>

Index: cm.py
===================================================================
RCS file: /cvsroot/gug/gug/gug/service/jc/lrms/cm.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** cm.py	13 May 2007 21:55:36 -0000	1.18
--- cm.py	27 Sep 2007 10:36:05 -0000	1.19
***************
*** 83,89 ****
                  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']}
--- 83,89 ----
                  st = self.cm.status([lrms_id])[0]
                  break
!             except Exception, error:
                  time.sleep(1)
!                 continue              
  
          ret = {'grid_id' : st[0], 'status' : st[1]['status'], 'error_message' : st[1]['error_message']}
***************
*** 91,95 ****
          return ret
  
!     def get_ce_data(self):
          if self.cm is None:
              return ''
--- 91,95 ----
          return ret
  
!     def get_ce_data(self, new_jobs = 0):
          if self.cm is None:
              return ''
***************
*** 114,117 ****
--- 114,119 ----
                  xml += "   <FreeCpuNum>%s" % item[1]['free_cpu']
                  xml += "</FreeCpuNum>\n"
+                 xml += "   <NewJobNumber>%s" % new_jobs
+                 xml += "</NewJobNumber>"
              else:
                  xml += "<ExecStatus>\n"