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

Author: croberts
Date: 2013-06-23 13:31:28 +0000 (Sun, 23 Jun 2013)
New Revision: 5771

Modified:
   trunk/cumin/python/cumin/gridhadoop/namenode.py
   trunk/sage/python/sage/aviary/aviaryoperations.py
Log:
Now passing owner to add_external_name_node.

Modified: trunk/cumin/python/cumin/gridhadoop/namenode.py
===================================================================
--- trunk/cumin/python/cumin/gridhadoop/namenode.py	2013-06-23 13:30:30 UTC (rev 5770)
+++ trunk/cumin/python/cumin/gridhadoop/namenode.py	2013-06-23 13:31:28 UTC (rev 5771)
@@ -101,7 +101,8 @@
         self.invoc = invoc
         (ipc, http) = args
         host = self.app.remote.get_hosts("SCHEDULER", "HADOOP")[0]
-        self.app.remote.add_external_name_node(host, ipc, http, invoc.make_callback())
+        owner = session.client_session.username()
+        self.app.remote.add_external_name_node(host, ipc, http, owner,
invoc.make_callback())
 
     def get_title(self, session, x):
         return "Add an infrastructure name node"

Modified: trunk/sage/python/sage/aviary/aviaryoperations.py
===================================================================
--- trunk/sage/python/sage/aviary/aviaryoperations.py	2013-06-23 13:30:30 UTC (rev 5770)
+++ trunk/sage/python/sage/aviary/aviaryoperations.py	2013-06-23 13:31:28 UTC (rev 5771)
@@ -1122,7 +1122,7 @@
     def get_task_tracker_list(self, owner=None, callback=None):
         return self._get_node_list(self.get_task_tracker, owner, callback)    
 
-    def add_external_name_node(self, host, ipc, url, callback):
+    def add_external_name_node(self, host, ipc, url, owner, callback):
         # This is special because the HadoopID is special
         assert callable(callback)
 
@@ -1153,7 +1153,7 @@
         ref.http = url
 
         t = CallThread(self.call_client_retry, my_callback,
-                       client, "startNameNode", None, None, None, ref)
+                       client, "startNameNode", None, owner, None, ref)
         t.start()
             
     def add_external_job_tracker(self, host, ipc, url, callback):