Author: croberts
Date: 2013-02-19 14:24:28 +0000 (Tue, 19 Feb 2013)
New Revision: 5719
Modified:
trunk/cumin/python/cumin/gridhadoop/datanode.py
trunk/cumin/python/cumin/gridhadoop/hadoop.py
trunk/cumin/python/cumin/gridhadoop/jobtracker.py
trunk/cumin/python/cumin/gridhadoop/namenode.py
trunk/cumin/python/cumin/gridhadoop/tasktracker.py
Log:
Tweaks to the grid-hadoop object tables to optimize the display a bit.
Modified: trunk/cumin/python/cumin/gridhadoop/datanode.py
===================================================================
--- trunk/cumin/python/cumin/gridhadoop/datanode.py 2013-02-18 20:11:04 UTC (rev 5718)
+++ trunk/cumin/python/cumin/gridhadoop/datanode.py 2013-02-19 14:24:28 UTC (rev 5719)
@@ -53,17 +53,14 @@
super(DataNodeTable, self).__init__(app, name, cls)
self.id_col = self.DataNodeColumn(app, "idcol", cls.Id, cls.Id,
"datanodeframe")
- #self.sub_col = SubmittedColumn(app, "sub", cls.Submitted)
self.state_col = ObjectTableColumn(app, "statecol", cls.State)
self.uptime_col = UptimeColumn(app, "uptimecol", cls.Uptime)
- self.owner_col = ObjectTableColumn(app, "ownercol", cls.Owner)
-
+ self.owner_col = ObjectTableColumn(app, "ownercol", cls.Owner)
# we need to be able to filter by parent_id, but don't need to see it
self.parent_id_col = ObjectTableColumn(app, "parentid", cls.Parent_id)
self.parent_id_col.visible = False
self.add_column(self.id_col)
- #self.add_column(self.sub_col)
self.add_column(self.state_col)
self.add_column(self.uptime_col)
self.add_column(self.owner_col)
Modified: trunk/cumin/python/cumin/gridhadoop/hadoop.py
===================================================================
--- trunk/cumin/python/cumin/gridhadoop/hadoop.py 2013-02-18 20:11:04 UTC (rev 5718)
+++ trunk/cumin/python/cumin/gridhadoop/hadoop.py 2013-02-19 14:24:28 UTC (rev 5719)
@@ -316,3 +316,16 @@
class HadoopLinkColumnCell(LinkColumnCell):
#needed so we can override display
pass
+
+class HadoopIpcColumn(ObjectTableColumn):
+ def __init__(self, app, name, attr, width):
+ super(HadoopIpcColumn, self).__init__(app, name, attr)
+ self.width = width
+
+ def render_cell_title(self, session, record):
+ return self.field.get_content(session, record)
+
+class HadoopHttpColumn(HadoopObjectLinkColumn):
+ def render_cell_href(self, session, record):
+ link = self.field.get_content(session, record)
+ return link
Modified: trunk/cumin/python/cumin/gridhadoop/jobtracker.py
===================================================================
--- trunk/cumin/python/cumin/gridhadoop/jobtracker.py 2013-02-18 20:11:04 UTC (rev 5718)
+++ trunk/cumin/python/cumin/gridhadoop/jobtracker.py 2013-02-19 14:24:28 UTC (rev 5719)
@@ -55,17 +55,17 @@
super(JobTrackerTable, self).__init__(app, name, cls)
self.id_col = self.JobTrackerColumn(app, "idcol", cls.Id, cls.Id,
".jobtrackerframe")
- self.ipc_col = ObjectTableColumn(app, "ipc", cls.Ipc)
- self.ipc_col.width = "20%"
- #self.sub_col = SubmittedColumn(app, "sub", cls.Submitted)
- self.http_col = self.HttpColumn(app, "http", cls.Http, cls.Http, None)
+ self.id_col.width = "10%"
+ self.ipc_col = HadoopIpcColumn(app, "ipc", cls.Ipc, "20%")
+ self.http_col = HadoopHttpColumn(app, "http", cls.Http, cls.Http,
None)
self.state_col = ObjectTableColumn(app, "statecol", cls.State)
+ self.state_col.width = "10%"
self.uptime_col = UptimeColumn(app, "uptimecol", cls.Uptime)
+ self.uptime_col.width = "10%"
self.owner_col = ObjectTableColumn(app, "ownercol", cls.Owner)
self.add_column(self.id_col)
self.add_column(self.ipc_col)
- #self.add_column(self.sub_col)
self.add_column(self.http_col)
self.add_column(self.state_col)
self.add_column(self.uptime_col)
@@ -76,12 +76,7 @@
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))
-
- class HttpColumn(HadoopObjectLinkColumn):
- def render_cell_href(self, session, record):
- link = self.field.get_content(session, record)
- return link
-
+
class JobTrackerDelete(HadoopNodeDeleteTask):
def __init__(self, app, selector, name, module):
super(JobTrackerDelete, self).__init__(app, selector)
Modified: trunk/cumin/python/cumin/gridhadoop/namenode.py
===================================================================
--- trunk/cumin/python/cumin/gridhadoop/namenode.py 2013-02-18 20:11:04 UTC (rev 5718)
+++ trunk/cumin/python/cumin/gridhadoop/namenode.py 2013-02-19 14:24:28 UTC (rev 5719)
@@ -51,17 +51,17 @@
super(NameNodeTable, self).__init__(app, name, cls)
self.id_col = self.NameNodeColumn(app, "idcol", cls.Id, cls.Id,
".namenodeframe")
- self.ipc_col = ObjectTableColumn(app, "ipc", cls.Ipc)
- self.ipc_col.width = "20%"
- #self.sub_col = SubmittedColumn(app, "sub", cls.Submitted)
- self.http_col = self.HttpColumn(app, "http", cls.Http, cls.Http, None)
+ self.id_col.width = "10%"
+ self.ipc_col = HadoopIpcColumn(app, "ipc", cls.Ipc, "20%")
+ self.http_col = HadoopHttpColumn(app, "http", cls.Http, cls.Http,
None)
self.state_col = ObjectTableColumn(app, "statecol", cls.State)
+ self.state_col.width = "10%"
self.uptime_col = UptimeColumn(app, "uptimecol", cls.Uptime)
+ self.uptime_col.width = "10%"
self.owner_col = ObjectTableColumn(app, "ownercol", cls.Owner)
self.add_column(self.id_col)
self.add_column(self.ipc_col)
- #self.add_column(self.sub_col)
self.add_column(self.http_col)
self.add_column(self.state_col)
self.add_column(self.uptime_col)
@@ -73,11 +73,6 @@
frame = self.frame.children_by_name[self.frame.name + self.frame_path]
return frame.get_href(session, id, frame.parent.host.get(session))
- class HttpColumn(HadoopObjectLinkColumn):
- def render_cell_href(self, session, record):
- link = self.field.get_content(session, record)
- return link
-
class NameNodeCreate(Task):
def __init__(self, app, name, module):
super(NameNodeCreate, self).__init__(app, name)
Modified: trunk/cumin/python/cumin/gridhadoop/tasktracker.py
===================================================================
--- trunk/cumin/python/cumin/gridhadoop/tasktracker.py 2013-02-18 20:11:04 UTC (rev 5718)
+++ trunk/cumin/python/cumin/gridhadoop/tasktracker.py 2013-02-19 14:24:28 UTC (rev 5719)
@@ -53,7 +53,6 @@
super(TaskTrackerTable, self).__init__(app, name, cls)
self.id_col = self.TaskTrackerColumn(app, "idcol", cls.Id, cls.Id,
"tasktrackerframe")
- #self.sub_col = SubmittedColumn(app, "sub", cls.Submitted)
self.state_col = ObjectTableColumn(app, "statecol", cls.State)
self.uptime_col = UptimeColumn(app, "uptimecol", cls.Uptime)
self.owner_col = ObjectTableColumn(app, "ownercol", cls.Owner)
@@ -63,7 +62,6 @@
self.parent_id_col.visible = False
self.add_column(self.id_col)
- #self.add_column(self.sub_col)
self.add_column(self.state_col)
self.add_column(self.uptime_col)
self.add_column(self.owner_col)