Author: croberts
Date: 2013-06-11 16:49:05 +0000 (Tue, 11 Jun 2013)
New Revision: 5750
Modified:
trunk/cumin/python/cumin/gridhadoop/datanode.py
trunk/cumin/python/cumin/gridhadoop/jobtracker.py
trunk/cumin/python/cumin/gridhadoop/main.py
trunk/cumin/python/cumin/gridhadoop/namenode.py
trunk/cumin/python/cumin/gridhadoop/tasktracker.py
Log:
Gridoop tweaks: 1) Removing the scheduler selection page -- now always assuming that the
0th schedd in the response is the one we want. 2) Fixing filter by owner bug for name
node/job tracker lists.
Modified: trunk/cumin/python/cumin/gridhadoop/datanode.py
===================================================================
--- trunk/cumin/python/cumin/gridhadoop/datanode.py 2013-03-21 15:01:16 UTC (rev 5749)
+++ trunk/cumin/python/cumin/gridhadoop/datanode.py 2013-06-11 16:49:05 UTC (rev 5750)
@@ -149,10 +149,9 @@
if obj:
self.form.id.set(form_session, obj._id)
-
- self.form.hadoophost.set(form_session,
self.module.frame.children_by_name[self.module.frame.name +
".ghschedframe"].host.get(session))
- self.form.nn_id.set(form_session,
self.module.frame.children_by_name[self.module.frame.name + ".ghschedframe"]\
- .children_by_name[self.module.frame.name +
".ghschedframe.namenodeframe"].id.get(session))
+ hadoop_schedulers = self.app.remote.get_hosts("SCHEDULER",
"HADOOP")
+ self.form.hadoophost.set(form_session, hadoop_schedulers[0])
+ self.form.nn_id.set(form_session,
self.module.frame.children_by_name[self.module.frame.name +
".namenodeframe"].id.get(session))
self.form.return_url.set(form_session, session.marshal())
self.form.show(form_session)
Modified: trunk/cumin/python/cumin/gridhadoop/jobtracker.py
===================================================================
--- trunk/cumin/python/cumin/gridhadoop/jobtracker.py 2013-03-21 15:01:16 UTC (rev 5749)
+++ trunk/cumin/python/cumin/gridhadoop/jobtracker.py 2013-06-11 16:49:05 UTC (rev 5750)
@@ -75,7 +75,7 @@
def render_cell_href(self, session, record):
id = unescape_entity(record[self.id_field.index])
frame = self.frame.children_by_name[self.frame.name + self.frame_path]
- return frame.get_href(session, id, frame.parent.host.get(session))
+ return frame.get_href(session, id,
self.app.remote.get_hosts("SCHEDULER", "HADOOP")[0])
class JobTrackerDelete(HadoopNodeDeleteTask):
def __init__(self, app, selector, name, module):
@@ -148,7 +148,7 @@
if obj:
self.form.id.set(form_session, obj._id)
- self.form.hadoophost.set(form_session,
self.app.gridhadoop.frame.children_by_name["gridhadoop.ghschedframe"].host.get(session))
+ self.form.hadoophost.set(form_session,
self.app.remote.get_hosts("SCHEDULER", "HADOOP")[0])
self.form.return_url.set(form_session, session.marshal())
self.form.show(form_session)
@@ -215,8 +215,8 @@
return retval
def get_object(self, session, id):
- host = self.frame.host.get(session)
- response = self.app.remote.get_job_tracker(self.frame.host.get(session), [id])
+ host = self.app.remote.get_hosts("SCHEDULER", "HADOOP")[0]
+ response = self.app.remote.get_job_tracker(host, [id])
obj = HadoopObject(response,
self.app.model.com_redhat_cumin_grid_hadoop.JobTracker)
return obj
Modified: trunk/cumin/python/cumin/gridhadoop/main.py
===================================================================
--- trunk/cumin/python/cumin/gridhadoop/main.py 2013-03-21 15:01:16 UTC (rev 5749)
+++ trunk/cumin/python/cumin/gridhadoop/main.py 2013-06-11 16:49:05 UTC (rev 5750)
@@ -41,8 +41,11 @@
self.view = GridHadoopView(app, name + ".view", check_owner)
self.add_mode(self.view)
- self.scheduler_frame = HadoopSchedulerFrame(app, name +
".ghschedframe", check_owner, self.module)
- self.add_mode(self.scheduler_frame)
+ self.name_node_frame = NameNodeFrame(app, name + ".namenodeframe",
self.module)
+ self.add_mode(self.name_node_frame)
+
+ self.job_tracker_frame = JobTrackerFrame(app, name +
".jobtrackerframe", self.module)
+ self.add_mode(self.job_tracker_frame)
def render_title(self, session):
return "Grid-hadoop"
@@ -54,4 +57,5 @@
self.tabs = TabbedModeSet(app, "childtabs")
self.add_child(self.tabs)
- self.tabs.add_tab(HadoopSchedulerSelector(app, name + ".hscheds"))
+ self.tabs.add_tab(NameNodeSelector(app, name + ".namenodes", self,
check_owner))
+ self.tabs.add_tab(JobTrackerSelector(app, name + ".jobtrackers", self,
check_owner))
Modified: trunk/cumin/python/cumin/gridhadoop/namenode.py
===================================================================
--- trunk/cumin/python/cumin/gridhadoop/namenode.py 2013-03-21 15:01:16 UTC (rev 5749)
+++ trunk/cumin/python/cumin/gridhadoop/namenode.py 2013-06-11 16:49:05 UTC (rev 5750)
@@ -71,7 +71,8 @@
def render_cell_href(self, session, record):
id = unescape_entity(record[self.id_field.index])
frame = self.frame.children_by_name[self.frame.name + self.frame_path]
- return frame.get_href(session, id, frame.parent.host.get(session))
+ hadoop_schedulers = self.app.remote.get_hosts("SCHEDULER",
"HADOOP")
+ return frame.get_href(session, id, hadoop_schedulers[0])
class NameNodeCreate(Task):
def __init__(self, app, name, module):
@@ -102,7 +103,8 @@
if obj:
self.form.id.set(form_session, obj._id)
- self.form.hadoophost.set(form_session,
self.module.frame.children_by_name[self.module.frame.name +
".ghschedframe"].host.get(session))
+ hadoop_schedulers = self.app.remote.get_hosts("SCHEDULER",
"HADOOP")
+ self.form.hadoophost.set(form_session, hadoop_schedulers[0])
self.form.return_url.set(form_session, session.marshal())
self.form.show(form_session)
@@ -194,8 +196,9 @@
return retval
def get_object(self, session, id):
- host = self.frame.host.get(session)
- response = self.app.remote.get_name_node(self.frame.host.get(session), [id])
+ hadoop_schedulers = self.app.remote.get_hosts("SCHEDULER",
"HADOOP")
+ host = hadoop_schedulers[0]
+ response = self.app.remote.get_name_node(host, [id])
obj = HadoopObject(response,
self.app.model.com_redhat_cumin_grid_hadoop.NameNode)
return obj
Modified: trunk/cumin/python/cumin/gridhadoop/tasktracker.py
===================================================================
--- trunk/cumin/python/cumin/gridhadoop/tasktracker.py 2013-03-21 15:01:16 UTC (rev 5749)
+++ trunk/cumin/python/cumin/gridhadoop/tasktracker.py 2013-06-11 16:49:05 UTC (rev 5750)
@@ -76,7 +76,7 @@
def render_cell_href(self, session, record):
id = unescape_entity(record[self.id_field.index])
frame = self.frame.children_by_name[self.frame_path]
- return frame.get_href(session, id, frame.parent.host.get(session))
+ return frame.get_href(session, id,
self.app.remote.get_hosts("SCHEDULER", "HADOOP")[0])
class TaskTrackerDelete(HadoopNodeDeleteTask):
def __init__(self, app, selector, name, module):
@@ -146,8 +146,8 @@
if obj:
self.form.id.set(form_session, obj._id)
- self.form.hadoophost.set(form_session,
self.app.gridhadoop.frame.children_by_name["gridhadoop.ghschedframe"].host.get(session))
- self.form.jt_id.set(form_session,
self.app.gridhadoop.frame.children_by_name["gridhadoop.ghschedframe"].children_by_name["gridhadoop.ghschedframe.jobtrackerframe"].id.get(session))
+ self.form.hadoophost.set(form_session,
self.app.remote.get_hosts("SCHEDULER", "HADOOP")[0])
+ self.form.jt_id.set(form_session,
self.module.frame.children_by_name[self.module.frame.name +
".jobtrackerframe"].id.get(session))
self.form.return_url.set(form_session, session.marshal())
self.form.show(form_session)