Author: croberts
Date: 2013-02-15 16:11:15 +0000 (Fri, 15 Feb 2013)
New Revision: 5706
Modified:
branches/elephant/cumin/model/cumin.xml
branches/elephant/cumin/model/rosemary.xml
branches/elephant/cumin/python/cumin/gridhadoop/datanode.py
branches/elephant/cumin/python/cumin/gridhadoop/tasktracker.py
branches/elephant/rosemary/python/rosemary/util.py
Log:
Removing unnecessary "Overview" tab for data node/task tracker. Specifying
formatters for some fields that will appear on the Details page.
Modified: branches/elephant/cumin/model/cumin.xml
===================================================================
--- branches/elephant/cumin/model/cumin.xml 2013-02-14 16:18:53 UTC (rev 5705)
+++ branches/elephant/cumin/model/cumin.xml 2013-02-15 16:11:15 UTC (rev 5706)
@@ -58,15 +58,18 @@
<class name="DataNode" storage="none">
<property name="Id" type="sstr"/>
<property name="Ipc" type="sstr"/>
+ <property name="Parent_id" type="sstr"/>
+ <property name="Parent_ipc" type="sstr"/>
<property name="Submitted" type="sstr"/>
<property name="State" type="sstr"/>
<property name="Uptime" type="sstr"/>
<property name="Owner" type="sstr"/>
- <property name="NameNode" type="sstr"/>
</class>
<class name="TaskTracker" storage="none">
<property name="Id" type="sstr"/>
<property name="Ipc" type="sstr"/>
+ <property name="Parent_id" type="sstr"/>
+ <property name="Parent_ipc" type="sstr"/>
<property name="Submitted" type="sstr"/>
<property name="State" type="sstr"/>
<property name="Uptime" type="sstr"/>
Modified: branches/elephant/cumin/model/rosemary.xml
===================================================================
--- branches/elephant/cumin/model/rosemary.xml 2013-02-14 16:18:53 UTC (rev 5705)
+++ branches/elephant/cumin/model/rosemary.xml 2013-02-15 16:11:15 UTC (rev 5706)
@@ -45,12 +45,15 @@
</property>
<property name="Submitted">
<title>Submitted</title>
+ <formatter>fmt_timestamp</formatter>
</property>
<property name="State">
<title>State</title>
+ <formatter>fmt_title</formatter>
</property>
<property name="Uptime">
<title>Uptime</title>
+ <formatter>fmt_timestamp_ddhhmmss</formatter>
</property>
<property name="Owner">
<title>Owner</title>
@@ -67,14 +70,22 @@
<property name="Ipc">
<title>Ipc</title>
</property>
+ <property name="Parent_id">
+ <title>Name node id</title>
+ </property>
+ <property name="Parent_ipc">
+ <title>Name node ipc</title>
+ </property>
<property name="Submitted">
<title>Submitted</title>
</property>
<property name="State">
<title>State</title>
+ <formatter>fmt_title</formatter>
</property>
<property name="Uptime">
<title>Uptime</title>
+ <formatter>fmt_timestamp_ddhhmmss</formatter>
</property>
<property name="Owner">
<title>Owner</title>
@@ -88,14 +99,22 @@
<property name="Ipc">
<title>Ipc</title>
</property>
+ <property name="Parent_id">
+ <title>Job tracker id</title>
+ </property>
+ <property name="Parent_ipc">
+ <title>Job tracker ipc</title>
+ </property>
<property name="Submitted">
<title>Submitted</title>
</property>
<property name="State">
<title>State</title>
+ <formatter>fmt_title</formatter>
</property>
<property name="Uptime">
<title>Uptime</title>
+ <formatter>fmt_timestamp_ddhhmmss</formatter>
</property>
<property name="Owner">
<title>Owner</title>
@@ -114,9 +133,11 @@
</property>
<property name="State">
<title>State</title>
+ <formatter>fmt_title</formatter>
</property>
<property name="Uptime">
<title>Uptime</title>
+ <formatter>fmt_timestamp_ddhhmmss</formatter>
</property>
<property name="Owner">
<title>Owner</title>
Modified: branches/elephant/cumin/python/cumin/gridhadoop/datanode.py
===================================================================
--- branches/elephant/cumin/python/cumin/gridhadoop/datanode.py 2013-02-14 16:18:53 UTC
(rev 5705)
+++ branches/elephant/cumin/python/cumin/gridhadoop/datanode.py 2013-02-15 16:11:15 UTC
(rev 5706)
@@ -224,8 +224,8 @@
self.view = DataNodeObjectView(app, "view", self.object)
self.replace_child(self.view)
- self.overview = DataNodeOverview(app, self.name + ".dnoverview",
self.object)
- self.view.add_tab(self.overview)
+ self.details = DataNodeDetails(self.app, self.name + ".details",
self.object)
+ self.view.add_tab(self.details)
def get_title(self, session):
retval = "Data node:'%s' (%s)" %
(xml_escape(self.object.get(session).Name), xml_escape(self.object.get(session).Id))
@@ -239,7 +239,7 @@
class DataNodeObjectView(HadoopObjectView):
def add_details_tab(self):
- self.add_tab(DataNodeDetails(self.app, "details", self.object))
+ pass
def render_title(self, session):
obj = self.object.get(session)
@@ -247,14 +247,7 @@
return "Data node: %s" % xml_escape(obj.Id)
else:
return ""
-
-class DataNodeOverview(Widget):
- def __init__(self, app, name, node):
- super(DataNodeOverview, self).__init__(app, name)
-
- def render_title(self, session):
- return "Overview"
-
+
class DataNodeDetails(HadoopObjectDetails):
def __init__(self, app, name, object):
super(DataNodeDetails, self).__init__(app, name, object)
Modified: branches/elephant/cumin/python/cumin/gridhadoop/tasktracker.py
===================================================================
--- branches/elephant/cumin/python/cumin/gridhadoop/tasktracker.py 2013-02-14 16:18:53 UTC
(rev 5705)
+++ branches/elephant/cumin/python/cumin/gridhadoop/tasktracker.py 2013-02-15 16:11:15 UTC
(rev 5706)
@@ -287,8 +287,8 @@
self.view = TaskTrackerObjectView(app, "view", self.object)
self.replace_child(self.view)
- self.overview = TaskTrackerOverview(app, self.name + ".ttoverview",
self.object)
- self.view.add_tab(self.overview)
+ self.details = TaskTrackerDetails(self.app, self.name + ".details",
self.object)
+ self.view.add_tab(self.details)
def get_title(self, session):
retval = ""
@@ -306,7 +306,7 @@
class TaskTrackerObjectView(HadoopObjectView):
def add_details_tab(self):
- self.add_tab(TaskTrackerDetails(self.app, "details", self.object))
+ pass
def render_title(self, session):
obj = self.object.get(session)
@@ -314,14 +314,7 @@
return "Task tracker: %s" % xml_escape(obj.Id)
else:
return ""
-
-class TaskTrackerOverview(Widget):
- def __init__(self, app, name, node):
- super(TaskTrackerOverview, self).__init__(app, name)
-
- def render_title(self, session):
- return "Overview"
-
+
class TaskTrackerDetails(HadoopObjectDetails):
def __init__(self, app, name, object):
super(TaskTrackerDetails, self).__init__(app, name, object)
Modified: branches/elephant/rosemary/python/rosemary/util.py
===================================================================
--- branches/elephant/rosemary/python/rosemary/util.py 2013-02-14 16:18:53 UTC (rev 5705)
+++ branches/elephant/rosemary/python/rosemary/util.py 2013-02-15 16:11:15 UTC (rev 5706)
@@ -1,6 +1,7 @@
import logging
import os
import sys
+from datetime import datetime
from pprint import pprint
from cumin.formats import *
@@ -20,4 +21,11 @@
days = value / 86400
hours = (value / 3600) - (days * 24)
minutes = (value / 60) - (days * 1440) - (hours * 60)
- return '%02d:%02d:%02d' % (days, hours, minutes)
\ No newline at end of file
+ return '%02d:%02d:%02d' % (days, hours, minutes)
+
+def fmt_timestamp(value):
+ datestring = datetime.fromtimestamp(value).strftime('%Y-%m-%d %H:%M:%S')
+ return datestring
+
+def fmt_title(value):
+ return value.title()
\ No newline at end of file