implement maxproc for each host

git-svn-id: https://svn.stsci.edu/svn/ssb/etal/steuermann/trunk@422 d34015c8-bcbb-4646-8ac8-8ba5febf221d

1 files changed, 53 insertions, 7 deletions

diff --git a/steuermann/run.py b/steuermann/run.py
index 1379120..cb2af58 100644
--- a/steuermann/run.py
+++ b/steuermann/run.py
@@ -34,6 +34,9 @@ class runner(object):
     # 
     host_info_cache = None
 
+    # dict of how many commands we have running for that machine
+    howmany = None
+
     #####
     #
 
@@ -43,16 +46,12 @@ class runner(object):
         self.load_host_info()
         self.logdir = logdir
         self.host_info_cache = { }
+        self.howmany = { }
 
     #####
     # start a process
 
     def run( self, node, run_name ):
-        if debug :
-            print "run",node.name
-        node.running = 1
-        if debug :
-            print "....%s:%s/%s\n"%(node.host, node.table, node.cmd)
 
         try :
             args = self.get_host_info(node.host)
@@ -60,6 +59,26 @@ class runner(object):
             print "ERROR: do not know how to run on %s"%node.host
             raise
 
+        if 'maxproc' in args :
+            hostname = args['hostname']
+
+            n = int(self.howmany.get(hostname,0))
+            if n >= int(args['maxproc']) :
+                print "decline to run %s - %d other already running"%(node.name,n)
+                return False
+
+            n = n + 1
+            self.howmany[hostname] = n
+            print "running %s %s %d"%(hostname,node.name, n)
+        else :
+            print "running %s %s no maxproc"%(hostname, node.name)
+
+        if debug :
+            print "run",node.name
+        if debug :
+            print "....%s:%s/%s\n"%(node.host, node.table, node.cmd)
+
+        node.running = 1
 
         args = args.copy()
         args.update( 
@@ -124,10 +143,28 @@ class runner(object):
         # remember the process is running
         self.all_procs[node.name] = n
 
+        return True
+
     #####
     # callback when a node finishes
 
     def finish( self, node_name, status):
+
+        node = self.node_index[node_name]
+
+        args = self.get_host_info(node.host)
+
+        if 'maxproc' in args :
+            hostname = args['hostname']
+
+            n = int(self.howmany.get(hostname,0))
+            n = n - 1
+
+            self.howmany[hostname] = n
+            print "finish %s %s %d"%(hostname,node_name,n)
+        else :
+            print "finish %s %s no maxproc"%(hostname,node_name)
+
         # note the termination of the process at the end of the log file
         logfile  = self.all_procs[node_name].logfile
         logfile.seek(0,2)   # end of file
@@ -135,7 +172,6 @@ class runner(object):
         logfile.close()
 
         # note the completion of the command
-        node = self.node_index[node_name]
         if debug :
             print "finish",node.name
         node.running = 0
@@ -206,16 +242,26 @@ class runner(object):
         self.cfg.read(filename)
 
     def get_host_info(self, host) :
+        if debug:
+            print "enter get_host_info",host
         if not host in self.host_info_cache :
 
             d = self._host_get_names(self.cfg, host)
+            if debug:
+                print "in get_host_info, got names for ",host, d
             if 'like' in d :
-                d1 = self.get_host_info(d['like'])
+                if debug:
+                    print "has like", d['like']
+                d1 = self.get_host_info(d['like']).copy()
                 del d['like']
                 d1.update(d)
                 self.host_info_cache[host] = d1
             else :
+                print "end of chain",host,d
                 self.host_info_cache[host] = d
 
+        if debug:
+            print "leave get_host_info",host, self.host_info_cache[host]
+
         return self.host_info_cache[host]
     #####