Author: croberts Date: 2012-12-18 14:39:40 +0000 (Tue, 18 Dec 2012) New Revision: 5614
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: Uptime columns now displayed nicely.
Modified: branches/elephant/cumin/python/cumin/gridhadoop/datanode.py =================================================================== --- branches/elephant/cumin/python/cumin/gridhadoop/datanode.py 2012-12-18 14:34:49 UTC (rev 5613) +++ branches/elephant/cumin/python/cumin/gridhadoop/datanode.py 2012-12-18 14:39:40 UTC (rev 5614) @@ -46,7 +46,7 @@ self.id_col = ObjectTableColumn(app, "idcol", cls.Id) self.sub_col = SubmittedColumn(app, "sub", cls.Submitted) self.state_col = ObjectTableColumn(app, "statecol", cls.State) - self.uptime_col = ObjectTableColumn(app, "uptimecol", cls.Uptime) + self.uptime_col = UptimeColumn(app, "uptimecol", cls.Uptime) self.owner_col = ObjectTableColumn(app, "ownercol", cls.Owner)
self.add_column(self.id_col)
Modified: branches/elephant/cumin/python/cumin/gridhadoop/hadoop.py =================================================================== --- branches/elephant/cumin/python/cumin/gridhadoop/hadoop.py 2012-12-18 14:34:49 UTC (rev 5613) +++ branches/elephant/cumin/python/cumin/gridhadoop/hadoop.py 2012-12-18 14:39:40 UTC (rev 5614) @@ -206,4 +206,12 @@ d = super(SubmittedColumn, self).\ render_cell_content(session, data) datestring = datetime.fromtimestamp(d).strftime('%Y-%m-%d %H:%M:%S') - return datestring \ No newline at end of file + return datestring + +class UptimeColumn(ObjectTableColumn): + def render_cell_content(self, session, record): + value = self.field.get_content(session, record) + 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
Modified: branches/elephant/cumin/python/cumin/gridhadoop/jobtracker.py =================================================================== --- branches/elephant/cumin/python/cumin/gridhadoop/jobtracker.py 2012-12-18 14:34:49 UTC (rev 5613) +++ branches/elephant/cumin/python/cumin/gridhadoop/jobtracker.py 2012-12-18 14:39:40 UTC (rev 5614) @@ -52,7 +52,7 @@ self.ipc_col.width = "20%" self.sub_col = SubmittedColumn(app, "sub", cls.Submitted) self.state_col = ObjectTableColumn(app, "statecol", cls.State) - self.uptime_col = ObjectTableColumn(app, "uptimecol", cls.Uptime) + self.uptime_col = UptimeColumn(app, "uptimecol", cls.Uptime) self.owner_col = ObjectTableColumn(app, "ownercol", cls.Owner)
self.add_column(self.id_col)
Modified: branches/elephant/cumin/python/cumin/gridhadoop/namenode.py =================================================================== --- branches/elephant/cumin/python/cumin/gridhadoop/namenode.py 2012-12-18 14:34:49 UTC (rev 5613) +++ branches/elephant/cumin/python/cumin/gridhadoop/namenode.py 2012-12-18 14:39:40 UTC (rev 5614) @@ -47,7 +47,7 @@ self.ipc_col.width = "20%" self.sub_col = SubmittedColumn(app, "sub", cls.Submitted) self.state_col = ObjectTableColumn(app, "statecol", cls.State) - self.uptime_col = ObjectTableColumn(app, "uptimecol", cls.Uptime) + self.uptime_col = UptimeColumn(app, "uptimecol", cls.Uptime) self.owner_col = ObjectTableColumn(app, "ownercol", cls.Owner)
self.add_column(self.id_col)
Modified: branches/elephant/cumin/python/cumin/gridhadoop/tasktracker.py =================================================================== --- branches/elephant/cumin/python/cumin/gridhadoop/tasktracker.py 2012-12-18 14:34:49 UTC (rev 5613) +++ branches/elephant/cumin/python/cumin/gridhadoop/tasktracker.py 2012-12-18 14:39:40 UTC (rev 5614) @@ -50,7 +50,7 @@ self.id_col = ObjectTableColumn(app, "idcol", cls.Id) self.sub_col = SubmittedColumn(app, "sub", cls.Submitted) self.state_col = ObjectTableColumn(app, "statecol", cls.State) - self.uptime_col = ObjectTableColumn(app, "uptimecol", cls.Uptime) + self.uptime_col = UptimeColumn(app, "uptimecol", cls.Uptime) self.owner_col = ObjectTableColumn(app, "ownercol", cls.Owner)
self.add_column(self.id_col)
cumin-developers@lists.fedorahosted.org