cumin-developers March 2011

cumin-developers@lists.fedorahosted.org

2 participants
111 discussions

r4604 - branches/scale_testing/mint/python/mint
by tmckay＠fedoraproject.org 11 Mar '11

11 Mar '11

Author: tmckay Date: 2011-03-11 20:29:28 +0000 (Fri, 11 Mar 2011) New Revision: 4604 Modified: branches/scale_testing/mint/python/mint/update.py Log: Fix by_class stats Modified: branches/scale_testing/mint/python/mint/update.py =================================================================== --- branches/scale_testing/mint/python/mint/update.py 2011-03-11 19:27:19 UTC (rev 4603) +++ branches/scale_testing/mint/python/mint/update.py 2011-03-11 20:29:28 UTC (rev 4604) @@ -371,8 +371,6 @@ except: cls = None if cls != None: - if thread.stats.objects_dropped_by_class == None: - thread.stats.objects_dropped_by_class = 0 thread.stats.objects_dropped_by_class[cls] += 1 except: @@ -532,8 +530,6 @@ self.model.print_event(3, "Created %s", obj) stats.objects_created += 1 - if stats.objects_created_by_class[cls] == None: - stats.objects_created_by_class[cls] = 0 stats.objects_created_by_class[cls] += 1 return obj @@ -595,8 +591,6 @@ self.model.print_event(4, "Updated %s", obj) stats.objects_updated += 1 - if stats.objects_updated_by_class[cls] == None: - stats.objects_updated_by_class[cls] = 0 stats.objects_updated_by_class[cls] += 1 def delete_object(self, cursor, stats, obj): @@ -605,8 +599,6 @@ self.model.print_event(3, "Deleted %s", obj) stats.objects_deleted += 1 - if stats.objects_deleted_by_class[cls] == None: - stats.objects_deleted_by_class[cls] = 0 stats.objects_deleted_by_class[obj._class] += 1 def process_properties(self, obj, columns, cursor):

1 0

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

11 Mar '11

