cumin-developers March 2011

cumin-developers@lists.fedorahosted.org

2 participants
111 discussions

r4594 - branches/scale_testing/cumin/python/cumin/grid
by tmckay＠fedoraproject.org 09 Mar '11

09 Mar '11

Author: tmckay Date: 2011-03-09 16:17:14 +0000 (Wed, 09 Mar 2011) New Revision: 4594 Added: branches/scale_testing/cumin/python/cumin/grid/dashboard.py branches/scale_testing/cumin/python/cumin/grid/dashboard.strings Log: Adds for dashboard stuff somehow missed in merge Added: branches/scale_testing/cumin/python/cumin/grid/dashboard.py =================================================================== --- branches/scale_testing/cumin/python/cumin/grid/dashboard.py (rev 0) +++ branches/scale_testing/cumin/python/cumin/grid/dashboard.py 2011-03-09 16:17:14 UTC (rev 4594) @@ -0,0 +1,881 @@ +import logging + +from wooly import Widget, Attribute +from wooly.util import StringCatalog +from wooly.datatable import DataAdapterOptions, DataAdapterField +from wooly.table import TableHeader +from wooly.widgets import TabbedModeSet + +from cumin.sqladapter import ObjectSqlAdapter +from cumin.stat import StatSet, PieChartPage, StatFlashChart +from rosemary.sqlquery import SqlQueryOptions +from cumin.objectselector import ObjectSelector, MonitorSelfStatColumn, ObjectTableColumn, ObjectTable,\ + ObjectLinkColumn +from cumin.util import rgb_to_string +from negotiator import NegotiatorAttribute + +strings = StringCatalog(__file__) +log = logging.getLogger("cumin.dashboard") + +class PoolDashboard(Widget): + def __init__(self, app, name, collector): + super(PoolDashboard, self).__init__(app, name) + + self.collector = collector + + overview = DashboardOverview(app, "overview", collector) + self.add_child(overview) + + performance = DashboardPerformance(app, "performance", collector) + self.add_child(performance) + + capacity = DashboardCapacity(app, "capacity", collector) + self.add_child(capacity) + + stats = DashboardNegotiatorStatSet(app, "other_stats", collector) + self.add_child(stats) + + def render_title(self, session): + return "Dashboard" + +class DashboardOverview(Widget): + def __init__(self, app, name, collector): + super(DashboardOverview, self).__init__(app, name) + + job_data = DashboardOverviewJobSummary(app, "jobs_summary", collector) + self.add_child(job_data) + + slot_data = GridSlotsSummary(app, "slots_summary", collector) + self.add_child(slot_data) + + os_data = GridOSBreakdown(app, "os_breakdown", collector) + self.add_child(os_data) + + def render_title(self, session): + return "Overview" + +class DashboardPerformance(Widget): + def __init__(self, app, name, collector): + super(DashboardPerformance, self).__init__(app, name) + + cls = app.model.com_redhat_grid.Collector + c = MonitorSelfStats(app, "ms_c", collector, cls, "Collector Performance", None) + self.add_child(c) + + cls = app.model.com_redhat_grid.Negotiator + frame = "main.grid.negotiator" + n = MonitorSelfStats(app, "ms_n", collector, cls, "Negotiator Performance", frame) + self.add_child(n) + + s = MonitorSelfSchedulerTable(app, "ms_s", collector) + self.add_child(s) + + neg_through = NegotiatorJobThroughput(app, "negotiator_throughput", collector) + self.add_child(neg_through) + + neg_cycles = NegotiatorCycles(app, "negotiator_cycles", collector) + self.add_child(neg_cycles) + + neg_slots = NegotiatorSlots(app, "negotiator_slots", collector) + self.add_child(neg_slots) + + def render_title(self, session): + return "Scheduler Performance" + +class DashboardCapacity(Widget): + def __init__(self, app, name, collector): + super(DashboardCapacity, self).__init__(app, name) + + capacity = DashboardCapacitySlotSummary(app, "slot_capacity", collector) + self.add_child(capacity) + + def render_title(self, session): + return "Slot Capacity" + +class DefinitionSet(StatSet): + pass + +# Displays a pie chart and a set of stats as the legend +# The legend is a definition list with the dt being the stat name +# and the dd being the value +# Supports a stat being marked as a "Totals" line, in which case +# the stat isn't put in the pie chart +class PieStatSet(DefinitionSet): + radius = 60 + def __init__(self, app, name, object): + super(PieStatSet, self).__init__(app, name, object) + + self.color_scheme = PieChartPage.RAINBOW + + # determines if a line is drawn under the legend + self.has_total = False + + # if this gets defined, this widget will have a link to display + # the chart in a popup + self.chart = None + + # don't show this if our object isn't there + def do_render(self, session): + object = self.object.get(session) + if object: + return super(PieStatSet, self).do_render(session) + + def get_pie_slices(self, session): + # don't include total lines, convert None to 0 + items = self.do_get_items(session) + return [self.render_item_value(session, x) or 0 for x in items if not self.is_total(x)] + + def render_width(self, session): + # basically hides the pie chart if all slices are 0 + slices = self.get_pie_slices(session) + return sum(slices) and self.radius * 2 or 0 + + def render_height(self, session): + return self.render_width(session) + + def render_pie_src(self, session): + slices = self.get_pie_slices(session) + return PieChartPage.get_href(slices, self.color_scheme, self.radius) + + # we generate the style sheet for the legend based on + # the colors defined in the PieChartPage + def render_legend_styles(self, session): + colors = PieChartPage.color_schemes[self.color_scheme] + styles = list() + for color in colors: + hx = rgb_to_string(*color) + styles.append(".DefinitionSet dt.legend%s span { background-color: #%s;}" % (hx, hx)) + return "\n".join(styles) + + # don't put a line under the legend if there is a total + def render_class(self, session): + cls = super(PieStatSet, self).render_class(session) + return "%s%s" % (cls, self.has_total and " hastotal" or "") + + def is_total(self, item): + return False + + # the color block next to each legend line is based on the class + def render_legend_class(self, session, item): + classes = list() + if self.is_total(item): + classes.append("total") + if self.render_width(session) == 0: + classes.append("blank") + + if not len(classes): + classes.append(self.get_legend_class(session, item)) + return " ".join(classes) + + def render_dd_class(self, session, item): + dt_class = self.render_legend_class(session, item) + return "total" is dt_class and " class=\"total\"" or "" + + # don't show a chart icon on hover if there is no chart + def render_span_class(self, session): + return self.chart and "chart" or "blank" + + def render_chart_href(self, session): + if self.chart: + return self.page.get_popup_url(session, self.chart) + +class AliasSqlColumn(object): + def __init__(self, identifier, alias): + self.identifier = identifier + self.alias = alias + +class MinimalTable(ObjectTable): + def __init__(self, app, name, cls): + super(MinimalTable, self).__init__(app, name, cls) + + # no font or page control + self.header = self.MinimalTableHeader(app, "header") + self.replace_child(self.header) + + # no footer + self.footer = Widget(app, "footer") + self.replace_child(self.footer) + + # no checkboxes or id field + self.adapter = self.MinimalAdapter(app, cls) + + class MinimalAdapter(ObjectSqlAdapter): + def get_id_field(self, cls): + return None + + class MinimalTableHeader(TableHeader): + def __init__(self, app, name): + super(MinimalTable.MinimalTableHeader, self).__init__(app, name) + + self.font = Attribute(app, "font") + self.font.default = 0.9 + self.add_attribute(self.font) + + self.limit = Attribute(app, "limit") + self.limit.default = 25 + self.add_attribute(self.limit) + + self.offset = Attribute(app, "offset") + self.offset.default = 0 + self.add_attribute(self.offset) + +# The following columns and fields should probably be moved +# to a more general location +class DerivedTableColumn(ObjectTableColumn): + def __init__(self, app, name): + super(DerivedTableColumn, self).__init__(app, name, None) + + def init(self): + # avoid ObjectTableColumn's init() since we are setting up our own field + super(ObjectTableColumn, self).init() + + self.field = self.get_field() + + def get_field(self): + raise "Not Implemented" + +class QuotientSqlField(DataAdapterField): + def __init__(self, adapter, name, attr1, attr2, title=None): + super(QuotientSqlField, self).__init__(adapter, name, float) + + self.title = title and title or name + + # attr1 and 2 could be strings or they could be rosemary attributes + try: + id1 = attr1.sql_column.identifier + except AttributeError: + id1 = attr1 + try: + id2 = attr2.sql_column.identifier + except AttributeError: + id2 = attr2 + + # avoid divide by 0 by using nullif + nullif = "NULLIF(%s,0)" % id2 + identifier = "(%s/%s)" % (id1, nullif) + + # we need an alias if we sort on this column + alias = self.name + self.column = AliasSqlColumn(identifier, alias) + + self.adapter.columns.append(self.column) + self.format = "%0.02f%%" + + def get_title(self, session): + return self.title + +class SumSqlField(DataAdapterField): + def __init__(self, adapter, name, attr, title=None): + super(SumSqlField, self).__init__(adapter, name, float) + + self.title = title and title or name + + identifier = "sum(%s)" % (attr.sql_column.identifier) + + # we need an alias if we sort on this column + alias = self.name + self.column = AliasSqlColumn(identifier, alias) + + self.adapter.columns.append(self.column) + + def get_title(self, session): + return self.title + +# Create a sortable column that is the quotient of two extisting columns +class QuotientSqlColumn(DerivedTableColumn): + def __init__(self, app, name, attr1, attr2): + super(QuotientSqlColumn, self).__init__(app, name) + + self.attr1 = attr1 + self.attr2 = attr2 + self.title = name + + def get_field(self): + return QuotientSqlField(self.table.adapter, self.name, self.attr1, self.attr2, self.title) + + def init(self): + super(QuotientSqlColumn, self).init() + + # change quotient into a percent + self.field.column.identifier = "%s*100" % self.field.column.identifier + +# Create a sortable column that is the sum of two extisting columns +class SumSqlColumn(DerivedTableColumn): + def __init__(self, app, name, attr, title): + super(SumSqlColumn, self).__init__(app, name) + + self.attr = attr + self.title = title + self.format_method = getattr(attr, "unit", None) + + def get_field(self): + field = SumSqlField(self.table.adapter, self.name, self.attr, self.title) + if self.format_method: + if self.format_method == "MiB": + format_method = self.fmt_mb + elif self.format_method == "KiB": + format_method = self.fmt_kb + else: + format_method = self.fmt_b + + field.format = format_method + return field + +class DashboardSumData(ObjectSqlAdapter): + def __init__(self, app, columns, collector, cls): + super(DashboardSumData, self).__init__(app, cls) + + self.collector = collector + self.add_value_filter(cls.Pool) + + for column in columns: + col = "sum(\"%s\")" % column + self.columns.append(col) + # add a count field so we can calculate averages + self.columns.append("count(1)") + + def get_id_field(self, cls): + return None + + def get_record(self, session): + values = dict() + obj = self.collector.get(session) + values[self.cls.Pool.name] = getattr(obj, self.cls.Pool.name) + + options = DataAdapterOptions() + options.offset = 0 + + records = self.get_data(values, options) + + return records[0] + +class DashboardSummarySet(PieStatSet): + def __init__(self, app, name, collector, cls, columns): + super(DashboardSummarySet, self).__init__(app, name, collector) + + self.record = Attribute(app, "totals") + self.add_attribute(self.record) + + # XXX - consider using an ObjectSelector with SumSqlColumns as the data source + self.columns = columns + self.sum_columns = [x.name for x in columns] + self.sum_cls = cls + self.data = DashboardSumData(app, self.sum_columns, collector, self.sum_cls) + + self.has_total = True + self.color_scheme = PieChartPage.BLUES + + def do_process(self, session): + record = self.data.get_record(session) + self.record.set(session, record) + + super(DashboardSummarySet, self).do_process(session) + + def do_get_items(self, session): + return self.columns + + def is_total(self, item): + index = self.sum_columns.index(item.name) + return index == len(self.sum_columns) - 1 + + def render_item_title(self, session, item): + return item.title + + def render_item_value(self, session, item): + record = self.record.get(session) + return record[self.sum_columns.index(item.name)] or 0 + + def render_html_title(self, session, item): + return item.description + + def get_legend_class(self, session, item): + index = self.sum_columns.index(item.name) + return "legend%s" % rgb_to_string(*(PieChartPage.color_schemes[self.color_scheme][index])) + +class DashboardOverviewJobSummary(DashboardSummarySet): + def __init__(self, app, name, collector): + cls = app.model.com_redhat_grid.Scheduler + columns = [cls.TotalRunningJobs, cls.TotalHeldJobs, cls.TotalIdleJobs, + cls.TotalRemovedJobs, cls.TotalJobAds] + + super(DashboardOverviewJobSummary, self).__init__(app, name, collector, cls, columns) + + self.color_scheme = PieChartPage.GREENS + + def render_title(self, session): + return "Job Summary Info" + +class DashboardCapacitySlotSummary(ObjectSelector): + def __init__(self, app, name, collector): + cls = app.model.com_redhat_grid.Slot + super(DashboardCapacitySlotSummary, self).__init__(app, name, cls) + + self.add_filter(collector, cls.Pool) + + stat = self.DiskTotalColumn(app, "disk", cls.Disk, "Disk Total") + stat.static_header = True + self.add_column(stat) + + stat = SumSqlColumn(app, "slot_mem_used", cls.ImageSize, "Memory Used") + stat.static_header = True + self.add_column(stat) + stat = SumSqlColumn(app, "memtotal", cls.Memory, "Memory Total") + stat.static_header = True + self.add_column(stat) + stat = QuotientSqlColumn(app, "percentmem", + "sum(%s)" % cls.ImageSize.sql_column.identifier, + "sum(%s)*1024" % cls.Memory.sql_column.identifier) + stat.static_header = True + stat.title = "% Memory Used" + self.add_column(stat) + + self.enable_csv_export(collector) + + def create_table(self, app, name, cls): + # avoid the checkboxes + return MinimalTable(app, name, cls) + + class DiskTotalColumn(SumSqlColumn): + def render_text_align(self, session): + return "left" + +class GridSlotsSummary(PieStatSet): + def __init__(self, app, name, collector): + super(GridSlotsSummary, self).__init__(app, name, collector) + + self.attrs = ["HostsClaimed", "HostsUnclaimed", + "HostsOwner", "HostsTotal"] + + self.has_total = True + self.color_scheme = PieChartPage.BLUES + + self.chart = StatFlashChart(app, "popup", collector) + self.chart.stats = self.attrs + self.add_child(self.chart) + + def render_title(self, session): + return "Host Summary Info" + + def is_total(self, item): + index = self.attrs.index(item[0].name) + return index == len(self.attrs) - 1 + + def get_legend_class(self, session, item): + index = self.attrs.index(item[0].name) + return "legend%s" % rgb_to_string(*(PieChartPage.color_schemes[self.color_scheme][index])) + +class DashboardOSData(ObjectSqlAdapter): + def __init__(self, app, collector): + cls = app.model.com_redhat_grid.Slot + super(DashboardOSData, self).__init__(app, cls) + + self.collector = collector + self.add_value_filter(cls.Pool) + + self.sum_column = "\"OpSys\"" + + col = "count(%s)" % self.sum_column + self.columns.append(self.sum_column) + self.columns.append(col) + + self.act_state_column = AliasSqlColumn("\"Activity\"||\"State\"", "actstate") + self.columns.append(self.act_state_column) + + def get_records(self, session): + values = dict() + obj = self.collector.get(session) + values[self.cls.Pool.name] = getattr(obj, self.cls.Pool.name) + + options = SqlQueryOptions() + options.sort_column = self.sum_column + options.group_column = ",".join((self.sum_column, self.act_state_column.identifier)) + + records = self.get_data(values, options) + + # accumulate records by os/used|unused manually + recs_by_os = dict() + for record in records: + os, count, act_state = record + if os not in recs_by_os: + recs_by_os[os] = dict() + recs_by_os[os]["total"] = 0 + recs_by_os[os]["used"] = 0 + recs_by_os[os]["unused"] = 0 + recs_by_os[os]["total"] += count + if act_state == "IdleUnclaimed": + recs_by_os[os]["unused"] += count + else: + recs_by_os[os]["used"] += count + + records = list() + for os in recs_by_os: + records.append(("%s Used" % os, recs_by_os[os]["used"])) + records.append(("%s Unused" % os, recs_by_os[os]["unused"])) + records.append(("%s Total" % os, recs_by_os[os]["total"])) + + ########## dummy test data + """ + records.append(("WINNT80 Used", 10)) + records.append(("WINNT80 Unused", 20)) + records.append(("WINNT80 Total", 30)) + records.append(("SOLARIS27 Used", 12)) + records.append(("SOLARIS27 Unused", 34)) + records.append(("SOLARIS27 Total", 46)) + """ + + return records + + def get_sql_options(self, options): + return options + + def get_id_field(self, cls): + return None + +class GridOSBreakdown(PieStatSet): + def __init__(self, app, name, collector): + super(GridOSBreakdown, self).__init__(app, name, collector) + + self.os_records = Attribute(app, "os_breakdown") + self.add_attribute(self.os_records) + + self.os_data = DashboardOSData(app, collector) + + self.color_scheme = PieChartPage.GROUP2 + self.has_total = True + + def do_process(self, session): + os_records = self.os_data.get_records(session) + self.os_records.set(session, os_records) + + super(GridOSBreakdown, self).do_process(session) + + def do_render(self, session): + records = self.os_records.get(session) + if len(records): + return super(GridOSBreakdown, self).do_render(session) + + def render_title(self, session): + return "Slot Breakdown by OS" + + def do_get_items(self, session): + return [(i, x) for i, x in enumerate(self.os_records.get(session))] + + def is_total(self, item): + _, record = item + return "Total" in record[0] + + def render_item_title(self, session, item): + _, record = item + return record[0] + + def render_item_value(self, session, item): + _, record = item + return record[1] + + def render_html_title(self, session, item): + return None + + def get_legend_class(self, session, this_item): + items = self.do_get_items(session) + real_index = 0 + for item in items: + if item[1][0] is this_item[1][0]: + break + if not self.is_total(item): + real_index += 1 + return "legend%s" % rgb_to_string(*(PieChartPage.color_schemes[self.color_scheme][real_index])) + +class NegotiatorDefinitionStatSet(PieStatSet): + def __init__(self, app, name, collector): + negotiator = NegotiatorAttribute(app, "neg", collector) + super(NegotiatorDefinitionStatSet, self).__init__(app, name, negotiator) + self.add_attribute(negotiator) + + self.chart = StatFlashChart(app, "popup", negotiator) + self.add_child(self.chart) + + def is_total(self, item): + if not self.has_total: + return False + index = self.attrs.index(item[0].name) + return index == len(self.attrs) - 1 + + def get_legend_class(self, session, item): + index = self.attrs.index(item[0].name) + return "legend%s" % rgb_to_string(*(PieChartPage.color_schemes[self.color_scheme][index])) + + def render_item_value(self, session, item): + _, value = item + if value is None: + return 0 + return super(NegotiatorDefinitionStatSet, self).render_item_value(session, item) + +class NegotiatorJobThroughput(NegotiatorDefinitionStatSet): + def __init__(self, app, name, collector): + super(NegotiatorJobThroughput, self).__init__(app, name, collector) + + self.attrs = ["NumJobsConsidered", "Rejections"] + self.chart.stats = self.attrs + + self.has_total = False + self.color_scheme = PieChartPage.RAINBOW + + def render_title(self, session): + return "Negotiator Job Throughput" + + +class NegotiatorCycles(NegotiatorDefinitionStatSet): + def __init__(self, app, name, collector): + super(NegotiatorCycles, self).__init__(app, name, collector) + + self.attrs = ["Phase1Duration", "Phase2Duration", "Phase3Duration", "Phase4Duration", "Duration"] + self.chart.stats = self.attrs + + self.has_total = True + self.color_scheme = PieChartPage.RAINBOW + + def render_title(self, session): + return "Negotiator Cycles" + +class NegotiatorSlots(NegotiatorDefinitionStatSet): + def __init__(self, app, name, collector): + super(NegotiatorSlots, self).__init__(app, name, collector) + + self.attrs = ["TrimmedSlots", "CandidateSlots", "TotalSlots"] + self.chart.stats = self.attrs + + self.has_total = True + + def render_title(self, session): + return "Negotiator Slots" + + def render_width(self, session): + # disable the pie chart since these stats don't add up to a total + return 0 + +class NegotiatorSlotsChart(Widget): + def __init__(self, app, name, pool): + super(NegotiatorSlotsChart, self).__init__(app, name) + + self.pool = pool + cls = app.model.com_redhat_grid.Negotiator + self.object = RosemaryPoolObjectAttribute(app, "obj", pool, cls) + self.add_attribute(self.object) + + slots = self.SlotsChart(app, "slots", self.object) + slots.stats = ("TotalSlots", "TrimmedSlots", "CandidateSlots") + self.add_child(slots) + + def do_render(self, session): + object = self.object.get(session) + if object: + return super(NegotiatorSlotsChart, self).do_render(session) + + class SlotsChart(StatFlashChart): + def render_title(self, session, *args): + return "Slots Precessed" + +class MonitorSelfSchedulerTable(Widget): + def __init__(self, app, name, pool): + super(MonitorSelfSchedulerTable, self).__init__(app, name) + + cls = app.model.com_redhat_grid.Scheduler + frame = "main.grid.scheduler" + + self.table = MonitorSelfTable(app, "current", pool, cls, frame, False) + self.add_child(self.table) + + def render_title(self, session): + return "Scheduler Performance" + + def render_table(self, session): + return self.table.render(session) + +class MonitorSelfStats(Widget): + def __init__(self, app, name, pool, cls, title, frame): + super(MonitorSelfStats, self).__init__(app, name) + + self.pool = pool + self.cls = cls + self.frame = frame + + self.object = RosemaryPoolObjectAttribute(app, "obj", pool, cls) + self.add_attribute(self.object) + + title_widget = self.MonitorSelfTitle(app, "title", self.object, title) + self.add_child(title_widget) + + tabs = TabbedModeSet(app, "tabs") + self.add_child(tabs) + + self.chart = MonitorSelfCharts(app, "history", pool, cls, self.object) + tabs.add_tab(self.chart) + tabs.add_tab(MonitorSelfTable(app, "current", pool, cls, frame, True)) + + def do_render(self, session): + if self.object.get(session): + return super(MonitorSelfStats, self).do_render(session) + + class MonitorSelfTitle(Widget): + def __init__(self, app, name, object, title): + super(MonitorSelfStats.MonitorSelfTitle, self).__init__(app, name) + + self.object = object + self.title = title + + def render_title(self, session): + return self.title + +class MonitorSelfTable(ObjectSelector): + def __init__(self, app, name, pool, cls, frame, static): + super(MonitorSelfTable, self).__init__(app, name, cls) + + self.pool = pool + self.add_filter(self.pool, cls.Pool) + + # Do we want the name column to link to the objects page? + # In the case of collector we don't + if frame: + col = ObjectLinkColumn(app, "name", cls.Name, cls._id, frame) + else: + col = ObjectTableColumn(app, cls.Name.name, cls.Name) + col.static_header = static + self.add_column(col) + + stat = MonitorSelfStatColumn(app, cls.MonitorSelfAge.name, cls.MonitorSelfAge) + stat.static_header = True + self.add_column(stat) + + stat = MonitorSelfStatColumn(app, cls.MonitorSelfRegisteredSocketCount.name, cls.MonitorSelfRegisteredSocketCount) + stat.static_header = True + self.add_column(stat) + + stat = MonitorSelfStatColumn(app, cls.MonitorSelfCPUUsage.name, cls.MonitorSelfCPUUsage) + stat.static_header = True + self.add_column(stat) + + stat = MonitorSelfStatColumn(app, cls.MonitorSelfResidentSetSize.name, cls.MonitorSelfResidentSetSize) + stat.static_header = True + self.add_column(stat) + + stat = MonitorSelfStatColumn(app, cls.MonitorSelfImageSize.name, cls.MonitorSelfImageSize) + stat.static_header = True + self.add_column(stat) + + stat = QuotientSqlColumn(app, "used", cls.MonitorSelfResidentSetSize, + cls.MonitorSelfImageSize) + stat.static_header = True + stat.title = "% Used" + self.add_column(stat) + + self.enable_csv_export(pool) + + def create_table(self, app, name, cls): + # avoid the checkboxes + return MinimalTable(app, name, cls) + + def render_title(self, session): + return "Current" + +class MonitorSelfCharts(Widget): + def __init__(self, app, name, pool, cls, object): + super(MonitorSelfCharts, self).__init__(app, name) + + self.pool = pool + self.cls = cls + + cpu = self.CPUFlashChart(app, "cpu", object) + cpu.stats = ("MonitorSelfCPUUsage",) + self.add_child(cpu) + + used = self.MemoryFlashChart(app, "used", object) + used.chart_type = "percent" + used.stats = ("MonitorSelfResidentSetSize",) + self.add_child(used) + + def render_title(self, session): + return "History" + + class CPUFlashChart(StatFlashChart): + def render_title(self, session, *args): + return "CPU Usage" + + class MemoryFlashChart(StatFlashChart): + def render_title(self, session, *args): + return "Memory Usage" + + def get_href_params(self, session): + params = super(MonitorSelfCharts.MemoryFlashChart, self).get_href_params(session) + params.append("tp=MonitorSelfImageSize") + + return params + +class RosemaryPoolObjectAttribute(Attribute): + def __init__(self, app, name, pool, cls): + super(RosemaryPoolObjectAttribute, self).__init__(app, name) + + self.pool = pool + self.cls = cls + + def get(self, session): + obj = self.pool.get(session) + return self.cls.get_object(session.cursor, Pool=obj.Pool) + +class DashboardNegotiatorStatSet(Widget): + def __init__(self, app, name, collector): + super(DashboardNegotiatorStatSet, self).__init__(app, name) + + self.stats = self.NegotiatorStatSet(app, "stats", collector) + self.add_child(self.stats) + + def do_render(self, session): + object = self.stats.object.get(session) + if object: + return super(DashboardNegotiatorStatSet, self).do_render(session) + + def render_title(self, session): + return "Other Negotiator Statistics" + + class NegotiatorStatSet(StatSet): + def __init__(self, app, name, collector): + negotiator = NegotiatorAttribute(app, "neg", collector) + super(DashboardNegotiatorStatSet.NegotiatorStatSet, self).__init__(app, name, negotiator) + self.add_attribute(negotiator) + + self.attrs = ("MatchRate", "MatchRateSustained", "Matches", + "SlotShareIter", "NumSchedulers", "ActiveSubmitterCount", "NumIdleJobs", + "SubmittersFailed", "SubmittersOutOfTime", "SubmittersShareLimit", + "Time", "End", "Period") + + # create a chart for each statistic + # I wonder if there is a way to use a single instance + # of the StatFlashChart class to do this + cls = app.model.com_redhat_grid.Negotiator + self.popup_charts = dict() + for attr in self.attrs: + # don't try and chart the strings + if cls._statistics_by_name[attr].type != "lstr": + chart = StatFlashChart(app, "popup%s" % attr, self.object) + chart.stats = [attr] + self.popup_charts[attr] = chart + self.add_child(chart) + + def render_chart_href(self, session, item): + stat, _ = item + try: + chart = self.popup_charts[stat.name] + except KeyError: + # some of the attrs were not added to the chart list + return + + return self.page.get_popup_url(session, chart) + + def render_chart_class(self, session, item): + stat, _ = item + return stat.name in self.popup_charts and "chart" or "blank" + + def render_span_title(self, session, item): + stat, _ = item + return stat.name in self.popup_charts and \ + "Click to show a chart of this statistic" or \ + "" Added: branches/scale_testing/cumin/python/cumin/grid/dashboard.strings =================================================================== --- branches/scale_testing/cumin/python/cumin/grid/dashboard.strings (rev 0) +++ branches/scale_testing/cumin/python/cumin/grid/dashboard.strings 2011-03-09 16:17:14 UTC (rev 4594) @@ -0,0 +1,221 @@ +[PoolDashboard.html] + {overview} + <div style="clear:both;"></div> + {performance} + <div style="clear:both; padding-top:2em;"></div> + {capacity} + <div style="clear:both;"></div> + {other_stats} + <div style="clear:both;"></div> + +[DashboardOverview.html] + {os_breakdown} + {slots_summary} + {jobs_summary} + +[DashboardPerformance.css] +div.DashboardPerformance { + width: 1000px; +} + +div.DashboardPerformance div.TabbedModeSet { + min-height: 6em; +} + +[DashboardPerformance.html] + {negotiator_throughput} + {negotiator_cycles} + {negotiator_slots} +<div id="{id}" class="{class}"> + {ms_s} + {ms_c} + {ms_n} +</div> + +[MonitorSelfTitle.html] +<h3>{title}</h3> + +[MonitorSelfSchedulerTable.css] +div.MonitorSelfSchedulerTable { + margin-bottom: 3em; +} + +[MonitorSelfSchedulerTable.html] +<div id="{id}" class="{class}"> + <h3>{title}</h3> + {table} +</div> + +[DashboardCapacity.css] +div.DashboardCapacity { + width: 1000px; +} +[DashboardCapacity.html] +<div id="{id}" class="{class}"> +<h3>{title}</h3> + {slot_capacity} +</div> + +[DefinitionSet.css] +div.DefinitionSet { + float: left; + margin-right: 2em; +} + +div.DefinitionSet h3 { + margin-top: 0.5em; +} + +.DefinitionSet dl { + border-bottom: 1px solid #999999; + clear: left; + float: right; + margin: 0 0 1em; + padding: 0; +} +.DefinitionSet.hastotal dl { + border-bottom: 0px; +} + +.DefinitionSet img { + margin-right: 1em; + float: left; +} + +.DefinitionSet dt { + clear: left; + float: left; + width: 15em; + margin: 0; + padding: 5px; + border-top: 1px solid #999; +} + +.DefinitionSet dt.total, .DefinitionSet dd.total { + font-weight: bold; + padding-bottom: 1em; +} + +.DefinitionSet span { + display: block; + float: left; + width: 1em; + height: 1em; + margin-right: 0.33em; + position: relative; + top: 0.1em; +} + +.DefinitionSet dt.blank span { + width: 0; +} + +.DefinitionSet dd { + float: left; + width: 3em; + margin: 0; + padding: 5px; + border-top: 1px solid #999; +} + +.DefinitionSet h3 span { + display: block; + float: right; + width: 20px; + height: 15px; + background: url(resource?name=chart-20.png) repeat; + margin-right:1em; + visibility: hidden; +} + +.DefinitionSet:hover h3 span { + cursor: pointer; + visibility: visible; +} + +.DefinitionSet:hover h3 span.blank { + cursor: default; + visibility: hidden; +} + +/* hide the chart title since we have one in the popup title bar */ +div.DefaultStickyWin div.StatValueChart h2 { + display: none; +} + +[DefinitionSet.html] +<div id="{id}" class="{class}"> +<style type="text/css"> +{legend_styles} +</style> + <h3>{title}<span class="{span_class}" title="Click to show a timeseries chart" onclick="showHistoryChart('{title}', '{chart_href}')"></span></h3> + <dl> + {items} + </dl> + <img src="{pie_src}" alt="pie_chart" title="{title}" width="{width}" height="{height}"/> +</div> + +[DefinitionSet.item_html] + <dt title="{html_title}" class="{legend_class}"><span></span>{item_title}</dt> + <dd{dd_class}>{item_value}</dd> + + +[MinimalTableHeader.html] +<thead> + <tr>{headers}</tr> +</thead> + +[MonitorSelfCharts.css] +div.MonitorSelfCharts div.chart { + float: left; +} + +[MonitorSelfCharts.html] +<div id="{id}" class="{class}"> + <div class="chart">{cpu}</div><div class="chart">{used}</div> + <div style="clear:both;"></div> +</div> + +[DashboardNegotiatorStatSet.css] +div.DashboardNegotiatorStatSet { + width: 1000px; +} + +div.DashboardNegotiatorStatSet th span { + display: block; + float: left; + width: 20px; + height: 15px; + background: url(resource?name=chart-20.png) repeat; + margin-right:1em; + visibility: hidden; +} + +div.DashboardNegotiatorStatSet tr.item:hover th span { + cursor: pointer; + visibility: visible; +} + +div.DashboardNegotiatorStatSet tr.item:hover th span.blank { + cursor: default; + visibility: hidden; +} +.mask { + z-index: 500; +} + +div.DashboardNegotiatorStatSet tr.item:hover { + background-color: #E7E7F7; +} + +[DashboardNegotiatorStatSet.html] +<div class="{class}"> + <h3>{title}</h3> + {stats} +</div> + +[NegotiatorStatSet.item_html] +<tr title="{html_title}" class="item"> + <th><span class="{chart_class}" onclick="showHistoryChart('{item_title}', '{chart_href}')" title="{span_title}"></span>{item_title}</th> + <td class="ralign"> {item_value}</td> +</tr>

