r5774 - in trunk: cumin/python/cumin/gridhadoop sage/python/sage/aviary

Author: croberts
Date: 2013-06-24 20:09:00 +0000 (Mon, 24 Jun 2013)
New Revision: 5774

Modified:
   trunk/cumin/python/cumin/gridhadoop/jobtracker.py
   trunk/sage/python/sage/aviary/aviaryoperations.py
Log:
Fix so that adding an external job tracker will now pass along the owner field.

Modified: trunk/cumin/python/cumin/gridhadoop/jobtracker.py
===================================================================
--- trunk/cumin/python/cumin/gridhadoop/jobtracker.py	2013-06-24 13:19:26 UTC (rev 5773)
+++ trunk/cumin/python/cumin/gridhadoop/jobtracker.py	2013-06-24 20:09:00 UTC (rev 5774)
@@ -103,8 +103,9 @@
     def do_invoke(self, session, object, invoc, args):
         self.invoc = invoc
         (ipc, http) = args
+        owner = session.client_session.username()
         host = self.app.remote.get_hosts("SCHEDULER", "HADOOP")[0]
-        self.app.remote.add_external_job_tracker(host, ipc, http, invoc.make_callback())
+        self.app.remote.add_external_job_tracker(host, ipc, http, owner,
invoc.make_callback())
 
     def get_title(self, session, x):
         return "Add an infrastructure job tracker"

Modified: trunk/sage/python/sage/aviary/aviaryoperations.py
===================================================================
--- trunk/sage/python/sage/aviary/aviaryoperations.py	2013-06-24 13:19:26 UTC (rev 5773)
+++ trunk/sage/python/sage/aviary/aviaryoperations.py	2013-06-24 20:09:00 UTC (rev 5774)
@@ -1156,7 +1156,7 @@
                        client, "startNameNode", None, owner, None, ref)
         t.start()
             
-    def add_external_job_tracker(self, host, ipc, url, callback):
+    def add_external_job_tracker(self, host, ipc, url, owner, callback):
         # This is special because the HadoooID is special, and 
         # also because the id refers to the jt itself as an external
         # and not a namenode
@@ -1189,7 +1189,7 @@
         ref.http = url        
 
         t = CallThread(self.call_client_retry, my_callback,
-                       client, "startJobTracker", ref)
+                       client, "startJobTracker", ref, None, owner, None)
         t.start()
 
     def _make_id(self, client, val):