Author: croberts
Date: 2012-12-14 21:02:38 +0000 (Fri, 14 Dec 2012)
New Revision: 5601
Modified:
branches/elephant/cumin/python/cumin/gridhadoop/datanode.py
branches/elephant/cumin/python/cumin/gridhadoop/hadoop.py
branches/elephant/cumin/python/cumin/gridhadoop/jobtracker.py
branches/elephant/cumin/python/cumin/gridhadoop/namenode.py
branches/elephant/cumin/python/cumin/gridhadoop/tasktracker.py
Log:
Now using sage get_name_node_list to get the list of real live name nodes. It may or may
not be working properly though since I'm not seeing any returned nodes yet.
Modified: branches/elephant/cumin/python/cumin/gridhadoop/datanode.py
===================================================================
--- branches/elephant/cumin/python/cumin/gridhadoop/datanode.py 2012-12-14 20:04:43 UTC
(rev 5600)
+++ branches/elephant/cumin/python/cumin/gridhadoop/datanode.py 2012-12-14 21:02:38 UTC
(rev 5601)
@@ -19,7 +19,7 @@
super(DataNodeSelector, self).__init__(app, name, cls)
self.add_search_filter(self.table.nn_col)
- self.table.adapter = HadoopAdapter(app, cls, None)
+ self.table.adapter = HadoopAdapter(app, cls)
task = DataNodeCreate(app)
link = TaskLink(app, "dataNode_create", task)
Modified: branches/elephant/cumin/python/cumin/gridhadoop/hadoop.py
===================================================================
--- branches/elephant/cumin/python/cumin/gridhadoop/hadoop.py 2012-12-14 20:04:43 UTC (rev
5600)
+++ branches/elephant/cumin/python/cumin/gridhadoop/hadoop.py 2012-12-14 21:02:38 UTC (rev
5601)
@@ -16,9 +16,8 @@
strings = StringCatalog(__file__)
class HadoopAdapter(ObjectQmfAdapter):
- def __init__(self, app, cls, remoteDataMethod):
+ def __init__(self, app, cls):
super(HadoopAdapter, self).__init__(app, cls)
- self.remoteDataMethod = remoteDataMethod
self.cls = cls
def get_count(self, values):
@@ -26,40 +25,36 @@
return len(data)
def get_sage_results(self, values):
- session = values['session']
-
- # TODO make some sage call and return the results
- # Here, we call self.remoteDataMethod
+ # Here's some fake data, eventually force the derived class to implement
this
results = MethodResult()
+ results.status = "OK"
results.data =
{"node1":{"Name":"node1.lab.bos.redhat.com",\
- "ID":"12345", \
- "Submitted":"11/14/2012", \
- "Status":"Running", \
- "Uptime":"2+00:54:56", \
- "Owner":"croberts", \
-
"Location":"http://mrg7.lab.bos.redhat.com:40222",\
- "NameNode":"796210 @
http://mrg16.lab.bos.redhat.com:50061",\
- "JobTracker":"799639 @
http://mrg44.lab.bos.redhat.com:57339"}, \
+ "ID":"12345", \
+ "Submitted":"11/14/2012", \
+ "Status":"FAKE*Running", \
+ "Uptime":"2+00:54:56", \
+ "Owner":"croberts", \
+
"Location":"@http://mrg7.lab.bos.redhat.com:40222",\
+ "NameNode":"796210 @
http://mrg16.lab.bos.redhat.com:50061",\
+ "JobTracker":"799639 @
http://mrg44.lab.bos.redhat.com:57339"}, \
"node2":{"Name":"node2.lab.bos.redhat.com",\
- "ID":"56789", \
- "Submitted":"11/15/2012", \
- "Status":"Running", \
- "Uptime":"1+00:24:56", \
- "Owner":"croberts", \
-
"Location":"http://mrg8.lab.bos.redhat.com:40222",\
- "NameNode":"720565 @
http://mrg14.lab.bos.redhat.com:44594",\
- "JobTracker":"799639 @
http://mrg44.lab.bos.redhat.com:57339"}}
-
- return results
+ "ID":"56789", \
+ "Submitted":"11/15/2012", \
+ "Status":"FAKE*Running", \
+ "Uptime":"1+00:24:56", \
+ "Owner":"croberts", \
+
"Location":"http://mrg8.lab.bos.redhat.com:40222",\
+ "NameNode":"720565 @
http://mrg14.lab.bos.redhat.com:44594",\
+ "JobTracker":"799639 @
http://mrg44.lab.bos.redhat.com:57339"}}
+ return (results.status, results.data)
def do_get_data(self, values):
- results = self.get_sage_results(values)
- namenodes = results.data
-
- if namenodes is None or len(namenodes) == 0:
+ (status, data) = self.get_sage_results(values)
+ log.debug("Return status from sage call is: %s" % status)
+ if data is None or len(data) == 0:
return {}
- return namenodes
+ return data
def process_record(self, key, record):
field_data = list()
@@ -127,8 +122,7 @@
if items:
self.param.set(session, items[0])
- super(HadoopHostField.HadoopHostOptions, self).do_process \
- (session)
+ super(HadoopHostField.HadoopHostOptions, self).do_process(session)
def do_get_items(self, session):
hosts = self.app.remote.get_hosts("SCHEDULER", "HADOOP")
Modified: branches/elephant/cumin/python/cumin/gridhadoop/jobtracker.py
===================================================================
--- branches/elephant/cumin/python/cumin/gridhadoop/jobtracker.py 2012-12-14 20:04:43 UTC
(rev 5600)
+++ branches/elephant/cumin/python/cumin/gridhadoop/jobtracker.py 2012-12-14 21:02:38 UTC
(rev 5601)
@@ -19,7 +19,7 @@
super(JobTrackerSelector, self).__init__(app, name, cls)
self.add_search_filter(self.table.loc_col)
- self.table.adapter = HadoopAdapter(app, cls, None)
+ self.table.adapter = HadoopAdapter(app, cls)
task = JobTrackerCreate(app)
link = TaskLink(app, "jobTracker_create", task)
Modified: branches/elephant/cumin/python/cumin/gridhadoop/namenode.py
===================================================================
--- branches/elephant/cumin/python/cumin/gridhadoop/namenode.py 2012-12-14 20:04:43 UTC
(rev 5600)
+++ branches/elephant/cumin/python/cumin/gridhadoop/namenode.py 2012-12-14 21:02:38 UTC
(rev 5601)
@@ -10,6 +10,11 @@
from sage.util import *
+class NameNodeAdapter(HadoopAdapter):
+ def get_sage_results(self, values):
+ results = self.app.remote.get_name_node_list()
+ return results
+
class NameNodeSelector(ObjectSelector):
def __init__(self, app, name):
cls = app.model.com_redhat_cumin_grid_hadoop.NameNode
@@ -17,7 +22,7 @@
super(NameNodeSelector, self).__init__(app, name, cls)
self.add_search_filter(self.table.loc_col)
- self.table.adapter = HadoopAdapter(app, cls, None)
+ self.table.adapter = NameNodeAdapter(app, cls)
task = NameNodeCreate(app)
link = TaskLink(app, "nameNode_create", task)
Modified: branches/elephant/cumin/python/cumin/gridhadoop/tasktracker.py
===================================================================
--- branches/elephant/cumin/python/cumin/gridhadoop/tasktracker.py 2012-12-14 20:04:43 UTC
(rev 5600)
+++ branches/elephant/cumin/python/cumin/gridhadoop/tasktracker.py 2012-12-14 21:02:38 UTC
(rev 5601)
@@ -19,7 +19,7 @@
super(TaskTrackerSelector, self).__init__(app, name, cls)
self.add_search_filter(self.table.jt_col)
- self.table.adapter = HadoopAdapter(app, cls, None)
+ self.table.adapter = HadoopAdapter(app, cls)
task = TaskTrackerCreate(app)
link = TaskLink(app, "taskTracker_create", task)