Author: tmckay Date: 2011-03-11 19:27:19 +0000 (Fri, 11 Mar 2011) New Revision: 4603 Added: branches/scale_testing/cumin/python/cumin/grid/quota.py branches/scale_testing/cumin/python/cumin/grid/quota.strings Log: Quota files missing from branch for some reason Added: branches/scale_testing/cumin/python/cumin/grid/quota.py =================================================================== --- branches/scale_testing/cumin/python/cumin/grid/quota.py (rev 0) +++ branches/scale_testing/cumin/python/cumin/grid/quota.py 2011-03-11 19:27:19 UTC (rev 4603) @@ -0,0 +1,255 @@ +import logging + +from negotiator import GroupHelper + +from cumin.formats import fmt_link +from cumin.objectselector import ObjectQmfSelector, ObjectTableColumn,\ + ObjectQmfTable +from cumin.qmfadapter import ObjectQmfAdapter +from cumin.widgets import StaticColumnHeader + +from wooly.template import WidgetTemplate +from wooly.util import StringCatalog, Writer +from wooly import Parameter, Widget + +strings = StringCatalog(__file__) +log = logging.getLogger("cumin.grid.quota") + +class QmfGroupColumn(ObjectTableColumn): + def __init__(self, app, name, attr, getter, negotiator, task): + super(QmfGroupColumn, self).__init__(app, name, attr) + + self.header = StaticColumnHeader(app, "header") + self.replace_child(self.header) + + self.title = None + self.getter = getter + #self.align = "right" + self.user = False + self.negotiator = negotiator + self.task = task + self.user_task = None + + def render_title(self, session, *args): + return self.title + + def render_content(self, session, group): + data = self.getter(session) + for x in data: + if x[0] == group: + return self.render_data(session, x) + + return "" + + def render_data(self, session, data): + href = self.task.get_href(session) + content = data[2][2] and str(data[1]) or "NOT SET" + return fmt_link(href, content, "", "", self.fmt_hover(data[0])) + + def fmt_hover(self, group): + return "Edit the %s" % self.field.name + +class QuotaAdapter(ObjectQmfAdapter): + def get_data(self, values, options): + items = values['items'] + return items + + def get_count(self, values): + return len(values['items']) + +class QuotaTable(ObjectQmfTable): + def __init__(self, app, name, cls): + super(QuotaTable, self).__init__(app, name, cls) + + limit = Widget(app, "limit") + self.header.replace_child(limit) + + page = Widget(app, "page") + self.header.replace_child(page) + + def get_data_values(self, session): + values = super(QuotaTable, self).get_data_values(session) + + info = self.parent.group_helper.get_config_info(session) + expanded = self.parent.expand.get(session) + + names = list(info) + names = sorted(names) + + # get all the values for csv export + if session.page == self.app.export_page: + items = names + else: + # make a list of groups to show based on what is expanded + parent = expanded and self.parent.group_helper.get_parent(session, expanded) or None + items = list() + for name in names: + # always show top level groups + if "." not in name: + items.append(name) + # add the current expanded item + elif expanded == name: + items.append(name) + # add the ancestors + elif expanded and expanded.startswith(name+"."): + items.append(name) + # add the direct children of expanded item + elif expanded and name.startswith(expanded+"."): + sub_name = name[len(expanded) + 1:] + if "." not in sub_name: + items.append(name) + # and direct children of expanded item's parent + elif parent and name.startswith(parent+"."): + sub_name = name[len(parent) + 1:] + if "." not in sub_name: + items.append(name) + + self.parent.group_helper.get_config_for_groups(session, "GROUP_QUOTA_DYNAMIC", items) + + values['items'] = items + + negotiator = self.parent.negotiator.get(session) + values["obj"] = negotiator + + return values + +class QuotaSelector(ObjectQmfSelector): + def __init__(self, app, name, negotiator, frame): + cls = app.model.com_redhat_cumin_grid.Quota + + super(QuotaSelector, self).__init__(app, name, cls) + + self.update_enabled = True + self.table.update_enabled = False + + self.negotiator = negotiator + self.table.negotiator = negotiator + self.table.adapter = QuotaAdapter(app, cls) + + self.group_helper = GroupHelper(app, "groups", negotiator) + self.add_child(self.group_helper) + + self.expand = Parameter(app, "expand") + self.add_parameter(self.expand) + + col = self.ExpandColumn(app, "id", cls.id, self.expand, self.group_helper) + col.header_class = StaticColumnHeader + col.width = "20px" + self.add_column(col) + + col = self.GroupColumn(app, "group", cls.Name) + col.width = "80%" + self.add_column(col) + + task = frame.edit_dynamic_quota + col = self.DynamicColumn(app, "dynamic", cls.Quota, None, negotiator, task, self.group_helper) + self.add_column(col) + + self.enable_csv_export(negotiator) + + def create_table(self, app, name, cls): + return QuotaTable(app, name, cls) + + def render_title(self, session): + return "Quotas" + + def get_qmf_results(self, session): + negotiator = self.negotiator.get(session) + return self.app.model.get_negotiator_group_names(negotiator) + + class ExpandColumn(ObjectTableColumn): + def __init__(self, app, name, attr, expand, group_helper): + super(QuotaSelector.ExpandColumn, self).__init__(app, name, attr) + + self.expand = expand + self.group_helper = group_helper + + def get_class_list(self, session): + return ["expand"] + + def render_header_href(self, session): + return "" + + def render_header_content(self, session): + return "" + + def render_header_title(self, session): + return "" + + def render_header_link_class(self, session): + return "TableStaticColumnHeader" + + def render_cell_content(self, session, group): + if not self.group_helper.has_child(session, group): + return "" + + self.group_helper.get_config_info(session) + # return a " or - depending on current expand + expand = self.expand.get(session) + if expand and expand.startswith(group): + state = "-" + else: + state = "+" + + parent = self.group_helper.get_parent(session, group) + return self.render_item_link(session, group, parent, state) + + def render_item_link(self, session, group, parent, state): + branch = session.branch() + + next_expand = state == "+" and group or parent + self.expand.set(branch, next_expand) + + hover = state == "-" and "Collapse" or "Expand" + cls = "action" + + return fmt_link(branch.marshal(), state, class_=cls, link_title=hover) + + class GroupColumn(ObjectTableColumn): + def __init__(self, app, name, attr): + super(QuotaSelector.GroupColumn, self).__init__(app, name, attr) + + self.header = StaticColumnHeader(app, "header") + self.replace_child(self.header) + + def render_cell_content(self, session, group): + if session.page == self.app.export_page: + return group + + # if a user + if "." in group: + parts = group.split('.') + indent = len(parts) - 1 + user = parts[indent] + return "<span style='padding-left: %dem;'>%s</span>" % (indent, user) + + return group + + class DynamicColumn(QmfGroupColumn): + def __init__(self, app, name, attr, getter, negotiator, task, group_helper): + super(QuotaSelector.DynamicColumn, self).__init__(app, name, attr, getter, negotiator, task) + + self.group_helper = group_helper + + def render_cell_content(self, session, group): + value = self.group_helper.get_config_value(session, group, "GROUP_QUOTA_DYNAMIC") + self.task.form.group_leader.set(session, group) + + try: + fval = float(value) + except ValueError: + return value + except TypeError: + if isinstance(value, Exception): + content = "<span class='QuotaError'>error</span>" + val = len(value.args) > 0 and value.args[0] or "" + if session.page == self.app.export_page: + return val + return fmt_link("#", content, "", "", val) + + if session.page == self.app.export_page: + return value + + href = self.task.get_href(session) + content = "%s%%" % str(round(fval * 100.0, 2)) + return fmt_link(href, content, "", "", self.fmt_hover("")) Added: branches/scale_testing/cumin/python/cumin/grid/quota.strings =================================================================== --- branches/scale_testing/cumin/python/cumin/grid/quota.strings (rev 0) +++ branches/scale_testing/cumin/python/cumin/grid/quota.strings 2011-03-11 19:27:19 UTC (rev 4603) @@ -0,0 +1,7 @@ +[QuotaSelector.css] + +span.QuotaError { + font-style: italic; + color: red; +} +