1 0

r4592 - in trunk: cumin/bin cumin/python/cumin mint/python/mint
by tmckay＠fedoraproject.org 09 Mar '11

09 Mar '11

Author: tmckay Date: 2011-03-09 15:51:40 +0000 (Wed, 09 Mar 2011) New Revision: 4592 Modified: trunk/cumin/bin/cumin-data trunk/cumin/python/cumin/config.py trunk/mint/python/mint/session.py Log: Create basic mechanism for partitioning by class in cumin-data. Mechanism for specifying will likely change in the future. Modified: trunk/cumin/bin/cumin-data =================================================================== --- trunk/cumin/bin/cumin-data 2011-03-09 15:42:08 UTC (rev 4591) +++ trunk/cumin/bin/cumin-data 2011-03-09 15:51:40 UTC (rev 4592) @@ -15,6 +15,41 @@ sys.stderr = sys.__stderr__ sys.stdout = sys.__stdout__ + +def process_packages(mint, values, allow_classes=False): + + packages = list() + + for name in values.split(","): + name = name.strip() + if allow_classes and ":" in name: + pair = name.split(":") + name = pair[0] + className = pair[1] + else: + className = None + + try: + cls = None + pkg = mint.model._packages_by_name[name] + if className != None: + try: + cls = pkg._classes_by_name[className] + except KeyError: + print "No class found for '%s'" % className + + except KeyError: + print "No package found for '%s'" % name + continue + + if cls != None: + pkg = ((pkg,cls)) + + packages.append(pkg) + + return packages + + def main(): # Do our own simple option check so we can redirect IO early @@ -75,20 +110,12 @@ mint.init() if values.packages: - packages = list() + mint.session.qmf_packages = process_packages(mint, values.packages) - for name in values.packages.split(","): - name = name.strip() + if values.classes: + mint.session.qmf_classes = process_packages(mint, values.classes, + allow_classes=True) - try: - pkg = mint.model._packages_by_name[name] - except KeyError: - print "No package found for '%s'" % name - - packages.append(pkg) - - mint.session.qmf_packages = packages - if opts.init_only: return Modified: trunk/cumin/python/cumin/config.py =================================================================== --- trunk/cumin/python/cumin/config.py 2011-03-09 15:42:08 UTC (rev 4591) +++ trunk/cumin/python/cumin/config.py 2011-03-09 15:51:40 UTC (rev 4592) @@ -78,6 +78,7 @@ data.log_file.default = os.path.join(self.home, "log", name + ".log") param = ConfigParameter(data, "packages", str) + param = ConfigParameter(data, "classes", str) param = ConfigParameter(data, "expire-interval", int) param.default = 60 * 60 # 1 hour Modified: trunk/mint/python/mint/session.py =================================================================== --- trunk/mint/python/mint/session.py 2011-03-09 15:42:08 UTC (rev 4591) +++ trunk/mint/python/mint/session.py 2011-03-09 15:51:40 UTC (rev 4592) @@ -13,6 +13,7 @@ self.qmf_session = None self.qmf_brokers = list() self.qmf_packages = self.app.model._packages + self.qmf_classes = list() def add_broker(self, uri): log.info("Adding QMF broker at %s", uri) @@ -42,8 +43,19 @@ self.qmf_session.bindAgent("*") + # Handle bind by class + already_bound_list = list() + for pkg in self.qmf_classes: + if type(pkg) in (tuple,list) and len(pkg) == 2: + # If a packages shows up in the class binding list, + # then we cannot wholesale bind that package later. + already_bound_list.append(pkg[0]) + self.qmf_session.bindClass(pkg[0]._name.lower(), pkg[1]._name.lower()) + + # Handle bind by package for pkg in self.qmf_packages: - self.qmf_session.bindPackage(pkg._name) + if not pkg in already_bound_list: + self.qmf_session.bindPackage(pkg._name.lower()) for uri in self.broker_uris: self.add_broker(uri)

