Author: croberts
Date: 2012-11-16 19:27:38 +0000 (Fri, 16 Nov 2012)
New Revision: 5548
Modified:
branches/elephant/cumin/model/cumin.xml
branches/elephant/cumin/model/rosemary.xml
branches/elephant/cumin/python/cumin/grid-hadoop/hadoop.py
branches/elephant/cumin/python/cumin/grid-hadoop/main.py
Log:
Skeleton for jobtracker and tasktracker
Modified: branches/elephant/cumin/model/cumin.xml
===================================================================
--- branches/elephant/cumin/model/cumin.xml 2012-11-16 16:17:51 UTC (rev 5547)
+++ branches/elephant/cumin/model/cumin.xml 2012-11-16 19:27:38 UTC (rev 5548)
@@ -47,7 +47,6 @@
<package name="com.redhat.cumin.grid.hadoop">
<class name="NameNode" storage="none">
- <property name="Name" type="sstr"/>
<property name="ID" type="sstr"/>
<property name="Submitted" type="sstr"/>
<property name="Status" type="sstr"/>
@@ -56,7 +55,6 @@
<property name="Location" type="sstr"/>
</class>
<class name="DataNode" storage="none">
- <property name="Name" type="sstr"/>
<property name="ID" type="sstr"/>
<property name="Submitted" type="sstr"/>
<property name="Status" type="sstr"/>
@@ -65,10 +63,20 @@
<property name="NameNode" type="sstr"/>
</class>
<class name="TaskTracker" storage="none">
- <property name="Name" type="sstr"/>
+ <property name="ID" type="sstr"/>
+ <property name="Submitted" type="sstr"/>
+ <property name="Status" type="sstr"/>
+ <property name="Uptime" type="sstr"/>
+ <property name="Owner" type="sstr"/>
+ <property name="JobTracker" type="sstr"/>
</class>
<class name="JobTracker" storage="none">
- <property name="Name" type="sstr"/>
+ <property name="ID" type="sstr"/>
+ <property name="Submitted" type="sstr"/>
+ <property name="Status" type="sstr"/>
+ <property name="Uptime" type="sstr"/>
+ <property name="Owner" type="sstr"/>
+ <property name="Location" type="sstr"/>
</class>
</package>
</model>
Modified: branches/elephant/cumin/model/rosemary.xml
===================================================================
--- branches/elephant/cumin/model/rosemary.xml 2012-11-16 16:17:51 UTC (rev 5547)
+++ branches/elephant/cumin/model/rosemary.xml 2012-11-16 19:27:38 UTC (rev 5548)
@@ -37,9 +37,6 @@
<package name="com.redhat.cumin.grid.hadoop">
<class name="NameNode">
- <property name="Name">
- <title>Name</title>
- </property>
<property name="ID">
<title>Id</title>
</property>
@@ -61,9 +58,6 @@
</class>
<class name="DataNode">
- <property name="Name">
- <title>Name</title>
- </property>
<property name="ID">
<title>Id</title>
</property>
@@ -85,15 +79,45 @@
</class>
<class name="TaskTracker">
- <property name="Name">
- <title>Name</title>
+ <property name="ID">
+ <title>Id</title>
</property>
+ <property name="Submitted">
+ <title>Submitted</title>
+ </property>
+ <property name="Status">
+ <title>Status</title>
+ </property>
+ <property name="Uptime">
+ <title>Uptime</title>
+ </property>
+ <property name="Owner">
+ <title>Owner</title>
+ </property>
+ <property name="JobTracker">
+ <title>Job tracker</title>
+ </property>
</class>
<class name="JobTracker">
- <property name="Name">
- <title>Name</title>
+ <property name="ID">
+ <title>Id</title>
</property>
+ <property name="Submitted">
+ <title>Submitted</title>
+ </property>
+ <property name="Status">
+ <title>Status</title>
+ </property>
+ <property name="Uptime">
+ <title>Uptime</title>
+ </property>
+ <property name="Owner">
+ <title>Owner</title>
+ </property>
+ <property name="Location">
+ <title>Location</title>
+ </property>
</class>
</package>
Modified: branches/elephant/cumin/python/cumin/grid-hadoop/hadoop.py
===================================================================
--- branches/elephant/cumin/python/cumin/grid-hadoop/hadoop.py 2012-11-16 16:17:51 UTC
(rev 5547)
+++ branches/elephant/cumin/python/cumin/grid-hadoop/hadoop.py 2012-11-16 19:27:38 UTC
(rev 5548)
@@ -75,7 +75,7 @@
super(TaskTrackerSelector, self).__init__(app, name, cls)
- self.add_search_filter(self.table.name_col)
+ self.add_search_filter(self.table.jt_col)
self.table.adapter = HadoopAdapter(app, cls, None)
self.enable_csv_export()
@@ -96,7 +96,7 @@
super(JobTrackerSelector, self).__init__(app, name, cls)
- self.add_search_filter(self.table.name_col)
+ self.add_search_filter(self.table.loc_col)
self.table.adapter = HadoopAdapter(app, cls, None)
self.enable_csv_export()
@@ -134,7 +134,8 @@
"Uptime":"2+00:54:56", \
"Owner":"croberts", \
"Location":"http://mrg7.lab.bos.redhat.com:40222",\
- "NameNode":"796210 @
http://mrg16.lab.bos.redhat.com:50061"}, \
+ "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", \
@@ -142,7 +143,8 @@
"Uptime":"1+00:24:56", \
"Owner":"croberts", \
"Location":"http://mrg8.lab.bos.redhat.com:40222",\
- "NameNode":"720565 @
http://mrg14.lab.bos.redhat.com:44594"}}
+ "NameNode":"720565 @
http://mrg14.lab.bos.redhat.com:44594",\
+ "JobTracker":"799639 @
http://mrg44.lab.bos.redhat.com:57339"}}
return results
@@ -161,6 +163,7 @@
super(NameNodeTable, self).__init__(app, name, cls)
self.loc_col = ObjectTableColumn(app, "loccol", cls.Location)
+ self.loc_col.width = "20%"
self.id_col = ObjectTableColumn(app, "idcol", cls.ID)
self.sub_col = ObjectTableColumn(app, "sub", cls.Submitted)
self.status_col = ObjectTableColumn(app, "statuscol", cls.Status)
@@ -174,12 +177,7 @@
self.add_column(self.uptime_col)
self.add_column(self.owner_col)
-
- class NameColumn(ObjectTableColumn):
- def render_text_align(self, session):
- return "left"
-
class DataNodeTable(ObjectQmfTable):
def __init__(self, app, name, cls):
super(DataNodeTable, self).__init__(app, name, cls)
@@ -199,29 +197,43 @@
self.add_column(self.uptime_col)
self.add_column(self.owner_col)
-
- class NameColumn(ObjectTableColumn):
- def render_text_align(self, session):
- return "left"
class TaskTrackerTable(ObjectQmfTable):
def __init__(self, app, name, cls):
super(TaskTrackerTable, self).__init__(app, name, cls)
- self.name_col = self.NameColumn(app, "name", cls.Name)
- self.add_column(self.name_col)
-
- class NameColumn(ObjectTableColumn):
- def render_text_align(self, session):
- return "left"
+ self.jt_col = ObjectTableColumn(app, "jtcol", cls.JobTracker)
+ self.jt_col.width="20%"
+ self.id_col = ObjectTableColumn(app, "idcol", cls.ID)
+ self.sub_col = ObjectTableColumn(app, "sub", cls.Submitted)
+ self.status_col = ObjectTableColumn(app, "statuscol", cls.Status)
+ self.uptime_col = ObjectTableColumn(app, "uptimecol", cls.Uptime)
+ self.owner_col = ObjectTableColumn(app, "ownercol", cls.Owner)
+ self.add_column(self.jt_col)
+ self.add_column(self.id_col)
+ self.add_column(self.sub_col)
+ self.add_column(self.status_col)
+ self.add_column(self.uptime_col)
+ self.add_column(self.owner_col)
+
+
class JobTrackerTable(ObjectQmfTable):
def __init__(self, app, name, cls):
super(JobTrackerTable, self).__init__(app, name, cls)
- self.name_col = self.NameColumn(app, "name", cls.Name)
- self.add_column(self.name_col)
-
- class NameColumn(ObjectTableColumn):
- def render_text_align(self, session):
- return "left"
\ No newline at end of file
+ self.loc_col = ObjectTableColumn(app, "loccol", cls.Location)
+ self.loc_col.width = "20%"
+ self.id_col = ObjectTableColumn(app, "idcol", cls.ID)
+ self.sub_col = ObjectTableColumn(app, "sub", cls.Submitted)
+ self.status_col = ObjectTableColumn(app, "statuscol", cls.Status)
+ self.uptime_col = ObjectTableColumn(app, "uptimecol", cls.Uptime)
+ self.owner_col = ObjectTableColumn(app, "ownercol", cls.Owner)
+
+ self.add_column(self.loc_col)
+ self.add_column(self.id_col)
+ self.add_column(self.sub_col)
+ self.add_column(self.status_col)
+ self.add_column(self.uptime_col)
+ self.add_column(self.owner_col)
+
\ No newline at end of file
Modified: branches/elephant/cumin/python/cumin/grid-hadoop/main.py
===================================================================
--- branches/elephant/cumin/python/cumin/grid-hadoop/main.py 2012-11-16 16:17:51 UTC (rev
5547)
+++ branches/elephant/cumin/python/cumin/grid-hadoop/main.py 2012-11-16 19:27:38 UTC (rev
5548)
@@ -44,6 +44,6 @@
self.tabs.add_tab(NameNodeSelector(app, "namenodes"))
self.tabs.add_tab(DataNodeSelector(app, "datanodes"))
+ self.tabs.add_tab(JobTrackerSelector(app, "jobtrackers"))
self.tabs.add_tab(TaskTrackerSelector(app, "tasktrackers"))
- self.tabs.add_tab(JobTrackerSelector(app, "jobtrackers"))
\ No newline at end of file