1 0

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

11 Mar '11

Author: eallen Date: 2011-03-11 14:49:19 +0000 (Fri, 11 Mar 2011) New Revision: 4602 Modified: trunk/cumin/python/cumin/grid/slot.strings Log: Fix for BZ 647500: Highlight the correct slots when the mouse rolls over the legend Modified: trunk/cumin/python/cumin/grid/slot.strings =================================================================== --- trunk/cumin/python/cumin/grid/slot.strings 2011-03-11 14:48:23 UTC (rev 4601) +++ trunk/cumin/python/cumin/grid/slot.strings 2011-03-11 14:49:19 UTC (rev 4602) @@ -386,7 +386,11 @@ div.SlotLegend dd { margin: 0 0 0 1em; padding: 0; + cursor: default; } +div.SlotLegend dd:hover { + color: #FF0000; +} div.SlotLegend dd img { margin: 0; position: relative; @@ -409,7 +413,7 @@ </div> [SlotLegend.item_html] - <dt onmouseover="vis_treemap_over('category_group', '{category}')" onmouseout="vis_treemap_out('category_group', '{category}')">{category}</dt> + <dt>{category}</dt> {category_items} [SlotCategories.html]

1 0

r4601 - trunk/cumin/python/cumin
by eallen＠fedoraproject.org 11 Mar '11

11 Mar '11

Author: eallen Date: 2011-03-11 14:48:23 +0000 (Fri, 11 Mar 2011) New Revision: 4601 Modified: trunk/cumin/python/cumin/stat.py Log: Make the 4th color in a pie chart a bit darker so it contrasts with the 1st color better Modified: trunk/cumin/python/cumin/stat.py =================================================================== --- trunk/cumin/python/cumin/stat.py 2011-03-10 15:25:58 UTC (rev 4600) +++ trunk/cumin/python/cumin/stat.py 2011-03-11 14:48:23 UTC (rev 4601) @@ -240,8 +240,8 @@ BLUES = "blues" GROUP2 = "group2" color_schemes = {"rainbow": [(1,0,0), (0,1,0), (0,0,1), (1,1,0), (1,0,1), (0,1,1)], - "greens": [(0,1,0), (.9,1,.9), (.6,1,.6), (.3,1,.3), (0,.5,0)], - "blues": [(0,0,1), (.9,.9,1), (.6,.6,1), (.3,.3,1), (0,0,.5)], + "greens": [(0,1,0), (.9,1,.9), (.6,1,.6), (.3,.6,.3), (0,.5,0)], + "blues": [(0,0,1), (.9,.9,1), (.6,.6,1), (.3,.3,.6), (0,0,.5)], "group2": [(1,0,0), (1,.6,.6), (0,1,0), (.6,1,.6), (0,0,1), (.6,.6,1),

1 0

r4600 - trunk/wooly/resources
by eallen＠fedoraproject.org 10 Mar '11

10 Mar '11

Author: eallen Date: 2011-03-10 15:25:58 +0000 (Thu, 10 Mar 2011) New Revision: 4600 Modified: trunk/wooly/resources/mootools.js Log: Update some mootools core functions to pickup fixes for IE. This is needed for the stickywin classes. Modified: trunk/wooly/resources/mootools.js =================================================================== --- trunk/wooly/resources/mootools.js 2011-03-09 21:35:49 UTC (rev 4599) +++ trunk/wooly/resources/mootools.js 2011-03-10 15:25:58 UTC (rev 4600) @@ -117,17 +117,152 @@ new Document(c.contentWindow.document);$extend(h.Element.prototype,Element.Prototype);}e.call(c.contentWindow,c.contentWindow.document);};var a=$try(function(){return c.contentWindow; });((a&&a.document.body)||window.frames[d.id])?b():c.addListener("load",b);return c;}});var Elements=new Native({initialize:function(f,b){b=$extend({ddup:true,cash:true},b); f=f||[];if(b.ddup||b.cash){var g={},e=[];for(var c=0,a=f.length;c<a;c++){var d=document.id(f[c],!b.cash);if(b.ddup){if(g[d.uid]){continue;}g[d.uid]=true; -}if(d){e.push(d);}}f=e;}return(b.cash)?$extend(f,this):f;}});Elements.implement({filter:function(a,b){if(!a){return this;}return new Elements(Array.filter(this,(typeof a=="string")?function(c){return c.match(a); -}:a,b));}});Document.implement({newElement:function(a,b){if(Browser.Engine.trident&&b){["name","type","checked"].each(function(c){if(!b[c]){return;}a+=" "+c+'="'+b[c]+'"'; -if(c!="checked"){delete b[c];}});a="<"+a+">";}return document.id(this.createElement(a)).set(b);},newTextNode:function(a){return this.createTextNode(a); -},getDocument:function(){return this;},getWindow:function(){return this.window;},id:(function(){var a={string:function(d,c,b){d=b.getElementById(d);return(d)?a.element(d,c):null; -},element:function(b,e){$uid(b);if(!e&&!b.$family&&!(/^object|embed$/i).test(b.tagName)){var c=Element.Prototype;for(var d in c){b[d]=c[d];}}return b;},object:function(c,d,b){if(c.toElement){return a.element(c.toElement(b),d); -}return null;}};a.textnode=a.whitespace=a.window=a.document=$arguments(0);return function(c,e,d){if(c&&c.$family&&c.uid){return c;}var b=$type(c);return(a[b])?a[b](c,e,d||document):null; -};})()});if(window.$==null){Window.implement({$:function(a,b){return document.id(a,b,this.document);}});}Window.implement({$$:function(a){if(arguments.length==1&&typeof a=="string"){return this.document.getElements(a); -}var f=[];var c=Array.flatten(arguments);for(var d=0,b=c.length;d<b;d++){var e=c[d];switch($type(e)){case"element":f.push(e);break;case"string":f.extend(this.document.getElements(e,true)); -}}return new Elements(f);},getDocument:function(){return this.document;},getWindow:function(){return this;}});Native.implement([Element,Document],{getElement:function(a,b){return document.id(this.getElements(a,true)[0]||null,b); -},getElements:function(a,d){a=a.split(",");var c=[];var b=(a.length>1);a.each(function(e){var f=this.getElementsByTagName(e.trim());(b)?c.extend(f):c=f; -},this);return new Elements(c,{ddup:b,cash:!d});}});(function(){var h={},f={};var i={input:"checked",option:"selected",textarea:(Browser.Engine.webkit&&Browser.Engine.version<420)?"innerHTML":"value"}; +}if(d){e.push(d);}}f=e;}return(b.cash)?$extend(f,this):f;}}); + +Elements.implement({ + + filter: function(filter, bind){ + if (!filter) return this; + return new Elements(Array.filter(this, (typeof filter == 'string') ? function(item){ + return item.match(filter); + } : filter, bind)); + } + +}); + +(function(){ + +/*<ltIE8>*/ +var createElementAcceptsHTML; +try { + var x = document.createElement('<input name=x>'); + createElementAcceptsHTML = (x.name == 'x'); +} catch(e){} + +var escapeQuotes = function(html){ + return ('' + html).replace(/&/g,'&').replace(/"/g,'"'); +}; +/*</ltIE8>*/ + +Document.implement({ + + newElement: function(tag, props){ + if (props && props.checked != null) props.defaultChecked = props.checked; + /*<ltIE8>*/// Fix for readonly name and type properties in IE < 8 + if (createElementAcceptsHTML && props){ + tag = '<' + tag; + if (props.name) tag += ' name="' + escapeQuotes(props.name) + '"'; + if (props.type) tag += ' type="' + escapeQuotes(props.type) + '"'; + tag += '>'; + delete props.name; + delete props.type; + } + /*</ltIE8>*/ + return this.id(this.createElement(tag)).set(props); + }, + + newTextNode: function(text){ + return this.createTextNode(text); + }, + + getDocument: function(){ + return this; + }, + + getWindow: function(){ + return this.window; + }, + + id: (function(){ + + var types = { + + string: function(id, nocash, doc){ + id = doc.getElementById(id); + return (id) ? types.element(id, nocash) : null; + }, + + element: function(el, nocash){ + $uid(el); + if (!nocash && !el.$family && !(/^object|embed$/i).test(el.tagName)){ + var proto = Element.Prototype; + for (var p in proto) el[p] = proto[p]; + }; + return el; + }, + + object: function(obj, nocash, doc){ + if (obj.toElement) return types.element(obj.toElement(doc), nocash); + return null; + } + + }; + + types.textnode = types.whitespace = types.window = types.document = $arguments(0); + + return function(el, nocash, doc){ + if (el && el.$family && el.uid) return el; + var type = $type(el); + return (types[type]) ? types[type](el, nocash, doc || document) : null; + }; + + })() + +}); + +})(); + +if (window.$ == null) Window.implement({ + $: function(el, nc){ + return document.id(el, nc, this.document); + } +}); + +Window.implement({ + + $$: function(selector){ + if (arguments.length == 1 && typeof selector == 'string') return this.document.getElements(selector); + var elements = []; + var args = Array.flatten(arguments); + for (var i = 0, l = args.length; i < l; i++){ + var item = args[i]; + switch ($type(item)){ + case 'element': elements.push(item); break; + case 'string': elements.extend(this.document.getElements(item, true)); + } + } + return new Elements(elements); + }, + + getDocument: function(){ + return this.document; + }, + + getWindow: function(){ + return this; + } + +}); + +Native.implement([Element, Document], { + + getElement: function(selector, nocash){ + return document.id(this.getElements(selector, true)[0] || null, nocash); + }, + + getElements: function(tags, nocash){ + tags = tags.split(','); + var elements = []; + var ddup = (tags.length > 1); + tags.each(function(tag){ + var partial = this.getElementsByTagName(tag.trim()); + (ddup) ? elements.extend(partial) : elements = partial; + }, this); + return new Elements(elements, {ddup: ddup, cash: !nocash}); + } + +}); +(function(){var h={},f={};var i={input:"checked",option:"selected",textarea:(Browser.Engine.webkit&&Browser.Engine.version<420)?"innerHTML":"value"}; var c=function(l){return(f[l]||(f[l]={}));};var g=function(n,l){if(!n){return;}var m=n.uid;if(Browser.Engine.trident){if(n.clearAttributes){var q=l&&n.cloneNode(false); n.clearAttributes();if(q){n.mergeAttributes(q);}}else{if(n.removeEvents){n.removeEvents();}}if((/object/i).test(n.tagName)){for(var o in n){if(typeof n[o]=="function"){n[o]=$empty; }}Element.dispose(n);}}if(!m){return;}h[m]=f[m]=null;};var d=function(){Hash.each(h,g);if(Browser.Engine.trident){$A(document.getElementsByTagName("object")).each(g);

1 0

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

09 Mar '11

Author: eallen Date: 2011-03-09 21:35:49 +0000 (Wed, 09 Mar 2011) New Revision: 4599 Modified: trunk/cumin/model/qpid.xml Log: Made messageLatency optional again after the update. Modified: trunk/cumin/model/qpid.xml =================================================================== --- trunk/cumin/model/qpid.xml 2011-03-09 20:47:44 UTC (rev 4598) +++ trunk/cumin/model/qpid.xml 2011-03-09 21:35:49 UTC (rev 4599) @@ -174,7 +174,7 @@ <statistic name="consumerCount" type="hilo32" unit="consumer" desc="Current consumers on queue"/> <statistic name="bindingCount" type="hilo32" unit="binding" desc="Current bindings"/> <statistic name="unackedMessages" type="hilo32" unit="message" desc="Messages consumed but not yet acked"/> - <statistic name="messageLatency" type="mmaTime" unit="nanosecond" desc="Broker latency through this queue"/> + <statistic name="messageLatency" type="mmaTime" unit="nanosecond" desc="Broker latency through this queue" optional="y"/> <statistic name="flowStopped" type="bool" desc="Flow control active."/> <statistic name="flowStoppedCount" type="count32" desc="Number of times flow control was activated for this queue"/>

1 0

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

09 Mar '11

Author: eallen Date: 2011-03-09 20:47:44 +0000 (Wed, 09 Mar 2011) New Revision: 4598 Modified: trunk/cumin/model/qpid-acl.xml trunk/cumin/model/qpid.xml Log: Newer versions of some xml files Modified: trunk/cumin/model/qpid-acl.xml =================================================================== --- trunk/cumin/model/qpid-acl.xml 2011-03-09 17:26:24 UTC (rev 4597) +++ trunk/cumin/model/qpid-acl.xml 2011-03-09 20:47:44 UTC (rev 4598) @@ -18,7 +18,7 @@ <class name="Acl"> <property name="brokerRef" type="objId" references="org.apache.qpid.broker:Broker" access="RO" index="y" parentRef="y"/> - <property name="policyFile" type="sstr" access="RO" desc="Name of the policy file"/> + <property name="policyFile" type="lstr" access="RO" desc="Name of the policy file"/> <property name="enforcingAcl" type="bool" access="RO" desc="Currently Enforcing ACL"/> <property name="transferAcl" type="bool" access="RO" desc="Any transfer ACL rules in force"/> <property name="lastAclLoad" type="absTime" access="RO" desc="Timestamp of last successful load of ACL"/> @@ -32,7 +32,7 @@ <arg name="arguments" type="map"/> <arg name="objectName" type="sstr"/> <arg name="objectType" type="sstr"/> - <arg name="reason" type="sstr"/> + <arg name="reason" type="lstr"/> <arg name="userId" type="sstr"/> </eventArguments> Modified: trunk/cumin/model/qpid.xml =================================================================== --- trunk/cumin/model/qpid.xml 2011-03-09 17:26:24 UTC (rev 4597) +++ trunk/cumin/model/qpid.xml 2011-03-09 20:47:44 UTC (rev 4598) @@ -70,7 +70,7 @@ <property name="stagingThreshold" type="uint32" access="RO" desc="Broker stages messages over this size to disk"/> <property name="mgmtPubInterval" type="uint16" access="RW" unit="second" min="1" desc="Interval for management broadcasts"/> <property name="version" type="sstr" access="RO" desc="Running software version"/> - <property name="dataDir" type="sstr" access="RO" optional="y" desc="Persistent configuration storage location"/> + <property name="dataDir" type="lstr" access="RO" optional="y" desc="Persistent configuration storage location"/> <statistic name="uptime" type="deltaTime"/> <method name="echo" desc="Request a response to test the path to the management broker"> @@ -94,6 +94,27 @@ <arg name="qty" dir="I" type="uint32" desc="# of messages to move. 0 means all messages"/> </method> + <method name="setLogLevel" desc="Set the log level"> + <arg name="level" dir="I" type="sstr"/> + </method> + + <method name="getLogLevel" desc="Get the current log level"> + <arg name="level" dir="O" type="sstr"/> + </method> + + <method name="create" desc="Create an object of the specified type"> + <arg name="type" dir="I" type="sstr" desc="The type of object to create"/> + <arg name="name" dir="I" type="sstr" desc="The name of the object to create"/> + <arg name="properties" dir="I" type="map" desc="Type specific object properties"/> + <arg name="strict" dir="I" type="bool" desc="If specified, treat unrecognised object properties as an error"/> + </method> + + <method name="delete" desc="Delete an object of the specified type"> + <arg name="type" dir="I" type="sstr" desc="The type of object to delete"/> + <arg name="name" dir="I" type="sstr" desc="The name of the object to delete"/> + <arg name="options" dir="I" type="map" desc="Type specific object options for deletion"/> + </method> + </class> <!-- @@ -153,7 +174,9 @@ <statistic name="consumerCount" type="hilo32" unit="consumer" desc="Current consumers on queue"/> <statistic name="bindingCount" type="hilo32" unit="binding" desc="Current bindings"/> <statistic name="unackedMessages" type="hilo32" unit="message" desc="Messages consumed but not yet acked"/> - <statistic name="messageLatency" type="mmaTime" unit="nanosecond" desc="Broker latency through this queue" optional="y"/> + <statistic name="messageLatency" type="mmaTime" unit="nanosecond" desc="Broker latency through this queue"/> + <statistic name="flowStopped" type="bool" desc="Flow control active."/> + <statistic name="flowStoppedCount" type="count32" desc="Number of times flow control was activated for this queue"/> <method name="purge" desc="Discard all or some messages on a queue"> <arg name="request" dir="I" type="uint32" desc="0 for all messages or n>0 for n messages"/> @@ -198,7 +221,7 @@ <class name="Binding"> <property name="exchangeRef" type="objId" references="Exchange" access="RC" index="y" parentRef="y"/> <property name="queueRef" type="objId" references="Queue" access="RC" index="y"/> - <property name="bindingKey" type="sstr" access="RC" index="y"/> + <property name="bindingKey" type="lstr" access="RC" index="y"/> <property name="arguments" type="map" access="RC"/> <property name="origin" type="sstr" access="RO" optional="y"/> @@ -234,7 +257,7 @@ <property name="SystemConnection" type="bool" access="RC" desc="Infrastucture/ Inter-system connection (Cluster, Federation, ...)"/> <property name="federationLink" type="bool" access="RO" desc="Is this a federation link"/> <property name="authIdentity" type="sstr" access="RO" desc="authId of connection if authentication enabled"/> - <property name="remoteProcessName" type="sstr" access="RO" optional="y" desc="Name of executable running as remote client"/> + <property name="remoteProcessName" type="lstr" access="RO" optional="y" desc="Name of executable running as remote client"/> <property name="remotePid" type="uint32" access="RO" optional="y" desc="Process ID of remote client"/> <property name="remoteParentPid" type="uint32" access="RO" optional="y" desc="Parent Process ID of remote client"/> <property name="shadow" type="bool" access="RO" desc="True for shadow connections"/> @@ -243,6 +266,8 @@ <statistic name="framesToClient" type="count64"/> <statistic name="bytesFromClient" type="count64"/> <statistic name="bytesToClient" type="count64"/> + <statistic name="msgsFromClient" type="count64"/> + <statistic name="msgsToClient" type="count64"/> <method name="close"/> </class> @@ -263,7 +288,7 @@ <property name="durable" type="bool" access="RC"/> <statistic name="state" type="sstr" desc="Operational state of the link"/> - <statistic name="lastError" type="sstr" desc="Reason link is not operational"/> + <statistic name="lastError" type="lstr" desc="Reason link is not operational"/> <method name="close"/> @@ -271,7 +296,7 @@ <arg name="durable" dir="I" type="bool"/> <arg name="src" dir="I" type="sstr"/> <arg name="dest" dir="I" type="sstr"/> - <arg name="key" dir="I" type="sstr"/> + <arg name="key" dir="I" type="lstr"/> <arg name="tag" dir="I" type="sstr"/> <arg name="excludes" dir="I" type="sstr"/> <arg name="srcIsQueue" dir="I" type="bool"/> @@ -293,7 +318,7 @@ <property name="durable" type="bool" access="RC"/> <property name="src" type="sstr" access="RC"/> <property name="dest" type="sstr" access="RC"/> - <property name="key" type="sstr" access="RC"/> + <property name="key" type="lstr" access="RC"/> <property name="srcIsQueue" type="bool" access="RC"/> <property name="srcIsLocal" type="bool" access="RC"/> <property name="tag" type="sstr" access="RC"/> @@ -370,6 +395,8 @@ <arg name="reason" type="lstr" desc="Reason for a failure"/> <arg name="rhost" type="sstr" desc="Address (i.e. DNS name, IP address, etc.) of a remotely connected host"/> <arg name="user" type="sstr" desc="Authentication identity"/> + <arg name="msgDepth" type="count32" desc="Current size of queue in messages"/> + <arg name="byteDepth" type="count32" desc="Current size of queue in bytes"/> </eventArguments> <event name="clientConnect" sev="inform" args="rhost, user"/> @@ -385,5 +412,6 @@ <event name="unbind" sev="inform" args="rhost, user, exName, qName, key"/> <event name="subscribe" sev="inform" args="rhost, user, qName, dest, excl, args"/> <event name="unsubscribe" sev="inform" args="rhost, user, dest"/> + <event name="queueThresholdExceeded" sev="warn" args="qName, msgDepth, byteDepth"/> </schema>

1 0

r4597 - in branches/scale_testing: cumin/bin mint/python/mint
by tmckay＠fedoraproject.org 09 Mar '11

09 Mar '11

Author: tmckay Date: 2011-03-09 17:26:24 +0000 (Wed, 09 Mar 2011) New Revision: 4597 Modified: branches/scale_testing/cumin/bin/cumin branches/scale_testing/cumin/bin/cumin-data branches/scale_testing/mint/python/mint/update.py Log: Merge in support for pass through options from trunk. Set up stats collecting for multiple simultaneous instances Modified: branches/scale_testing/cumin/bin/cumin =================================================================== --- branches/scale_testing/cumin/bin/cumin 2011-03-09 17:23:21 UTC (rev 4596) +++ branches/scale_testing/cumin/bin/cumin 2011-03-09 17:26:24 UTC (rev 4597) @@ -32,12 +32,14 @@ log.error("".join(msg)) return True -def get_args(app, section, init_only, console): +def get_args(app, section, init_only, console, extra_options=""): args = [app, "--section="+section] if init_only: args.append("--init-only") if not console: args.append("--daemon") + if len(extra_options) != 0: + args += extra_options.split(" ") prog_string = "".join([" "+x for x in args]) return args, prog_string @@ -64,6 +66,16 @@ parser.add_option("--console", dest="console", action="store_true", default=False, help="Log to stderr rather than master.log, no IO redirection for children.") + parser.add_option("--data_options", dest="data_options", default="", type=str, + help="Additional options string to pass to data instances."\ + "\nEnclose in quotes, options must be --option form, splits on spaces."\ + '\nExample: data_options="--print-events=5 --print-stats"') + + parser.add_option("--web_options", dest="web_options", default="", type=str, + help="Additional options string to pass to web instances."\ + "\nEnclose in quotes, options must be --option form, splits on spaces."\ + '\nExample: web_options="--debug --port=12345"') + # Trap exit from parser and save standard error for logging # Then put stderr back to original value r, w = os.pipe() @@ -95,11 +107,11 @@ # create list elements to hold the process object, section arg, and app apps = [] for instance in options.webs.split(','): - args, prog_string = get_args("cumin-web", instance, options.init_only, console) + args, prog_string = get_args("cumin-web", instance, options.init_only, console, options.web_options) apps.append([None, args, prog_string]) for instance in options.datas.split(','): - args, prog_string = get_args("cumin-data", instance, options.init_only, console) + args, prog_string = get_args("cumin-data", instance, options.init_only, console, options.data_options) apps.append([None, args, prog_string]) # If we are just checking startup flags, invoke each instance Modified: branches/scale_testing/cumin/bin/cumin-data =================================================================== --- branches/scale_testing/cumin/bin/cumin-data 2011-03-09 17:23:21 UTC (rev 4596) +++ branches/scale_testing/cumin/bin/cumin-data 2011-03-09 17:26:24 UTC (rev 4597) @@ -129,7 +129,7 @@ # set up for scale stats here if opts.scale_stats: - stats.init_stats_path(mint, config.home) + stats.init_stats_path(mint, config.home, section_name) if opts.print_stats or opts.scale_stats: while True: Modified: branches/scale_testing/mint/python/mint/update.py =================================================================== --- branches/scale_testing/mint/python/mint/update.py 2011-03-09 17:23:21 UTC (rev 4596) +++ branches/scale_testing/mint/python/mint/update.py 2011-03-09 17:26:24 UTC (rev 4597) @@ -236,12 +236,15 @@ args = (cls._name, created, updated, deleted, dropped) print "%-20s %10i %10i %10i %10i" % args - def init_stats_path(self, mint, path): + def init_stats_path(self, mint, path, section_name): p = os.path.join(path, \ - "stats_"+ time.strftime("%m%d%y_%H%M%S",time.localtime())) + "stats_"+ time.strftime("%m%d%y_%H%M%S",time.localtime()), section_name) if not os.path.exists(p): - os.makedirs(p) + try: + os.makedirs(p) + except: + pass # init the path for general stats self.stats_path = os.path.join(p, "stats.csv")

1 0

r4596 - trunk/cumin/bin
by tmckay＠fedoraproject.org 09 Mar '11

09 Mar '11

Author: tmckay Date: 2011-03-09 17:23:21 +0000 (Wed, 09 Mar 2011) New Revision: 4596 Modified: trunk/cumin/bin/cumin Log: Allow for additional options to be passed through to data and web instancs. This is a simple mechanism for devel support. Modified: trunk/cumin/bin/cumin =================================================================== --- trunk/cumin/bin/cumin 2011-03-09 16:21:04 UTC (rev 4595) +++ trunk/cumin/bin/cumin 2011-03-09 17:23:21 UTC (rev 4596) @@ -32,12 +32,14 @@ log.error("".join(msg)) return True -def get_args(app, section, init_only, console): +def get_args(app, section, init_only, console, extra_options=""): args = [app, "--section="+section] if init_only: args.append("--init-only") if not console: args.append("--daemon") + if len(extra_options) != 0: + args += extra_options.split(" ") prog_string = "".join([" "+x for x in args]) return args, prog_string @@ -64,6 +66,16 @@ parser.add_option("--console", dest="console", action="store_true", default=False, help="Log to stderr rather than master.log, no IO redirection for children.") + parser.add_option("--data_options", dest="data_options", default="", type=str, + help="Additional options string to pass to data instances."\ + "\nEnclose in quotes, options must be --option form, splits on spaces."\ + '\nExample: data_options="--print-events=5 --print-stats"') + + parser.add_option("--web_options", dest="web_options", default="", type=str, + help="Additional options string to pass to web instances."\ + "\nEnclose in quotes, options must be --option form, splits on spaces."\ + '\nExample: web_options="--debug --port=12345"') + # Trap exit from parser and save standard error for logging # Then put stderr back to original value r, w = os.pipe() @@ -95,11 +107,11 @@ # create list elements to hold the process object, section arg, and app apps = [] for instance in options.webs.split(','): - args, prog_string = get_args("cumin-web", instance, options.init_only, console) + args, prog_string = get_args("cumin-web", instance, options.init_only, console, options.web_options) apps.append([None, args, prog_string]) for instance in options.datas.split(','): - args, prog_string = get_args("cumin-data", instance, options.init_only, console) + args, prog_string = get_args("cumin-data", instance, options.init_only, console, options.data_options) apps.append([None, args, prog_string]) # If we are just checking startup flags, invoke each instance

1 0

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

09 Mar '11

Author: eallen Date: 2011-03-09 16:21:04 +0000 (Wed, 09 Mar 2011) New Revision: 4595 Modified: trunk/cumin/python/cumin/grid/dashboard.py trunk/cumin/python/cumin/grid/dashboard.strings Log: Fix Scheduler Performance display problem Don't try to chart time values in the negotiator stats Lighten up the hover effect on the negotiator stats Modified: trunk/cumin/python/cumin/grid/dashboard.py =================================================================== --- trunk/cumin/python/cumin/grid/dashboard.py 2011-03-09 16:17:14 UTC (rev 4594) +++ trunk/cumin/python/cumin/grid/dashboard.py 2011-03-09 16:21:04 UTC (rev 4595) @@ -854,7 +854,8 @@ self.popup_charts = dict() for attr in self.attrs: # don't try and chart the strings - if cls._statistics_by_name[attr].type != "lstr": + cls_type = cls._statistics_by_name[attr].type + if cls_type not in ("lstr", "absTime"): chart = StatFlashChart(app, "popup%s" % attr, self.object) chart.stats = [attr] self.popup_charts[attr] = chart Modified: trunk/cumin/python/cumin/grid/dashboard.strings =================================================================== --- trunk/cumin/python/cumin/grid/dashboard.strings 2011-03-09 16:17:14 UTC (rev 4594) +++ trunk/cumin/python/cumin/grid/dashboard.strings 2011-03-09 16:21:04 UTC (rev 4595) @@ -16,6 +16,7 @@ [DashboardPerformance.css] div.DashboardPerformance { width: 1000px; + clear: both; } div.DashboardPerformance div.TabbedModeSet { @@ -205,7 +206,7 @@ } div.DashboardNegotiatorStatSet tr.item:hover { - background-color: #E7E7F7; + background-color: #FAFAFF; } [DashboardNegotiatorStatSet.html]

1 0

← Newer
1
...
5
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