1 0

r4591 - trunk/cumin/model
by eallen＠fedoraproject.org 09 Mar '11

09 Mar '11

Author: eallen Date: 2011-03-09 15:42:08 +0000 (Wed, 09 Mar 2011) New Revision: 4591 Modified: trunk/cumin/model/condor.xml Log: Latest condor.xml with cumin specific "optional=y" changes applied Modified: trunk/cumin/model/condor.xml =================================================================== --- trunk/cumin/model/condor.xml 2011-03-09 15:11:34 UTC (rev 4590) +++ trunk/cumin/model/condor.xml 2011-03-09 15:42:08 UTC (rev 4591) @@ -2,7 +2,7 @@  <method name="echo"> <arg name="sequence" dir="IO" type="uint32"/> - <arg name="body" dir="IO" type="lstr"/> </method> @@ -129,7 +127,6 @@ type="uint32" desc="Day of the week: 0 = Sunday, 1 = Monday, ..., 6 = Saturaday"/> - <statistic name="ClockMin" type="uint32" unit="minute" desc="Number of elapsed minutes since midnight"/> @@ -166,7 +163,6 @@ type="absTime" unit="nanosecond" desc="Time at which current State was entered, number of seconds since Unix epoch"/> - <property name="FileSystemDomain" type="sstr" desc="Configured namespace shared by slots with @@ -213,12 +209,12 @@ desc="Number of nanoseconds since epoch when the last benchmark was run" optional="y"/> - <property name="LastFetchWorkCompleted" type="absTime" unit="nanosecond" desc="Number of nanoseconds since epoch when the FetchWork Hook returned" optional="y"/> + <property name="LastFetchWorkSpawned" type="absTime" unit="nanosecond" desc="Number of nanoseconds since epoch when the @@ -250,7 +246,6 @@ type="uint32" desc="Relative integer performance on a Dhrystone benchmark"/> - <property name="MyAddress" type="sstr" desc="IP:Port of StartD in charge of the slot"/> @@ -304,7 +299,6 @@ preempting, job, calculated as Rank expression evaluated in context of the incoming job's ad, only present when slot is claimed"/> - <property name="RemoteOwner" type="sstr" optional="y" @@ -350,7 +344,6 @@ type="uint32" unit="second" desc="Number of second until StartD managing the slot has until it will exit"/> - <property name="TotalClaimRunTime" type="uint32" unit="second" optional="y" @@ -393,7 +386,6 @@ <property name="TotalMemory" type="uint32" unit="MiB" desc="Total RAM available on slot's machine, in MiB"/> - <property name="TotalSlots" type="uint32" desc="Total number of slots sharing the Machine"/> @@ -437,7 +429,6 @@ desc="Accumulated number of seconds the slot has been in State=Matched and Activity=Idle since the Startd started"/> - <statistic name="TotalTimeOwnerIdle" type="uint32" unit="second" desc="Accumulated number of seconds the slot has been @@ -481,7 +472,6 @@ representing a build number for a Windows operating system, only present on Windows slots"/> - <property name="WindowsMajorVersion" type="uint32" desc="Integer extracted from the platform type, @@ -502,7 +492,6 @@ <group name="GridMethods"/> <property name="Pool" type="sstr" index="y"/> - <property name="System" type="sstr" index="y"/> <property name="JobQueueBirthdate" type="absTime" optional="y"/> @@ -512,7 +501,6 @@ <statistic name="NumUsers" type="uint32"/> <property name="Name" type="sstr" index="y" desc=""/> <statistic name="TotalHeldJobs" type="uint32"/> - <statistic name="TotalIdleJobs" type="uint32"/> <statistic name="TotalJobAds" type="uint32"/> <statistic name="TotalRemovedJobs" type="uint32"/> @@ -524,7 +512,6 @@ </method> <method name="SetJobAttribute"> - <arg name="Id" dir="I" type="sstr" desc="Job's Id, the string ClusterId.ProcId"/> <arg name="Name" dir="I" type="sstr"/> @@ -560,7 +547,6 @@ <statistic name="HeldJobs" type="uint32"/> <statistic name="IdleJobs" type="uint32"/> <property name="JobQueueBirthdate" type="absTime"/> - <property name="Machine" type="sstr"/> <property name="Name" type="sstr" index="y"/> <property name="Owner" type="sstr" desc="Match for same Submission field"/> @@ -570,7 +556,6 @@ <class name="Negotiator"> <property name="Pool" type="sstr" index="y"/> - <property name="System" type="sstr" index="y"/> <property name="Name" type="sstr" index="y"/> @@ -582,30 +567,6 @@ <group name="DaemonStatistics"/> <group name="GridMethods"/> - <statistic name="MatchRateSustained" type="uint32" desc="Matcher per second, since end of previous cycle" optional="y"/> - <statistic name="MatchRate" type="uint32" desc="Matches per second over current cycle" optional="y"/> - <statistic name="Matches" type="uint32" desc="Number of matches generated" optional="y"/> - <statistic name="Duration" type="uint32" desc="Negotiation cycle duration, in seconds" optional="y"/> - <statistic name="Phase1Duration" type="uint32" desc="Duration of phase 1, in seconds" optional="y"/> - <statistic name="Phase2Duration" type="uint32" desc="Duration of phase 2, in seconds" optional="y"/> - <statistic name="Phase3Duration" type="uint32" desc="Duration of phase 3, in seconds" optional="y"/> - <statistic name="Phase4Duration" type="uint32" desc="Duration of phase 4, in seconds" optional="y"/> - <statistic name="SlotShareIter" type="uint32" desc="Number of share iterations" optional="y"/> - <statistic name="NumSchedulers" type="uint32" desc="Number of submitters" optional="y"/> - <statistic name="ActiveSubmitterCount" type="uint32" desc="Number of submitters with jobs" optional="y"/> - <statistic name="SubmittersFailed" type="lstr" desc="List of submitters that encountered a failure" optional="y"/> - <statistic name="SubmittersOutOfTime" type="lstr" desc="List of submitters that hit their match time limit" optional="y"/> - <statistic name="SubmittersShareLimit" type="lstr" desc="List of submitters that hit their share limit" optional="y"/> - <statistic name="NumIdleJobs" type="uint32" desc="Number of idle jobs" optional="y"/> - <statistic name="NumJobsConsidered" type="uint32" desc="Number of jobs that were considered for matching" optional="y"/> - <statistic name="Rejections" type="uint32" desc="Number of rejections" optional="y"/> - <statistic name="TotalSlots" type="uint32" desc="Number of slots found" optional="y"/> - <statistic name="TrimmedSlots" type="uint32" desc="Number of slots after trimming claimed slots" optional="y"/> - <statistic name="CandidateSlots" type="uint32" desc="Number of slots considered for matching" optional="y"/> - <statistic name="Time" type="uint32" desc="Start of cycle, seconds since Epoch" optional="y"/> - <statistic name="End" type="uint32" desc="End of cycle, seconds since Epoch" optional="y"/> - <statistic name="Period" type="uint32" desc="Time from end of previous cycle to end of current cycle" optional="y"/> - <method name="GetLimits"> <arg name="Limits" dir="O" type="map"/> </method> @@ -646,6 +607,30 @@ </method> <method name="Reconfig"/> + + <statistic name="MatchRate" type="double" desc="Matches per second over current cycle"/> + <statistic name="MatchRateSustained" type="double" desc="Matcher per second, since end of previous cycle"/> + <statistic name="Matches" type="uint32" desc="Number of matches generated"/> + <statistic name="Duration" type="uint32" unit="second" desc="Negotiation cycle duration"/> + <statistic name="Phase1Duration" type="uint32" unit="second" desc="Duration of phase 1"/> + <statistic name="Phase2Duration" type="uint32" unit="second" desc="Duration of phase 2"/> + <statistic name="Phase3Duration" type="uint32" unit="second" desc="Duration of phase 3"/> + <statistic name="Phase4Duration" type="uint32" unit="second" desc="Duration of phase 4"/> + <statistic name="SlotShareIter" type="uint32" desc="Number of share iterations"/> + <statistic name="NumSchedulers" type="uint32" desc="Number of submitters"/> + <statistic name="ActiveSubmitterCount" type="uint32" desc="Number of submitters with jobs"/> + <statistic name="SubmittersFailed" type="lstr" desc="List of submitters that encountered a failure"/> + <statistic name="SubmittersOutOfTime" type="lstr" desc="List of submitters that hit their match time limit"/> + <statistic name="SubmittersShareLimit" type="lstr" desc="List of submitters that hit their share limit"/> + <statistic name="NumIdleJobs" type="uint32" desc="Number of idle jobs"/> + <statistic name="NumJobsConsidered" type="uint32" desc="Number of jobs that were considered for matching"/> + <statistic name="Rejections" type="uint32" desc="Number of rejections"/> + <statistic name="TotalSlots" type="uint32" desc="Number of slots found"/> + <statistic name="CandidateSlots" type="uint32" desc="Number of slots considered"/> + <statistic name="TrimmedSlots" type="uint32" desc="Number of slots after trimming claimed slots"/> + <statistic name="Time" type="absTime" unit="nanosecond" desc="Start of cycle, since Epoch"/> + <statistic name="End" type="absTime" unit="nanosecond" desc="End of cycle, since Epoch"/> + <statistic name="Period" type="uint32" unit="second" desc="Time from end of previous cycle to end of current cycle"/> </class> <class name="Collector"> @@ -668,7 +653,6 @@ <statistic name="HostsClaimed" type="uint32"/> <statistic name="HostsUnclaimed" type="uint32"/> <statistic name="HostsOwner" type="uint32"/> - </class> <class name="Master"> @@ -706,7 +690,6 @@ <property name="Pool" type="sstr" index="y"/> <property name="Name" type="sstr"/> - <property name="ScheddName" type="sstr"/> <property name="Owner" type="sstr"/> @@ -727,7 +710,6 @@ <statistic name="NumJobs" type="uint32"/> <statistic name="SubmitsInProgress" type="uint32"/> <statistic name="SubmitsQueued" type="uint32"/> - <statistic name="SubmitsAllowed" type="uint32"/> <statistic name="SubmitsWanted" type="uint32"/> <statistic name="RunningJobs" type="uint32"/> @@ -739,7 +721,6 @@ <class name="JobServer"> <group name="DaemonProperties"/> - <group name="DaemonStatistics"/> <group name="GridMethods"/> @@ -751,7 +732,6 @@ <property name="Machine" type="sstr" desc=""/> <property name="MyAddress" type="sstr" desc=""/> <property name="Name" type="sstr" index="y" desc=""/> - <property name="PublicNetworkIpAddr" type="sstr" desc=""/> <method name="GetJobAd"> @@ -767,7 +747,6 @@ <arg name="Id" dir="I" type="sstr" desc="Job's Id, the string ClusterId.ProcId"/> <arg name="File" dir="I" type="sstr"/> - <arg name="Start" dir="I" type="int32"/> <arg name="End" dir="I" type="int32"/> <arg name="Data" dir="O" type="lstr"/> @@ -779,7 +758,6 @@ <class name="Submission"> <group name="GridMethods"/> -  <property name="jobserverRef" type="objId" parentRef="y" index="y" references="com.redhat.grid:JobServer"/> @@ -791,12 +769,11 @@ <statistic name="Running" type="count32"/> <statistic name="Removed" type="count32"/> <statistic name="Completed" type="count32"/> - <statistic name="Held" type="count32"/>  <method name="GetJobSummaries"> - <arg name="Jobs" dir="O" type="map"/> + <arg name="Jobs" dir="O" type="list"/> </method> </class>

