Author: justi9 Date: 2008-11-06 13:26:07 -0500 (Thu, 06 Nov 2008) New Revision: 2760 Modified: mgmt/trunk/cumin/python/cumin/collector.py mgmt/trunk/cumin/python/cumin/collector.strings mgmt/trunk/cumin/python/cumin/negotiator.py mgmt/trunk/cumin/python/cumin/negotiator.strings mgmt/trunk/cumin/python/cumin/scheduler.py mgmt/trunk/cumin/python/cumin/scheduler.strings Log: Don't assume the presence of corresponding system data for grid daemons Modified: mgmt/trunk/cumin/python/cumin/collector.py =================================================================== --- mgmt/trunk/cumin/python/cumin/collector.py 2008-11-06 17:30:20 UTC (rev 2759) +++ mgmt/trunk/cumin/python/cumin/collector.py 2008-11-06 18:26:07 UTC (rev 2760) @@ -64,10 +64,13 @@ return "System" def render_content(self, session, data): - sys = Identifiable(data["system_id"]) - href = self.page.main.system.get_href(session, sys) - return fmt_link(href, data["system_name"]) + id = data["system_id"] + if id: + sys = Identifiable(id) + href = self.page.main.system.get_href(session, sys) + return fmt_link(href, data["system_name"]) + class StartButton(FormButton): def process_submit(self, session): ids = self.parent.ids.get(session) Modified: mgmt/trunk/cumin/python/cumin/collector.strings =================================================================== --- mgmt/trunk/cumin/python/cumin/collector.strings 2008-11-06 17:30:20 UTC (rev 2759) +++ mgmt/trunk/cumin/python/cumin/collector.strings 2008-11-06 18:26:07 UTC (rev 2760) @@ -5,7 +5,7 @@ y.id as system_id, y.node_name as system_name from collector as c -inner join system as y on c.system = y.node_name +left outer join system as y on c.system = y.node_name left outer join collector_stats as cs on cs.id = c.stats_curr_id {sql_where} {sql_orderby} Modified: mgmt/trunk/cumin/python/cumin/negotiator.py =================================================================== --- mgmt/trunk/cumin/python/cumin/negotiator.py 2008-11-06 17:30:20 UTC (rev 2759) +++ mgmt/trunk/cumin/python/cumin/negotiator.py 2008-11-06 18:26:07 UTC (rev 2760) @@ -92,10 +92,13 @@ return "System" def render_content(self, session, data): - sys = Identifiable(data["system_id"]) - href = self.page.main.system.get_href(session, sys) - return fmt_link(href, data["system_name"]) + id = data["system_id"] + if id: + sys = Identifiable(id) + href = self.page.main.system.get_href(session, sys) + return fmt_link(href, data["system_name"]) + class StartButton(FormButton): def process_submit(self, session): ids = self.parent.ids.get(session) Modified: mgmt/trunk/cumin/python/cumin/negotiator.strings =================================================================== --- mgmt/trunk/cumin/python/cumin/negotiator.strings 2008-11-06 17:30:20 UTC (rev 2759) +++ mgmt/trunk/cumin/python/cumin/negotiator.strings 2008-11-06 18:26:07 UTC (rev 2760) @@ -6,7 +6,7 @@ y.node_name as system_name from negotiator as n left outer join negotiator_stats as c on c.id = n.stats_curr_id -inner join system as y on n.system = y.node_name +left outer join system as y on n.system = y.node_name {sql_where} {sql_orderby} {sql_limit} Modified: mgmt/trunk/cumin/python/cumin/scheduler.py =================================================================== --- mgmt/trunk/cumin/python/cumin/scheduler.py 2008-11-06 17:30:20 UTC (rev 2759) +++ mgmt/trunk/cumin/python/cumin/scheduler.py 2008-11-06 18:26:07 UTC (rev 2760) @@ -77,10 +77,13 @@ return "System" def render_content(self, session, data): - sys = Identifiable(data["system_id"]) - href = self.page.main.system.get_href(session, sys) - return fmt_link(href, data["system_name"]) + id = data["system_id"] + if id: + sys = Identifiable(id) + href = self.page.main.system.get_href(session, sys) + return fmt_link(href, data["system_name"]) + class StartButton(FormButton): def process_submit(self, session): ids = self.parent.ids.get(session) Modified: mgmt/trunk/cumin/python/cumin/scheduler.strings =================================================================== --- mgmt/trunk/cumin/python/cumin/scheduler.strings 2008-11-06 17:30:20 UTC (rev 2759) +++ mgmt/trunk/cumin/python/cumin/scheduler.strings 2008-11-06 18:26:07 UTC (rev 2760) @@ -9,7 +9,7 @@ c.total_held_jobs as held from scheduler as s left outer join scheduler_stats as c on c.id = s.stats_curr_id -inner join system as y on s.system = y.node_name +left outer join system as y on s.system = y.node_name {sql_where} {sql_orderby} {sql_limit}