r5711 - branches
by tmckay@fedoraproject.org
Author: tmckay
Date: 2013-02-18 15:00:53 +0000 (Mon, 18 Feb 2013)
New Revision: 5711
Added:
branches/statusquo/
Log:
Preserve the statusquo
11 years, 2 months
r5710 - branches
by tmckay@fedoraproject.org
Author: tmckay
Date: 2013-02-18 14:57:27 +0000 (Mon, 18 Feb 2013)
New Revision: 5710
Removed:
branches/persona/
Log:
Remove persona branch
11 years, 2 months
r5709 - branches
by tmckay@fedoraproject.org
Author: tmckay
Date: 2013-02-18 14:55:47 +0000 (Mon, 18 Feb 2013)
New Revision: 5709
Removed:
branches/lucidity/
Log:
Remove the lucidity branch
11 years, 2 months
r5708 - branches
by tmckay@fedoraproject.org
Author: tmckay
Date: 2013-02-18 14:55:15 +0000 (Mon, 18 Feb 2013)
New Revision: 5708
Removed:
branches/humility/
Log:
Remove the humility branch
11 years, 2 months
r5707 - branches/elephant/cumin/python/cumin/gridhadoop
by croberts@fedoraproject.org
Author: croberts
Date: 2013-02-15 20:05:32 +0000 (Fri, 15 Feb 2013)
New Revision: 5707
Modified:
branches/elephant/cumin/python/cumin/gridhadoop/datanode.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:
Eliminating "submitted"column. Not really that useful. That info is still available under the "details" tab when you drill into a given object.
Modified: branches/elephant/cumin/python/cumin/gridhadoop/datanode.py
===================================================================
--- branches/elephant/cumin/python/cumin/gridhadoop/datanode.py 2013-02-15 16:11:15 UTC (rev 5706)
+++ branches/elephant/cumin/python/cumin/gridhadoop/datanode.py 2013-02-15 20:05:32 UTC (rev 5707)
@@ -53,7 +53,7 @@
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.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 +63,7 @@
self.parent_id_col.visible = False
self.add_column(self.id_col)
- self.add_column(self.sub_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: branches/elephant/cumin/python/cumin/gridhadoop/jobtracker.py
===================================================================
--- branches/elephant/cumin/python/cumin/gridhadoop/jobtracker.py 2013-02-15 16:11:15 UTC (rev 5706)
+++ branches/elephant/cumin/python/cumin/gridhadoop/jobtracker.py 2013-02-15 20:05:32 UTC (rev 5707)
@@ -57,14 +57,16 @@
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.sub_col = SubmittedColumn(app, "sub", cls.Submitted)
+ self.http_col = self.HttpColumn(app, "http", cls.Http, cls.Http, None)
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.add_column(self.id_col)
self.add_column(self.ipc_col)
- self.add_column(self.sub_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)
self.add_column(self.owner_col)
@@ -73,8 +75,13 @@
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, frame.parent.host.get(session))
+ class HttpColumn(ObjectLinkColumn):
+ 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: branches/elephant/cumin/python/cumin/gridhadoop/namenode.py
===================================================================
--- branches/elephant/cumin/python/cumin/gridhadoop/namenode.py 2013-02-15 16:11:15 UTC (rev 5706)
+++ branches/elephant/cumin/python/cumin/gridhadoop/namenode.py 2013-02-15 20:05:32 UTC (rev 5707)
@@ -53,14 +53,16 @@
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.sub_col = SubmittedColumn(app, "sub", cls.Submitted)
+ self.http_col = self.HttpColumn(app, "http", cls.Http, cls.Http, None)
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.add_column(self.id_col)
self.add_column(self.ipc_col)
- self.add_column(self.sub_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)
self.add_column(self.owner_col)
@@ -69,8 +71,13 @@
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, frame.parent.host.get(session))
+ class HttpColumn(ObjectLinkColumn):
+ 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: branches/elephant/cumin/python/cumin/gridhadoop/tasktracker.py
===================================================================
--- branches/elephant/cumin/python/cumin/gridhadoop/tasktracker.py 2013-02-15 16:11:15 UTC (rev 5706)
+++ branches/elephant/cumin/python/cumin/gridhadoop/tasktracker.py 2013-02-15 20:05:32 UTC (rev 5707)
@@ -53,7 +53,7 @@
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.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 +63,7 @@
self.parent_id_col.visible = False
self.add_column(self.id_col)
- self.add_column(self.sub_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)
11 years, 2 months
r5706 - in branches/elephant: cumin/model cumin/python/cumin/gridhadoop rosemary/python/rosemary
by croberts@fedoraproject.org
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
11 years, 2 months
r5705 - branches/elephant/cumin/python/cumin/gridhadoop
by croberts@fedoraproject.org
Author: croberts
Date: 2013-02-14 16:18:53 +0000 (Thu, 14 Feb 2013)
New Revision: 5705
Modified:
branches/elephant/cumin/python/cumin/gridhadoop/datanode.py
branches/elephant/cumin/python/cumin/gridhadoop/hadoop.py
branches/elephant/cumin/python/cumin/gridhadoop/tasktracker.py
Log:
Now filtering task trackers and data nodes by their parent (job tracker/name node). When clicking on a name node or job tracker, the list of data nodes/task trackers will be limited to only the children of that object.
Modified: branches/elephant/cumin/python/cumin/gridhadoop/datanode.py
===================================================================
--- branches/elephant/cumin/python/cumin/gridhadoop/datanode.py 2013-02-13 20:25:56 UTC (rev 5704)
+++ branches/elephant/cumin/python/cumin/gridhadoop/datanode.py 2013-02-14 16:18:53 UTC (rev 5705)
@@ -58,11 +58,21 @@
self.uptime_col = UptimeColumn(app, "uptimecol", cls.Uptime)
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)
+ self.add_column(self.parent_id_col)
+
+ def get_data_options(self, session):
+ options = super(DataNodeTable, self).get_data_options(session)
+ options.parent_filter = {"column":self.parent_id_col, "value":self.frame.id.get(session)}
+ return options
class DataNodeColumn(ObjectLinkColumn):
def render_cell_href(self, session, record):
Modified: branches/elephant/cumin/python/cumin/gridhadoop/hadoop.py
===================================================================
--- branches/elephant/cumin/python/cumin/gridhadoop/hadoop.py 2013-02-13 20:25:56 UTC (rev 5704)
+++ branches/elephant/cumin/python/cumin/gridhadoop/hadoop.py 2013-02-14 16:18:53 UTC (rev 5705)
@@ -47,10 +47,12 @@
field_data = list()
for column in self.columns:
try:
- if column.name == "State":
+ if column.name.lower() in ["parent_id", "parent_ipc"]:
+ val = record.parent[column.name.lower().split("_")[1]]
+ elif column.name == "State":
val = record[column.name.lower()].title()
else:
- val = record[column.name.lower()]
+ val = record[column.name.lower()]
except AttributeError:
if (column.name == "Ipc"):
val = record.ref.ipc
@@ -65,6 +67,22 @@
else:
owner_list = None
return owner_list
+
+ def filter_rows(self, rows, values, options):
+ rows = super(HadoopAdapter, self).filter_rows(rows, values, options)
+ try:
+ if getattr(options, "parent_filter") is not None:
+ rows = self.filter_by_parent(rows, options.parent_filter)
+ except AttributeError, e:
+ pass
+ return rows
+
+ def filter_by_parent(self, rows, parent_filter):
+ filtered_rows = []
+ for row in rows:
+ if row[parent_filter["column"].field.index] == parent_filter["value"]:
+ filtered_rows.append(row)
+ return filtered_rows
class HadoopNodeDeleteForm(ObjectSelectorTaskForm):
def __init__(self, app, name, task, cls):
@@ -255,7 +273,7 @@
else:
setattr(self, prop.name, aviary_response[1][0][prop.name.lower()])
except AttributeError, e:
- print "Attribute error %s" % e
+ pass
self.Name = self.Ipc
self._id = self.Id
Modified: branches/elephant/cumin/python/cumin/gridhadoop/tasktracker.py
===================================================================
--- branches/elephant/cumin/python/cumin/gridhadoop/tasktracker.py 2013-02-13 20:25:56 UTC (rev 5704)
+++ branches/elephant/cumin/python/cumin/gridhadoop/tasktracker.py 2013-02-14 16:18:53 UTC (rev 5705)
@@ -56,14 +56,24 @@
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)
+ self.add_column(self.parent_id_col)
+ def get_data_options(self, session):
+ options = super(TaskTrackerTable, self).get_data_options(session)
+ options.parent_filter = {"column":self.parent_id_col, "value":self.frame.id.get(session)}
+ return options
+
class TaskTrackerColumn(ObjectLinkColumn):
def render_cell_href(self, session, record):
id = unescape_entity(record[self.id_field.index])
11 years, 2 months
r5704 - branches/elephant/cumin/python/cumin/gridhadoop
by croberts@fedoraproject.org
Author: croberts
Date: 2013-02-13 20:25:56 +0000 (Wed, 13 Feb 2013)
New Revision: 5704
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:
Deleting/stopping multiple nodes will no longer result in multiple notification banner messages. Refactored the ObjectSelectorTask's invoke to expect and act on a list as a whole.
Modified: branches/elephant/cumin/python/cumin/gridhadoop/datanode.py
===================================================================
--- branches/elephant/cumin/python/cumin/gridhadoop/datanode.py 2013-02-13 19:40:25 UTC (rev 5703)
+++ branches/elephant/cumin/python/cumin/gridhadoop/datanode.py 2013-02-13 20:25:56 UTC (rev 5704)
@@ -80,10 +80,10 @@
self.form = DataNodeDeleteForm(app, self.name, self, cls)
self.invoc = None
- def do_invoke(self, invoc, id, args):
+ def do_invoke(self, invoc, ids, args):
self.invoc = invoc
(hadoophost) = args
- self.app.remote.stop_data_node(hadoophost, [float(id)], invoc.make_callback())
+ self.app.remote.stop_data_node(hadoophost, ids, invoc.make_callback())
def get_title(self, session):
return "Remove data nodes"
@@ -229,7 +229,7 @@
class DataNodeObjectView(HadoopObjectView):
def add_details_tab(self):
- self.add_tab(DataNodeDetails(self.app, self.name + ".details", self.object))
+ self.add_tab(DataNodeDetails(self.app, "details", self.object))
def render_title(self, session):
obj = self.object.get(session)
Modified: branches/elephant/cumin/python/cumin/gridhadoop/hadoop.py
===================================================================
--- branches/elephant/cumin/python/cumin/gridhadoop/hadoop.py 2013-02-13 19:40:25 UTC (rev 5703)
+++ branches/elephant/cumin/python/cumin/gridhadoop/hadoop.py 2013-02-13 20:25:56 UTC (rev 5704)
@@ -272,4 +272,14 @@
def enter(self, session):
form_session = super(HadoopNodeDeleteTask, self).enter(session)
self.form.hadoophost.set(form_session, self.module.frame.children_by_name[self.module.frame.name + ".ghschedframe"].host.get(session))
- return form_session
\ No newline at end of file
+ return form_session
+
+ def invoke(self, session, selection, *args):
+ invoc = self.start(session, selection)
+
+ try:
+ self.do_invoke(invoc, selection, *args)
+ except Exception, e:
+ invoc.exception = e
+ invoc.status = invoc.FAILED
+ invoc.end()
Modified: branches/elephant/cumin/python/cumin/gridhadoop/jobtracker.py
===================================================================
--- branches/elephant/cumin/python/cumin/gridhadoop/jobtracker.py 2013-02-13 19:40:25 UTC (rev 5703)
+++ branches/elephant/cumin/python/cumin/gridhadoop/jobtracker.py 2013-02-13 20:25:56 UTC (rev 5704)
@@ -85,10 +85,10 @@
self.form = JobTrackerDeleteForm(app, self.name, self, cls)
self.invoc = None
- def do_invoke(self, invoc, id, args):
+ def do_invoke(self, invoc, ids, args):
self.invoc = invoc
(hadoophost) = args
- self.app.remote.stop_job_tracker(hadoophost, [float(id)], invoc.make_callback())
+ self.app.remote.stop_job_tracker(hadoophost, ids, invoc.make_callback())
def get_title(self, session):
return "Remove job trackers"
Modified: branches/elephant/cumin/python/cumin/gridhadoop/namenode.py
===================================================================
--- branches/elephant/cumin/python/cumin/gridhadoop/namenode.py 2013-02-13 19:40:25 UTC (rev 5703)
+++ branches/elephant/cumin/python/cumin/gridhadoop/namenode.py 2013-02-13 20:25:56 UTC (rev 5704)
@@ -147,10 +147,10 @@
self.form = NameNodeDeleteForm(app, self.name, self, cls)
self.invoc = None
- def do_invoke(self, invoc, id, args):
+ def do_invoke(self, invoc, ids, args):
self.invoc = invoc
(hadoophost) = args
- self.app.remote.stop_name_node(hadoophost, [float(id)], invoc.make_callback())
+ self.app.remote.stop_name_node(hadoophost, ids, invoc.make_callback())
def get_title(self, session):
return "Remove name nodes"
Modified: branches/elephant/cumin/python/cumin/gridhadoop/tasktracker.py
===================================================================
--- branches/elephant/cumin/python/cumin/gridhadoop/tasktracker.py 2013-02-13 19:40:25 UTC (rev 5703)
+++ branches/elephant/cumin/python/cumin/gridhadoop/tasktracker.py 2013-02-13 20:25:56 UTC (rev 5704)
@@ -80,10 +80,10 @@
self.form = TaskTrackerDeleteForm(app, self.name, self, cls)
self.invoc = None
- def do_invoke(self, invoc, id, args):
+ def do_invoke(self, invoc, ids, args):
self.invoc = invoc
(hadoophost) = args
- self.app.remote.stop_task_tracker(hadoophost, [float(id)], invoc.make_callback())
+ self.app.remote.stop_task_tracker(hadoophost, ids, invoc.make_callback())
def get_title(self, session):
return "Remove task trackers"
11 years, 2 months
r5703 - branches/elephant/cumin/python/cumin/gridhadoop
by croberts@fedoraproject.org
Author: croberts
Date: 2013-02-13 19:40:25 +0000 (Wed, 13 Feb 2013)
New Revision: 5703
Modified:
branches/elephant/cumin/python/cumin/gridhadoop/tasktracker.py
Log:
Correcting name of TaskTrackerObjectView
Modified: branches/elephant/cumin/python/cumin/gridhadoop/tasktracker.py
===================================================================
--- branches/elephant/cumin/python/cumin/gridhadoop/tasktracker.py 2013-02-13 19:36:42 UTC (rev 5702)
+++ branches/elephant/cumin/python/cumin/gridhadoop/tasktracker.py 2013-02-13 19:40:25 UTC (rev 5703)
@@ -296,7 +296,7 @@
class TaskTrackerObjectView(HadoopObjectView):
def add_details_tab(self):
- self.add_tab(TaskTrackerDetails(self.app, self.name + ".details", self.object))
+ self.add_tab(TaskTrackerDetails(self.app, "details", self.object))
def render_title(self, session):
obj = self.object.get(session)
11 years, 2 months
r5702 - branches/elephant/cumin/python/cumin/gridhadoop
by croberts@fedoraproject.org
Author: croberts
Date: 2013-02-13 19:36:42 +0000 (Wed, 13 Feb 2013)
New Revision: 5702
Modified:
branches/elephant/cumin/python/cumin/gridhadoop/datanode.py
branches/elephant/cumin/python/cumin/gridhadoop/datanode.strings
branches/elephant/cumin/python/cumin/gridhadoop/hadoop.py
branches/elephant/cumin/python/cumin/gridhadoop/hadoop.strings
branches/elephant/cumin/python/cumin/gridhadoop/jobtracker.py
branches/elephant/cumin/python/cumin/gridhadoop/jobtracker.strings
branches/elephant/cumin/python/cumin/gridhadoop/namenode.py
branches/elephant/cumin/python/cumin/gridhadoop/namenode.strings
branches/elephant/cumin/python/cumin/gridhadoop/tasktracker.py
branches/elephant/cumin/python/cumin/gridhadoop/tasktracker.strings
Log:
Now using the live objects for the Details view.
Modified: branches/elephant/cumin/python/cumin/gridhadoop/datanode.py
===================================================================
--- branches/elephant/cumin/python/cumin/gridhadoop/datanode.py 2013-02-13 18:58:59 UTC (rev 5701)
+++ branches/elephant/cumin/python/cumin/gridhadoop/datanode.py 2013-02-13 19:36:42 UTC (rev 5702)
@@ -4,6 +4,7 @@
from cumin.util import *
from cumin.qmfadapter import ObjectQmfAdapter
from cumin.task import Task, TaskLink
+from cumin.objectframe import ObjectDetails
from wooly.forms import StringField, ScalarField, OptionInputSet
@@ -219,21 +220,13 @@
def get_title(self, session):
retval = "Data node:'%s' (%s)" % (xml_escape(self.object.get(session).Name), xml_escape(self.object.get(session).Id))
return retval
-
+
def get_object(self, session, id):
- class Object(object):
- pass
- fake = Object()
- fake.Name = id
- fake.Id = id
- return fake
+ host = self.frame.host.get(session)
+ response = self.app.remote.get_data_node(self.frame.host.get(session), [id])
+ obj = HadoopObject(response, self.app.model.com_redhat_cumin_grid_hadoop.DataNode)
+ return obj
-# def get_object(self, session, id):
-# host = self.frame.host.get(session)
-# response = self.app.remote.get_data_node(self.frame.host.get(session), [id])
-# obj = HadoopObject(response, self.app.model.com_redhat_cumin_grid_hadoop.DataNode)
-# return obj
-
class DataNodeObjectView(HadoopObjectView):
def add_details_tab(self):
self.add_tab(DataNodeDetails(self.app, self.name + ".details", self.object))
@@ -252,9 +245,9 @@
def render_title(self, session):
return "Overview"
-class DataNodeDetails(Widget):
+class DataNodeDetails(HadoopObjectDetails):
def __init__(self, app, name, object):
- super(DataNodeDetails, self).__init__(app, name)
+ super(DataNodeDetails, self).__init__(app, name, object)
self.object = object
def render_title(self, session):
Modified: branches/elephant/cumin/python/cumin/gridhadoop/datanode.strings
===================================================================
--- branches/elephant/cumin/python/cumin/gridhadoop/datanode.strings 2013-02-13 18:58:59 UTC (rev 5701)
+++ branches/elephant/cumin/python/cumin/gridhadoop/datanode.strings 2013-02-13 19:36:42 UTC (rev 5702)
@@ -1,7 +0,0 @@
-[DataNodeDetails.html]
-<div class="{class}">
- <ul>
- <li>Name: {name}</li>
- <li>More details to come...</li>
- </ul>
-</div>
\ No newline at end of file
Modified: branches/elephant/cumin/python/cumin/gridhadoop/hadoop.py
===================================================================
--- branches/elephant/cumin/python/cumin/gridhadoop/hadoop.py 2013-02-13 18:58:59 UTC (rev 5701)
+++ branches/elephant/cumin/python/cumin/gridhadoop/hadoop.py 2013-02-13 19:36:42 UTC (rev 5702)
@@ -2,7 +2,7 @@
from cumin.objectselector import ObjectSelector, ObjectLinkColumn, ObjectTable,\
ObjectTableColumn, ObjectQmfTable, ObjectQmfSelectorTable, ObjectSelectorTaskForm, ObjectSelectorTask
-from cumin.objectframe import ObjectFrame, ObjectTaskForm
+from cumin.objectframe import ObjectFrame, ObjectTaskForm, ObjectDetails
from cumin.util import *
from cumin.qmfadapter import ObjectQmfAdapter
from cumin.task import Task, TaskLink
@@ -250,6 +250,8 @@
try:
if prop.name.lower() in ["id", "ipc"]:
setattr(self, prop.name, aviary_response[1][0]["ref"][prop.name.lower()])
+ elif prop.name.lower() in ["parent_id", "parent_ipc"]:
+ setattr(self, prop.name, aviary_response[1][0]["parent"][prop.name.lower().split("_")[1]])
else:
setattr(self, prop.name, aviary_response[1][0][prop.name.lower()])
except AttributeError, e:
@@ -261,8 +263,11 @@
name = self.__class__.__name__
args = (name, self._class, self._id, self._save_time)
return "%s(%s,%s,%s)" % args
+
+class HadoopObjectDetails(ObjectDetails):
+ def __init__(self, app, name, object):
+ super(HadoopObjectDetails, self).__init__(app, name, object)
-
class HadoopNodeDeleteTask(ObjectSelectorTask):
def enter(self, session):
form_session = super(HadoopNodeDeleteTask, self).enter(session)
Modified: branches/elephant/cumin/python/cumin/gridhadoop/hadoop.strings
===================================================================
--- branches/elephant/cumin/python/cumin/gridhadoop/hadoop.strings 2013-02-13 18:58:59 UTC (rev 5701)
+++ branches/elephant/cumin/python/cumin/gridhadoop/hadoop.strings 2013-02-13 19:36:42 UTC (rev 5702)
@@ -1 +1,2 @@
-[nothingyet]
\ No newline at end of file
+[HadoopObjectDetails.html]
+{props}
\ No newline at end of file
Modified: branches/elephant/cumin/python/cumin/gridhadoop/jobtracker.py
===================================================================
--- branches/elephant/cumin/python/cumin/gridhadoop/jobtracker.py 2013-02-13 18:58:59 UTC (rev 5701)
+++ branches/elephant/cumin/python/cumin/gridhadoop/jobtracker.py 2013-02-13 19:36:42 UTC (rev 5702)
@@ -4,6 +4,7 @@
from cumin.util import *
from cumin.qmfadapter import ObjectQmfAdapter
from cumin.task import Task, TaskLink
+from cumin.objectframe import ObjectDetails
from wooly.forms import StringField
@@ -214,12 +215,10 @@
return retval
def get_object(self, session, id):
- class Object(object):
- pass
- fake = Object()
- fake.Name = id
- fake.Id = id
- return fake
+ host = self.frame.host.get(session)
+ response = self.app.remote.get_job_tracker(self.frame.host.get(session), [id])
+ obj = HadoopObject(response, self.app.model.com_redhat_cumin_grid_hadoop.JobTracker)
+ return obj
class JobTrackerObjectView(HadoopObjectView):
def add_details_tab(self):
@@ -233,9 +232,9 @@
def render_title(self, session):
return "Task trackers"
-class JobTrackerDetails(Widget):
+class JobTrackerDetails(HadoopObjectDetails):
def __init__(self, app, name, object):
- super(JobTrackerDetails, self).__init__(app, name)
+ super(JobTrackerDetails, self).__init__(app, name, object)
self.object = object
def render_title(self, session):
@@ -244,4 +243,4 @@
def render_name(self, session):
'''sample....would only be called if JobTrackerDetails display was overridden to say {name}'''
obj = self.object.get(session)
- return obj.name
\ No newline at end of file
+ return obj.Name
\ No newline at end of file
Modified: branches/elephant/cumin/python/cumin/gridhadoop/jobtracker.strings
===================================================================
--- branches/elephant/cumin/python/cumin/gridhadoop/jobtracker.strings 2013-02-13 18:58:59 UTC (rev 5701)
+++ branches/elephant/cumin/python/cumin/gridhadoop/jobtracker.strings 2013-02-13 19:36:42 UTC (rev 5702)
@@ -1,7 +0,0 @@
-[JobTrackerDetails.html]
-<div class="{class}">
- <ul>
- <li>Name: {name}</li>
- <li>More details to come...</li>
- </ul>
-</div>
\ No newline at end of file
Modified: branches/elephant/cumin/python/cumin/gridhadoop/namenode.py
===================================================================
--- branches/elephant/cumin/python/cumin/gridhadoop/namenode.py 2013-02-13 18:58:59 UTC (rev 5701)
+++ branches/elephant/cumin/python/cumin/gridhadoop/namenode.py 2013-02-13 19:36:42 UTC (rev 5702)
@@ -4,6 +4,7 @@
from cumin.util import *
from cumin.qmfadapter import ObjectQmfAdapter
from cumin.task import Task, TaskLink
+
from wooly.forms import StringField
from hadoop import *
@@ -197,7 +198,7 @@
class NameNodeObjectView(HadoopObjectView):
def add_details_tab(self):
- self.add_tab(NameNodeDetails(self.app, self.name + ".details", self.object))
+ self.add_tab(NameNodeDetails(self.app, "details", self.object))
class NameNodeOverview(Widget):
def __init__(self, app, name, node, module):
@@ -207,9 +208,9 @@
def render_title(self, session):
return "Data nodes"
-class NameNodeDetails(Widget):
+class NameNodeDetails(HadoopObjectDetails):
def __init__(self, app, name, object):
- super(NameNodeDetails, self).__init__(app, name)
+ super(NameNodeDetails, self).__init__(app, name, object)
self.object = object
def render_title(self, session):
@@ -218,4 +219,4 @@
def render_name(self, session):
'''sample....would only be called if NameNodeDetails display was overridden to say {name}'''
obj = self.object.get(session)
- return obj.name
\ No newline at end of file
+ return obj.Name
\ No newline at end of file
Modified: branches/elephant/cumin/python/cumin/gridhadoop/namenode.strings
===================================================================
--- branches/elephant/cumin/python/cumin/gridhadoop/namenode.strings 2013-02-13 18:58:59 UTC (rev 5701)
+++ branches/elephant/cumin/python/cumin/gridhadoop/namenode.strings 2013-02-13 19:36:42 UTC (rev 5702)
@@ -1,7 +0,0 @@
-[NameNodeDetails.html]
-<div class="{class}">
- <ul>
- <li>Name: {name}</li>
- <li>More details to come...</li>
- </ul>
-</div>
\ No newline at end of file
Modified: branches/elephant/cumin/python/cumin/gridhadoop/tasktracker.py
===================================================================
--- branches/elephant/cumin/python/cumin/gridhadoop/tasktracker.py 2013-02-13 18:58:59 UTC (rev 5701)
+++ branches/elephant/cumin/python/cumin/gridhadoop/tasktracker.py 2013-02-13 19:36:42 UTC (rev 5702)
@@ -4,6 +4,7 @@
from cumin.util import *
from cumin.qmfadapter import ObjectQmfAdapter
from cumin.task import Task, TaskLink
+from cumin.objectframe import ObjectDetails
from wooly.forms import StringField
@@ -288,12 +289,10 @@
return retval
def get_object(self, session, id):
- class Object(object):
- pass
- fake = Object()
- fake.Name = id
- fake.Id = id
- return fake
+ host = self.frame.host.get(session)
+ response = self.app.remote.get_task_tracker(self.frame.host.get(session), [id])
+ obj = HadoopObject(response, self.app.model.com_redhat_cumin_grid_hadoop.TaskTracker)
+ return obj
class TaskTrackerObjectView(HadoopObjectView):
def add_details_tab(self):
@@ -313,9 +312,9 @@
def render_title(self, session):
return "Overview"
-class TaskTrackerDetails(Widget):
+class TaskTrackerDetails(HadoopObjectDetails):
def __init__(self, app, name, object):
- super(TaskTrackerDetails, self).__init__(app, name)
+ super(TaskTrackerDetails, self).__init__(app, name, object)
self.object = object
def render_title(self, session):
Modified: branches/elephant/cumin/python/cumin/gridhadoop/tasktracker.strings
===================================================================
--- branches/elephant/cumin/python/cumin/gridhadoop/tasktracker.strings 2013-02-13 18:58:59 UTC (rev 5701)
+++ branches/elephant/cumin/python/cumin/gridhadoop/tasktracker.strings 2013-02-13 19:36:42 UTC (rev 5702)
@@ -1,7 +0,0 @@
-[TaskTrackerDetails.html]
-<div class="{class}">
- <ul>
- <li>Name: {name}</li>
- <li>More details to come...</li>
- </ul>
-</div>
\ No newline at end of file
11 years, 2 months