1 0

r4590 - trunk/cumin/model
by eallen＠fedoraproject.org 09 Mar '11

09 Mar '11

Author: eallen Date: 2011-03-09 15:11:34 +0000 (Wed, 09 Mar 2011) New Revision: 4590 Modified: trunk/cumin/model/Makefile Log: Updated condor.xml file location Modified: trunk/cumin/model/Makefile =================================================================== --- trunk/cumin/model/Makefile 2011-03-09 01:17:21 UTC (rev 4589) +++ trunk/cumin/model/Makefile 2011-03-09 15:11:34 UTC (rev 4590) @@ -20,7 +20,7 @@ svn export http://svn.apache.org/repos/asf/qpid/trunk/qpid/cpp/src/qpid/cluster/manage… qpid-cluster.xml condor.xml: - wget "http://git.fedorahosted.org/git/?p=grid.git;a=blob_plain;f=src/management/c…" -O condor.xml + wget "http://git.fedorahosted.org/git/?p=grid.git;a=blob_plain;f=src/condor_contr…" -O condor.xml sesame.xml: svn export http://anonsvn.jboss.org/repos/rhmessaging/mgmt/trunk/sesame/cpp/src/qmfgen… sesame.xml

1 0

r4589 - trunk/cumin/python/cumin/grid
by eallen＠fedoraproject.org 09 Mar '11

09 Mar '11

Author: eallen Date: 2011-03-09 01:17:21 +0000 (Wed, 09 Mar 2011) New Revision: 4589 Modified: trunk/cumin/python/cumin/grid/dashboard.py Log: Added a few comments Modified: trunk/cumin/python/cumin/grid/dashboard.py =================================================================== --- trunk/cumin/python/cumin/grid/dashboard.py 2011-03-09 00:52:56 UTC (rev 4588) +++ trunk/cumin/python/cumin/grid/dashboard.py 2011-03-09 01:17:21 UTC (rev 4589) @@ -137,6 +137,8 @@ slices = self.get_pie_slices(session) return PieChartPage.get_href(slices, self.color_scheme, self.radius) + # we generate the style sheet for the legend based on + # the colors defined in the PieChartPage def render_legend_styles(self, session): colors = PieChartPage.color_schemes[self.color_scheme] styles = list() @@ -145,6 +147,7 @@ styles.append(".DefinitionSet dt.legend%s span { background-color: #%s;}" % (hx, hx)) return "\n".join(styles) + # don't put a line under the legend if there is a total def render_class(self, session): cls = super(PieStatSet, self).render_class(session) return "%s%s" % (cls, self.has_total and " hastotal" or "") @@ -152,6 +155,7 @@ def is_total(self, item): return False + # the color block next to each legend line is based on the class def render_legend_class(self, session, item): classes = list() if self.is_total(item): @@ -167,6 +171,7 @@ dt_class = self.render_legend_class(session, item) return "total" is dt_class and " class=\"total\"" or "" + # don't show a chart icon on hover if there is no chart def render_span_class(self, session): return self.chart and "chart" or "blank" @@ -235,6 +240,7 @@ self.title = title and title or name + # attr1 and 2 could be strings or they could be rosemary attributes try: id1 = attr1.sql_column.identifier except AttributeError: @@ -243,6 +249,7 @@ id2 = attr2.sql_column.identifier except AttributeError: id2 = attr2 + # avoid divide by 0 by using nullif nullif = "NULLIF(%s,0)" % id2 identifier = "(%s/%s)" % (id1, nullif) @@ -274,6 +281,7 @@ def get_title(self, session): return self.title +# Create a sortable column that is the quotient of two extisting columns class QuotientSqlColumn(DerivedTableColumn): def __init__(self, app, name, attr1, attr2): super(QuotientSqlColumn, self).__init__(app, name) @@ -291,6 +299,7 @@ # change quotient into a percent self.field.column.identifier = "%s*100" % self.field.column.identifier +# Create a sortable column that is the sum of two extisting columns class SumSqlColumn(DerivedTableColumn): def __init__(self, app, name, attr, title): super(SumSqlColumn, self).__init__(app, name) @@ -724,6 +733,8 @@ self.pool = pool self.add_filter(self.pool, cls.Pool) + # Do we want the name column to link to the objects page? + # In the case of collector we don't if frame: col = ObjectLinkColumn(app, "name", cls.Name, cls._id, frame) else: @@ -836,9 +847,13 @@ "SubmittersFailed", "SubmittersOutOfTime", "SubmittersShareLimit", "Time", "End", "Period") + # create a chart for each statistic + # I wonder if there is a way to use a single instance + # of the StatFlashChart class to do this cls = app.model.com_redhat_grid.Negotiator self.popup_charts = dict() for attr in self.attrs: + # don't try and chart the strings if cls._statistics_by_name[attr].type != "lstr": chart = StatFlashChart(app, "popup%s" % attr, self.object) chart.stats = [attr]

1 0

r4588 - trunk/cumin/python/cumin/grid
by eallen＠fedoraproject.org 09 Mar '11

09 Mar '11

Author: eallen Date: 2011-03-09 00:52:56 +0000 (Wed, 09 Mar 2011) New Revision: 4588 Modified: trunk/cumin/python/cumin/grid/dashboard.strings Log: Hide the popup chart's title since it is also in the popup's title bar Modified: trunk/cumin/python/cumin/grid/dashboard.strings =================================================================== --- trunk/cumin/python/cumin/grid/dashboard.strings 2011-03-08 21:57:46 UTC (rev 4587) +++ trunk/cumin/python/cumin/grid/dashboard.strings 2011-03-09 00:52:56 UTC (rev 4588) @@ -1,9 +1,9 @@ [PoolDashboard.html] {overview} <div style="clear:both;"></div> + {performance} + <div style="clear:both; padding-top:2em;"></div> {capacity} - <div style="clear:both; padding-top:2em;"></div> - {performance} <div style="clear:both;"></div> {other_stats} <div style="clear:both;"></div> @@ -23,14 +23,14 @@ } [DashboardPerformance.html] + {negotiator_throughput} + {negotiator_cycles} + {negotiator_slots} <div id="{id}" class="{class}"> {ms_s} {ms_c} {ms_n} </div> - {negotiator_throughput} - {negotiator_cycles} - {negotiator_slots} [MonitorSelfTitle.html] <h3>{title}</h3> @@ -138,6 +138,11 @@ visibility: hidden; } +/* hide the chart title since we have one in the popup title bar */ +div.DefaultStickyWin div.StatValueChart h2 { + display: none; +} + [DefinitionSet.html] <div id="{id}" class="{class}"> <style type="text/css">

1 0

r4587 - in trunk/cumin: python/cumin/grid resources
by eallen＠fedoraproject.org 08 Mar '11

08 Mar '11

Author: eallen Date: 2011-03-08 21:57:46 +0000 (Tue, 08 Mar 2011) New Revision: 4587 Modified: trunk/cumin/python/cumin/grid/dashboard.strings trunk/cumin/resources/app.js Log: Moved a javascript function to a more general place Modified: trunk/cumin/python/cumin/grid/dashboard.strings =================================================================== --- trunk/cumin/python/cumin/grid/dashboard.strings 2011-03-08 21:50:11 UTC (rev 4586) +++ trunk/cumin/python/cumin/grid/dashboard.strings 2011-03-08 21:57:46 UTC (rev 4587) @@ -208,26 +208,7 @@ <h3>{title}</h3> {stats} </div> -<script type="text/javascript"> -//<![CDATA[ -function showHistoryChart(title, src) { - if (src != '') { - new StickyWin.Modal.Ajax({ - url: src, - wrapWithUi: true, - caption: title, - useIframeShim: false, - allowMultiple: false, - closeOnEsc: true, - uiOptions: {width: 420} - }).update(); - } - return false; -} -//]]> -</script> - [NegotiatorStatSet.item_html] <tr title="{html_title}" class="item"> <th><span class="{chart_class}" onclick="showHistoryChart('{item_title}', '{chart_href}')" title="{span_title}"></span>{item_title}</th> Modified: trunk/cumin/resources/app.js =================================================================== --- trunk/cumin/resources/app.js 2011-03-08 21:50:11 UTC (rev 4586) +++ trunk/cumin/resources/app.js 2011-03-08 21:57:46 UTC (rev 4587) @@ -523,3 +523,19 @@ function ofc_debug(msg) { wooly.log(msg); } + +function showHistoryChart(title, src) { + + if (src != '') { + new StickyWin.Modal.Ajax({ + url: src, + wrapWithUi: true, + caption: title, + useIframeShim: false, + allowMultiple: false, + closeOnEsc: true, + uiOptions: {width: 420} + }).update(); + } + return false; +}

1 0

r4586 - trunk/cumin/model
by eallen＠fedoraproject.org 08 Mar '11

08 Mar '11

Author: eallen Date: 2011-03-08 21:50:11 +0000 (Tue, 08 Mar 2011) New Revision: 4586 Modified: trunk/cumin/model/condor.xml Log: Making LastBenchMark optional Modified: trunk/cumin/model/condor.xml =================================================================== --- trunk/cumin/model/condor.xml 2011-03-08 21:44:09 UTC (rev 4585) +++ trunk/cumin/model/condor.xml 2011-03-08 21:50:11 UTC (rev 4586) @@ -211,7 +211,8 @@ <property name="LastBenchmark" type="absTime" unit="nanosecond" desc="Number of nanoseconds since epoch when the last - benchmark was run"/> + benchmark was run" + optional="y"/> <property name="LastFetchWorkCompleted" type="absTime" unit="nanosecond"

1 0

r4585 - in trunk/cumin: model python/cumin python/cumin/grid
by eallen＠fedoraproject.org 08 Mar '11

08 Mar '11

Author: eallen Date: 2011-03-08 21:44:09 +0000 (Tue, 08 Mar 2011) New Revision: 4585 Modified: trunk/cumin/model/condor.xml trunk/cumin/model/rosemary.xml trunk/cumin/python/cumin/charts.py trunk/cumin/python/cumin/grid/dashboard.py trunk/cumin/python/cumin/grid/dashboard.strings trunk/cumin/python/cumin/objectframe.py trunk/cumin/python/cumin/objectframe.strings trunk/cumin/python/cumin/objectselector.py trunk/cumin/python/cumin/stat.py trunk/cumin/python/cumin/stat.strings Log: BZ 673194: Next iteration of the grid dashboard. This requires a reschema. Modified: trunk/cumin/model/condor.xml =================================================================== --- trunk/cumin/model/condor.xml 2011-03-08 21:40:10 UTC (rev 4584) +++ trunk/cumin/model/condor.xml 2011-03-08 21:44:09 UTC (rev 4585) @@ -32,13 +32,13 @@ </group> <group name="DaemonStatistics"> - <statistic name="MonitorSelfAge" type="uint32"/> - <statistic name="MonitorSelfCPUUsage" type="double"/> + <statistic name="MonitorSelfAge" type="uint32" optional="y"/> + <statistic name="MonitorSelfCPUUsage" type="double" optional="y"/> - <statistic name="MonitorSelfImageSize" type="double" unit="KiB"/> - <statistic name="MonitorSelfRegisteredSocketCount" type="uint32"/> - <statistic name="MonitorSelfResidentSetSize" type="uint32" unit="KiB"/> - <statistic name="MonitorSelfTime" type="absTime"/> + <statistic name="MonitorSelfImageSize" type="double" unit="KiB" optional="y"/> + <statistic name="MonitorSelfRegisteredSocketCount" type="uint32" optional="y"/> + <statistic name="MonitorSelfResidentSetSize" type="uint32" unit="KiB" optional="y"/> + <statistic name="MonitorSelfTime" type="absTime" optional="y"/> </group> <group name="GridMethods"> @@ -581,6 +581,30 @@ <group name="DaemonStatistics"/> <group name="GridMethods"/> + <statistic name="MatchRateSustained" type="uint32" desc="Matcher per second, since end of previous cycle" optional="y"/> + <statistic name="MatchRate" type="uint32" desc="Matches per second over current cycle" optional="y"/> + <statistic name="Matches" type="uint32" desc="Number of matches generated" optional="y"/> + <statistic name="Duration" type="uint32" desc="Negotiation cycle duration, in seconds" optional="y"/> + <statistic name="Phase1Duration" type="uint32" desc="Duration of phase 1, in seconds" optional="y"/> + <statistic name="Phase2Duration" type="uint32" desc="Duration of phase 2, in seconds" optional="y"/> + <statistic name="Phase3Duration" type="uint32" desc="Duration of phase 3, in seconds" optional="y"/> + <statistic name="Phase4Duration" type="uint32" desc="Duration of phase 4, in seconds" optional="y"/> + <statistic name="SlotShareIter" type="uint32" desc="Number of share iterations" optional="y"/> + <statistic name="NumSchedulers" type="uint32" desc="Number of submitters" optional="y"/> + <statistic name="ActiveSubmitterCount" type="uint32" desc="Number of submitters with jobs" optional="y"/> + <statistic name="SubmittersFailed" type="lstr" desc="List of submitters that encountered a failure" optional="y"/> + <statistic name="SubmittersOutOfTime" type="lstr" desc="List of submitters that hit their match time limit" optional="y"/> + <statistic name="SubmittersShareLimit" type="lstr" desc="List of submitters that hit their share limit" optional="y"/> + <statistic name="NumIdleJobs" type="uint32" desc="Number of idle jobs" optional="y"/> + <statistic name="NumJobsConsidered" type="uint32" desc="Number of jobs that were considered for matching" optional="y"/> + <statistic name="Rejections" type="uint32" desc="Number of rejections" optional="y"/> + <statistic name="TotalSlots" type="uint32" desc="Number of slots found" optional="y"/> + <statistic name="TrimmedSlots" type="uint32" desc="Number of slots after trimming claimed slots" optional="y"/> + <statistic name="CandidateSlots" type="uint32" desc="Number of slots considered for matching" optional="y"/> + <statistic name="Time" type="uint32" desc="Start of cycle, seconds since Epoch" optional="y"/> + <statistic name="End" type="uint32" desc="End of cycle, seconds since Epoch" optional="y"/> + <statistic name="Period" type="uint32" desc="Time from end of previous cycle to end of current cycle" optional="y"/> + <method name="GetLimits"> <arg name="Limits" dir="O" type="map"/> </method> @@ -625,6 +649,7 @@ <class name="Collector"> <group name="DaemonProperties"/> + <group name="DaemonStatistics"/>  - - <h3>Scheduler Performance</h3> - {scheduler_performance} - <h3>Negotiator Performance</h3> - {negotiator_performance} + {ms_s} + {ms_c} + {ms_n} </div> + {negotiator_throughput} + {negotiator_cycles} + {negotiator_slots} +[MonitorSelfTitle.html] +<h3>{title}</h3> + +[MonitorSelfSchedulerTable.css] +div.MonitorSelfSchedulerTable { + margin-bottom: 3em; +} + +[MonitorSelfSchedulerTable.html] +<div id="{id}" class="{class}"> + <h3>{title}</h3> + {table} +</div> + [DashboardCapacity.css] div.DashboardCapacity { width: 1000px; } [DashboardCapacity.html] <div id="{id}" class="{class}"> -<h2>{title}</h2> +<h3>{title}</h3> {slot_capacity} </div> @@ -78,13 +99,17 @@ .DefinitionSet span { display: block; float: left; + width: 1em; height: 1em; margin-right: 0.33em; position: relative; top: 0.1em; - width: 1em; } +.DefinitionSet dt.blank span { + width: 0; +} + .DefinitionSet dd { float: left; width: 3em; @@ -93,12 +118,32 @@ border-top: 1px solid #999; } +.DefinitionSet h3 span { + display: block; + float: right; + width: 20px; + height: 15px; + background: url(resource?name=chart-20.png) repeat; + margin-right:1em; + visibility: hidden; +} + +.DefinitionSet:hover h3 span { + cursor: pointer; + visibility: visible; +} + +.DefinitionSet:hover h3 span.blank { + cursor: default; + visibility: hidden; +} + [DefinitionSet.html] <div id="{id}" class="{class}"> <style type="text/css"> {legend_styles} </style> - <h3>{title}</h3> + <h3>{title}<span class="{span_class}" title="Click to show a timeseries chart" onclick="showHistoryChart('{title}', '{chart_href}')"></span></h3> <dl> {items} </dl> @@ -106,7 +151,7 @@ </div> [DefinitionSet.item_html] - <dt class="{legend_class}"><span></span>{item_title}</dt> + <dt title="{html_title}" class="{legend_class}"><span></span>{item_title}</dt> <dd{dd_class}>{item_value}</dd> @@ -114,3 +159,77 @@ <thead> <tr>{headers}</tr> </thead> + +[MonitorSelfCharts.css] +div.MonitorSelfCharts div.chart { + float: left; +} + +[MonitorSelfCharts.html] +<div id="{id}" class="{class}"> + <div class="chart">{cpu}</div><div class="chart">{used}</div> + <div style="clear:both;"></div> +</div> + +[DashboardNegotiatorStatSet.css] +div.DashboardNegotiatorStatSet { + width: 1000px; +} + +div.DashboardNegotiatorStatSet th span { + display: block; + float: left; + width: 20px; + height: 15px; + background: url(resource?name=chart-20.png) repeat; + margin-right:1em; + visibility: hidden; +} + +div.DashboardNegotiatorStatSet tr.item:hover th span { + cursor: pointer; + visibility: visible; +} + +div.DashboardNegotiatorStatSet tr.item:hover th span.blank { + cursor: default; + visibility: hidden; +} +.mask { + z-index: 500; +} + +div.DashboardNegotiatorStatSet tr.item:hover { + background-color: #E7E7F7; +} + +[DashboardNegotiatorStatSet.html] +<div class="{class}"> + <h3>{title}</h3> + {stats} +</div> +<script type="text/javascript"> +//<![CDATA[ +function showHistoryChart(title, src) { + + if (src != '') { + new StickyWin.Modal.Ajax({ + url: src, + wrapWithUi: true, + caption: title, + useIframeShim: false, + allowMultiple: false, + closeOnEsc: true, + uiOptions: {width: 420} + }).update(); + } + return false; +} +//]]> +</script> + +[NegotiatorStatSet.item_html] +<tr title="{html_title}" class="item"> + <th><span class="{chart_class}" onclick="showHistoryChart('{item_title}', '{chart_href}')" title="{span_title}"></span>{item_title}</th> + <td class="ralign"> {item_value}</td> +</tr> Modified: trunk/cumin/python/cumin/objectframe.py =================================================================== --- trunk/cumin/python/cumin/objectframe.py 2011-03-08 21:40:10 UTC (rev 4584) +++ trunk/cumin/python/cumin/objectframe.py 2011-03-08 21:44:09 UTC (rev 4585) @@ -94,16 +94,17 @@ for attr in self.get_attributes(session): name = attr.title value = obj.get_formatted_value(attr.name) + title = attr.description - writer.write(self.entry.render(session, name, value)) + writer.write(self.entry.render(session, name, value, title)) return writer.to_string() class ObjectAttributesEntry(Widget): - def render_name(self, session, name, value): + def render_name(self, session, name, value, description): return name - def render_value(self, session, name, value): + def render_value(self, session, name, value, description): if value is None: return fmt_none() @@ -112,6 +113,9 @@ return xml_escape(str(value)) + def render_html_title(self, session, name, value, description): + return description + def break_up_long_lines(self, string): if " " in string[0:80]: return string Modified: trunk/cumin/python/cumin/objectframe.strings =================================================================== --- trunk/cumin/python/cumin/objectframe.strings 2011-03-08 21:40:10 UTC (rev 4584) +++ trunk/cumin/python/cumin/objectframe.strings 2011-03-08 21:44:09 UTC (rev 4585) @@ -30,7 +30,7 @@ </div> [ObjectAttributesEntry.html] -<tr><th>{name}</th><td>{value}</td></tr> +<tr><th title="{html_title}">{name}</th><td>{value}</td></tr> [ObjectTasks.css] table.ObjectTasks { @@ -118,6 +118,7 @@ } [ObjectView.html] +<div id="{id}" class="{class}"> {context} {heading} @@ -125,6 +126,7 @@ {summary} {body} +</div> [ObjectViewHeading.html] <div class="{class}"> Modified: trunk/cumin/python/cumin/objectselector.py =================================================================== --- trunk/cumin/python/cumin/objectselector.py 2011-03-08 21:40:10 UTC (rev 4584) +++ trunk/cumin/python/cumin/objectselector.py 2011-03-08 21:44:09 UTC (rev 4585) @@ -124,7 +124,7 @@ self.selector = selector # avoid name collisions on csv page - if self.name in self.app.export_page.modes.children_by_name: + while self.name in self.app.export_page.modes.children_by_name: self.name = self.name + ".1" self.app.export_page.modes.add_mode(self) Modified: trunk/cumin/python/cumin/stat.py =================================================================== --- trunk/cumin/python/cumin/stat.py 2011-03-08 21:40:10 UTC (rev 4584) +++ trunk/cumin/python/cumin/stat.py 2011-03-08 21:44:09 UTC (rev 4585) @@ -29,6 +29,8 @@ def do_get_items(self, session): object = self.object.get(session) + if not object: + return [] stats = list() for field in self.get_fields(session): @@ -40,6 +42,10 @@ stat, value = item return stat.title + def render_html_title(self, session, item): + stat, _ = item + return stat.description + def render_item_value(self, session, item): stat, value = item return CuminStatistic.fmt_value(value) @@ -494,8 +500,8 @@ deviated_values = list() for stat in stats: for x in samples[stat]: - d1 = nvl(x[1], 0) - d2 = nvl(x[2], 0) / 2 + d1 = float(nvl(x[1], 0)) + d2 = float(nvl(x[2], 0) / 2) dv = (d1 + d2, d1 - d2) deviated_values.append(dv) @@ -1290,7 +1296,10 @@ min_dt = tnow - duration - end_secs for dt, value, dev in samples[stat]: if value is not None: - vals.append({"dt": secs(dt), "y": (float(value) / float(total)) * 100.0}) + if total is None or total == 0.0: + vals.append({"dt": secs(dt), "y": 0.0}) + else: + vals.append({"dt": secs(dt), "y": (float(value) / float(total)) * 100.0}) if secs(dt) < min_dt: break Modified: trunk/cumin/python/cumin/stat.strings =================================================================== --- trunk/cumin/python/cumin/stat.strings 2011-03-08 21:40:10 UTC (rev 4584) +++ trunk/cumin/python/cumin/stat.strings 2011-03-08 21:44:09 UTC (rev 4585) @@ -46,7 +46,7 @@ </table> [StatSet.item_html] -<tr class="item"> +<tr class="item" title="{html_title}"> <th>{item_title}</th> <td class="ralign"> {item_value}</td> </tr>

1 0

r4584 - trunk/cumin/python/cumin/grid
by eallen＠fedoraproject.org 08 Mar '11

08 Mar '11

Author: eallen Date: 2011-03-08 21:40:10 +0000 (Tue, 08 Mar 2011) New Revision: 4584 Modified: trunk/cumin/python/cumin/grid/pool.py trunk/cumin/python/cumin/grid/pool.strings Log: For BZ 673189: Display an error message when the collector is missing. Modified: trunk/cumin/python/cumin/grid/pool.py =================================================================== --- trunk/cumin/python/cumin/grid/pool.py 2011-03-08 21:36:16 UTC (rev 4583) +++ trunk/cumin/python/cumin/grid/pool.py 2011-03-08 21:40:10 UTC (rev 4584) @@ -1,25 +1,50 @@ import logging +from wooly import Widget +from wooly.template import WidgetTemplate +from wooly.util import StringCatalog, Writer + from cumin.widgets import Session, StateSwitch -from wooly.util import StringCatalog -from cumin.objectframe import ObjectFrame +from cumin.objectframe import ObjectFrame, ObjectView +from cumin.parameters import CollectorGridAttribute, RosemaryObjectParameter +from cumin.stat import StatFlashChart, StatSet, FlashFullPage +from cumin.grid.dashboard import PoolDashboard + from submission import SubmissionFrame, PoolSubmissionJoinSelector from slot import SlotFrame, SlotSelector, SlotMap, SlotMapPage from scheduler import SchedulerFrame, SchedulerSelector from negotiator import NegotiatorFrame, NegotiatorSelector,\ - NegotiatorEditDynamicQuota + NegotiatorEditDynamicQuota, NegotiatorAttribute from limit import LimitFrame, LimitSelector -from quota import QuotaSelector -from wooly import Attribute, Widget -from cumin.parameters import CollectorGridAttribute, RosemaryObjectParameter +from cumin.grid.quota import QuotaSelector from collector import CollectorGeneralStatSet -from cumin.stat import StatFlashChart, StatSet, FlashFullPage -from cumin.grid.dashboard import PoolDashboard strings = StringCatalog(__file__) log = logging.getLogger("cumin.pool") +class PoolView(ObjectView): + def __init__(self, app, name, object): + super(PoolView, self).__init__(app, name, object) + + self.error_tmpl = WidgetTemplate(self, "error_html") + + def do_render(self, session): + id = self.frame.id.get(session) + if not id: + writer = Writer() + self.error_tmpl.render(writer, session) + return writer.to_string() + + return super(PoolView, self).do_render(session) + + def render_title(self, session): + obj = self.object.get(session) + if not obj: + return "Missing Pool" + + return obj.get_title() + class PoolFrame(ObjectFrame): def __init__(self, app, name): cls = app.model.com_redhat_grid.Collector @@ -28,6 +53,9 @@ self.icon_href = "resource?name=pool-36.png" + self.view = PoolView(app, "view", self.object) + self.replace_child(self.view) + self.mode.default = self.view self.submission = SubmissionFrame(app, "submission") @@ -63,7 +91,7 @@ negotiators = NegotiatorSelector(app, "negotiators", self.object) self.view.add_tab(negotiators) - self.negotiator_attribute = self.NegotiatorAttribute(app, "neg", self.object) + self.negotiator_attribute = NegotiatorAttribute(app, "neg", self.object) self.add_attribute(self.negotiator_attribute) self.edit_dynamic_quota = NegotiatorEditDynamicQuota(app, self) @@ -78,6 +106,13 @@ def render_title(self, session): return "Grid" + def get_title(self, session): + obj = self.object.get(session) + if not obj: + return None + + return super(PoolFrame, self).get_title(session) + def do_process(self, session): id = self.id.get(session) if not id: @@ -96,31 +131,6 @@ super(PoolFrame, self).do_process(session) - class NegotiatorAttribute(Attribute): - def __init__(self, app, name, collector): - super(PoolFrame.NegotiatorAttribute, self).__init__(app, name) - - self.collector = collector - - def get(self, session): - negotiator = super(PoolFrame.NegotiatorAttribute, self).get(session) - if not negotiator: - cls = self.app.model.com_redhat_grid.Negotiator - - pool = self.collector.get(session) - if pool: - negotiators = cls.get_selection(session.cursor, Pool=pool.Pool) - # use the most recently updated one if there are multiple - if len(negotiators) > 0: - recent_negotiator = negotiators[0] - for neg in negotiators: - if neg._qmf_update_time > \ - recent_negotiator._qmf_update_time: - recent_negotiator = neg - self.set(session, recent_negotiator) - negotiator = recent_negotiator - return negotiator - class PoolOverview(Widget): def __init__(self, app, name, collector): super(PoolOverview, self).__init__(app, name) Modified: trunk/cumin/python/cumin/grid/pool.strings =================================================================== --- trunk/cumin/python/cumin/grid/pool.strings 2011-03-08 21:36:16 UTC (rev 4583) +++ trunk/cumin/python/cumin/grid/pool.strings 2011-03-08 21:40:10 UTC (rev 4584) @@ -1,3 +1,22 @@ +[PoolView.error_html] +<div id="{id}" class="{class}"> + {heading} + <div class="TaskInvocationSet"> + <ul> + <li> + <b>Collector not found.</b> + Please ensure the grid is setup correctly and that cumin-data is running. + If cumin was just started, it may take a few minutes for the collector to become available. + </li> + </ul> + </div> +</div> +<script type="text/javascript"> + setTimeout(function () { + window.location.reload( true ); + }, 9000); +</script> + [PoolOverview.css] div#PoolOverview div.col1, div#PoolOverview div.col2 { float: left;

1 0

← Newer
1
...
6
7
8
9
10
11
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

cumin-developers March 2011