November 2010 - rhmessaging-commits

rhmessaging commits: r4417 - store/trunk/cpp/tests.

by rhmessaging-commits＠lists.jboss.org

Author: kpvdr Date: 2010-11-29 16:04:56 -0500 (Mon, 29 Nov 2010) New Revision: 4417 Modified: store/trunk/cpp/tests/persistence.py Log: Update to old persistence test to keep up with changes in Python 2.7 Modified: store/trunk/cpp/tests/persistence.py =================================================================== --- store/trunk/cpp/tests/persistence.py 2010-11-29 15:51:15 UTC (rev 4416) +++ store/trunk/cpp/tests/persistence.py 2010-11-29 21:04:56 UTC (rev 4417) @@ -493,6 +493,7 @@ def __init__(self): + TestBase010.__init__(self, "run") self.setBroker("localhost") self.errata = []

13 years, 7 months

1
0
0 / 0

rhmessaging commits: r4416 - in mgmt/trunk: rosemary/python/rosemary and 1 other directory.

by rhmessaging-commits＠lists.jboss.org

Author: eallen Date: 2010-11-29 10:51:15 -0500 (Mon, 29 Nov 2010) New Revision: 4416 Modified: mgmt/trunk/cumin/python/cumin/objectselector.py mgmt/trunk/cumin/python/cumin/sqladapter.py mgmt/trunk/rosemary/python/rosemary/model.py mgmt/trunk/rosemary/python/rosemary/sqlfilter.py Log: Implemented BZ 64721: Added partial match filters to selector tables. Added Begins and Contains filters. Filters are case sensitive. Modified: mgmt/trunk/cumin/python/cumin/objectselector.py =================================================================== --- mgmt/trunk/cumin/python/cumin/objectselector.py 2010-11-20 15:14:52 UTC (rev 4415) +++ mgmt/trunk/cumin/python/cumin/objectselector.py 2010-11-29 15:51:15 UTC (rev 4416) @@ -25,6 +25,9 @@ # (RosemaryAttribute this, RosemaryAttribute that, Attribute object) self.filter_specs = list() + # ((RosemaryAttribute this, Attribute value, SqlLikeFilter.BEGINS) + self.like_specs = list() + def init(self): if not self.adapter: self.adapter = ObjectSqlAdapter(self.app, self.cls) @@ -34,6 +37,9 @@ for this, that, fobj in self.filter_specs: self.adapter.add_value_filter(this) + for this, vattr, type in self.like_specs: + self.adapter.add_like_filter(this) + if self.sort.default is None: for col in self.columns: if col.sortable: @@ -67,6 +73,12 @@ self.add_filter(attribute, this, that) + def add_like_filter(self, attribute, this, type=SqlLikeFilter.BEGINS): + assert isinstance(attribute, Attribute), attribute + assert isinstance(this, RosemaryAttribute), this + + self.like_specs.append((this, attribute, type)) + def get_data_values(self, session): values = dict() @@ -74,6 +86,11 @@ obj = fobj.get(session) values[this.name] = getattr(obj, that.name) + for this, vattr, type in self.like_specs: + value = vattr.get(session) + pre = type == SqlLikeFilter.CONTAINS and "%%" or "" + values[this.name] = "%s%s%%" % (pre, value) + return values def render_title(self, session): Modified: mgmt/trunk/cumin/python/cumin/sqladapter.py =================================================================== --- mgmt/trunk/cumin/python/cumin/sqladapter.py 2010-11-20 15:14:52 UTC (rev 4415) +++ mgmt/trunk/cumin/python/cumin/sqladapter.py 2010-11-29 15:51:15 UTC (rev 4416) @@ -89,6 +89,12 @@ filter = SqlComparisonFilter(attr.sql_column, value) self.query.add_filter(filter) + def add_like_filter(self, attr): + assert attr + + filter = SqlLikeFilter(attr.sql_column) + self.query.add_filter(filter) + class ObjectSqlField(SqlField): def __init__(self, adapter, attr): assert isinstance(adapter, ObjectSqlAdapter), adapter Modified: mgmt/trunk/rosemary/python/rosemary/model.py =================================================================== --- mgmt/trunk/rosemary/python/rosemary/model.py 2010-11-20 15:14:52 UTC (rev 4415) +++ mgmt/trunk/rosemary/python/rosemary/model.py 2010-11-29 15:51:15 UTC (rev 4416) @@ -375,6 +375,25 @@ return selection + def get_selection_like(self, cursor, **criteria): + selection = list() + sql = SqlSelect(self.sql_table) + + for name in criteria: + column = self.sql_table._columns_by_name[name] + sql.add_filter(SqlLikeFilter(column)) + + sql.execute(cursor, criteria) + + for record in cursor.fetchall(): + obj = RosemaryObject(self, None) + + self.set_object_attributes(obj, self.sql_table._columns, record) + + selection.append(obj) + + return selection + def get_object_by_id(self, cursor, id): assert id Modified: mgmt/trunk/rosemary/python/rosemary/sqlfilter.py =================================================================== --- mgmt/trunk/rosemary/python/rosemary/sqlfilter.py 2010-11-20 15:14:52 UTC (rev 4415) +++ mgmt/trunk/rosemary/python/rosemary/sqlfilter.py 2010-11-29 15:51:15 UTC (rev 4416) @@ -32,3 +32,9 @@ def emit(self): return "%s (%s)" % (self.operator, self.subquery) + +class SqlLikeFilter(SqlValueFilter): + BEGINS = "B" + CONTAINS = "C" + def __init__(self, this, operator="like"): + super(SqlLikeFilter, self).__init__(this, operator)

13 years, 7 months

1
0
0 / 0

Hi rhmessaging-commits

by Julya Smirnova

13 years, 7 months

1
0
0 / 0

rhmessaging commits: r4415 - mgmt/trunk/cumin/python/cumin.

by rhmessaging-commits＠lists.jboss.org

Author: eallen Date: 2010-11-20 10:14:52 -0500 (Sat, 20 Nov 2010) New Revision: 4415 Modified: mgmt/trunk/cumin/python/cumin/model.py Log: Removing some commented out code to test eclipse / subversion config on fedora 14 Modified: mgmt/trunk/cumin/python/cumin/model.py =================================================================== --- mgmt/trunk/cumin/python/cumin/model.py 2010-11-15 16:59:25 UTC (rev 4414) +++ mgmt/trunk/cumin/python/cumin/model.py 2010-11-20 15:14:52 UTC (rev 4415) @@ -1232,36 +1232,6 @@ def get_object_name(self, conn): return conn.address -# class CuminSession(RemoteClass): -# def __init__(self, model): -# super(CuminSession, self).__init__(model, "session", -# Session, SessionStats) - -# prop = CuminProperty(self, "name") -# prop.title = "Name" - -# prop = CuminProperty(self, "channelId") -# prop.title = "Channel ID" - -# prop = CuminProperty(self, "detachedLifespan") -# prop.title = "Detached Lifespan" - -# stat = CuminStat(self, "expireTime") -# stat.title = "Expiration" -# stat.category = "general" - -# stat = CuminStat(self, "framesOutstanding") -# stat.title = "Frames Outstanding" -# stat.unit = "frame" -# stat.category = "general" - -# stat = CuminStat(self, "attached") -# stat.title = "Attached" -# stat.category = "general" - -# def get_title(self, session): -# return "Session" - class CuminLink(RemoteClass): def __init__(self, model): super(CuminLink, self).__init__(model, "link", Link, LinkStats)

13 years, 7 months

1
0
0 / 0

rhmessaging commits: r4414 - in mgmt/trunk: rosemary/python/rosemary and 1 other directory.

by rhmessaging-commits＠lists.jboss.org

Author: tmckay Date: 2010-11-15 11:59:25 -0500 (Mon, 15 Nov 2010) New Revision: 4414 Modified: mgmt/trunk/mint/python/mint/update.py mgmt/trunk/rosemary/python/rosemary/model.py Log: Replaced obj._sync_time with two attributes, obj._save_time and obj._load_time to more explicitly track activity on an object. Marked set_object_attributes() as an internal method (by "_" convention). The new obj._save_time alleviates the need for obj_.last_write_time which was added to allow forced writes to the database after an interval. jross and tmckay. Modified: mgmt/trunk/mint/python/mint/update.py =================================================================== --- mgmt/trunk/mint/python/mint/update.py 2010-11-12 19:53:20 UTC (rev 4413) +++ mgmt/trunk/mint/python/mint/update.py 2010-11-15 16:59:25 UTC (rev 4414) @@ -252,17 +252,6 @@ if cls._package is self.model.org_apache_qpid_broker: self.maybe_drop_sample(obj) - # We want a time stamp that shows the last time an - # object was written through to the database. If we see that - # updates are coming in, but an object is not being - # written through because values are the same, - # we want to force a write after a while. This prevents - # objects from being filtered out in the UI. - - # Initialize our tracking timestamp here if it does not yet exist. - if not hasattr(obj,"_last_write_time"): - obj._last_write_time = obj._qmf_update_time - self.update_object(cursor, stats, obj) def get_agent_id(self): @@ -352,7 +341,7 @@ self.process_deferred_links(cursor, obj) - obj._sync_time = datetime.now() + obj._save_time = datetime.now() self.model.print_event(3, "Created %s", obj) @@ -391,13 +380,13 @@ # force a write if it's been too long, even if the values match if object_columns \ - or obj._last_write_time < obj._qmf_update_time - timedelta(hours=1): + or obj._save_time < obj._qmf_update_time - timedelta(hours=1): object_columns.append(cls.sql_table._qmf_update_time) sql = cls.sql_update_object.emit(object_columns) statements.append(sql) - obj._last_write_time = obj._qmf_update_time + obj._save_time = datetime.now() if sample_columns: sample_columns.append(cls.sql_samples_table._qmf_update_time) @@ -413,8 +402,6 @@ sql = "; ".join(statements) self.execute_sql(cursor, sql, obj.__dict__) - obj._sync_time = datetime.now() - self.model.print_event(4, "Updated %s", obj) stats.objects_updated += 1 Modified: mgmt/trunk/rosemary/python/rosemary/model.py =================================================================== --- mgmt/trunk/rosemary/python/rosemary/model.py 2010-11-12 19:53:20 UTC (rev 4413) +++ mgmt/trunk/rosemary/python/rosemary/model.py 2010-11-15 16:59:25 UTC (rev 4414) @@ -350,7 +350,7 @@ obj = RosemaryObject(self, None) - self.set_object_attributes(obj, self.sql_table._columns, record) + self._set_object_attributes(obj, self.sql_table._columns, record) return obj @@ -369,7 +369,7 @@ for record in cursor.fetchall(): obj = RosemaryObject(self, None) - self.set_object_attributes(obj, self.sql_table._columns, record) + self._set_object_attributes(obj, self.sql_table._columns, record) selection.append(obj) @@ -418,7 +418,7 @@ if not values: raise RosemaryNotFound() - self.set_object_attributes(obj, self.sql_table._columns, values) + self._set_object_attributes(obj, self.sql_table._columns, values) def load_object_by_qmf_id(self, cursor, obj): assert isinstance(obj, RosemaryObject) @@ -432,21 +432,21 @@ if not values: raise RosemaryNotFound() - self.set_object_attributes(obj, self.sql_table._columns, values) + self._set_object_attributes(obj, self.sql_table._columns, values) - def set_object_attributes(self, obj, columns, values): + def _set_object_attributes(self, obj, columns, values): assert isinstance(obj, RosemaryObject) for column, value in zip(columns, values): setattr(obj, column.name, value) - obj._sync_time = datetime.now() + obj._load_time = datetime.now() def save_object(self, cursor, obj, columns=None): assert isinstance(obj, RosemaryObject) assert obj._id, obj - if obj._sync_time: + if obj._load_time or obj._save_time: sql = self.sql_update_object else: sql = self.sql_insert_object @@ -456,7 +456,7 @@ sql.execute(cursor, obj.__dict__, columns=columns) - obj._sync_time = datetime.now() + obj._save_time = datetime.now() def add_object_sample(self, cursor, obj, columns=None): assert isinstance(obj, RosemaryObject) @@ -731,7 +731,8 @@ self._class = cls self._id = id - self._sync_time = None + self._load_time = None + self._save_time = None self._sample_time = None # XXX prefix these with _ @@ -782,7 +783,7 @@ def __repr__(self): name = self.__class__.__name__ - args = (name, self._class, self._id, self._sync_time) + args = (name, self._class, self._id, self._save_time) return "%s(%s,%i,%s)" % args class RosemaryNotFound(Exception):

13 years, 7 months

1
0
0 / 0

rhmessaging commits: r4413 - mgmt/trunk/mint/python/mint.

by rhmessaging-commits＠lists.jboss.org

Author: tmckay Date: 2010-11-12 14:53:20 -0500 (Fri, 12 Nov 2010) New Revision: 4413 Modified: mgmt/trunk/mint/python/mint/update.py Log: Add a forced write to the database after an interval (1 hour) for objects that are actively sending update messages but whose values are not changing. This prevents objects from being filtered out in the UI. Modified: mgmt/trunk/mint/python/mint/update.py =================================================================== --- mgmt/trunk/mint/python/mint/update.py 2010-11-10 00:46:08 UTC (rev 4412) +++ mgmt/trunk/mint/python/mint/update.py 2010-11-12 19:53:20 UTC (rev 4413) @@ -252,6 +252,17 @@ if cls._package is self.model.org_apache_qpid_broker: self.maybe_drop_sample(obj) + # We want a time stamp that shows the last time an + # object was written through to the database. If we see that + # updates are coming in, but an object is not being + # written through because values are the same, + # we want to force a write after a while. This prevents + # objects from being filtered out in the UI. + + # Initialize our tracking timestamp here if it does not yet exist. + if not hasattr(obj,"_last_write_time"): + obj._last_write_time = obj._qmf_update_time + self.update_object(cursor, stats, obj) def get_agent_id(self): @@ -378,12 +389,16 @@ statements = list() cls = obj._class - if object_columns: + # force a write if it's been too long, even if the values match + if object_columns \ + or obj._last_write_time < obj._qmf_update_time - timedelta(hours=1): object_columns.append(cls.sql_table._qmf_update_time) sql = cls.sql_update_object.emit(object_columns) statements.append(sql) + obj._last_write_time = obj._qmf_update_time + if sample_columns: sample_columns.append(cls.sql_samples_table._qmf_update_time)

13 years, 7 months

1
0
0 / 0

Dear rhmessaging-commits, Order at 75% off. does

by TruePills for men

13 years, 7 months

1
0
0 / 0

rhmessaging commits: r4412 - store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store.

by rhmessaging-commits＠lists.jboss.org

Author: tedross Date: 2010-11-09 19:46:08 -0500 (Tue, 09 Nov 2010) New Revision: 4412 Modified: store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.cpp store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.h store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.cpp store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.h Log: Re-generated qmf files. Modified: store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.cpp =================================================================== --- store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.cpp 2010-11-08 14:17:48 UTC (rev 4411) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.cpp 2010-11-10 00:46:08 UTC (rev 4412) @@ -689,7 +689,7 @@ buf.getRawData(_sBuf, _bufLen); } -void Journal::doMethod (string& methodName, const string& inStr, string& outStr) +void Journal::doMethod (string& methodName, const string& inStr, string& outStr, const string& userId) { Manageable::status_t status = Manageable::STATUS_UNKNOWN_METHOD; std::string text; @@ -709,7 +709,11 @@ _matched = true; ArgsJournalExpand ioArgs; ioArgs.i_by = inBuf.getLong(); - status = coreObject->ManagementMethod (METHOD_EXPAND, ioArgs, text); + bool allow = coreObject->AuthorizeMethod(METHOD_EXPAND, ioArgs, userId); + if (allow) + status = coreObject->ManagementMethod (METHOD_EXPAND, ioArgs, text); + else + status = Manageable::STATUS_FORBIDDEN; outBuf.putLong (status); outBuf.putMediumString(::qpid::management::Manageable::StatusText (status, text)); } @@ -868,7 +872,7 @@ } -void Journal::doMethod (string& methodName, const ::qpid::types::Variant::Map& inMap, ::qpid::types::Variant::Map& outMap) +void Journal::doMethod (string& methodName, const ::qpid::types::Variant::Map& inMap, ::qpid::types::Variant::Map& outMap, const string& userId) { Manageable::status_t status = Manageable::STATUS_UNKNOWN_METHOD; std::string text; @@ -880,7 +884,11 @@ if ((_i = inMap.find("by")) != inMap.end()) { ioArgs.i_by = _i->second; } - status = coreObject->ManagementMethod (METHOD_EXPAND, ioArgs, text); + bool allow = coreObject->AuthorizeMethod(METHOD_EXPAND, ioArgs, userId); + if (allow) + status = coreObject->ManagementMethod (METHOD_EXPAND, ioArgs, text); + else + status = Manageable::STATUS_FORBIDDEN; outMap["_status_code"] = (uint32_t) status; outMap["_status_text"] = ::qpid::management::Manageable::StatusText(status, text); return; Modified: store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.h =================================================================== --- store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.h 2010-11-08 14:17:48 UTC (rev 4411) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.h 2010-11-10 00:46:08 UTC (rev 4412) @@ -134,7 +134,8 @@ void mapDecodeValues(const ::qpid::types::Variant::Map& map); void doMethod(std::string& methodName, const ::qpid::types::Variant::Map& inMap, - ::qpid::types::Variant::Map& outMap); + ::qpid::types::Variant::Map& outMap, + const std::string& userId); std::string getKey() const; uint32_t writePropertiesSize() const; @@ -143,7 +144,8 @@ void writeStatistics(std::string& buf, bool skipHeaders = false); void doMethod(std::string& methodName, const std::string& inBuf, - std::string& outBuf); + std::string& outBuf, + const std::string& userId); writeSchemaCall_t getWriteSchemaCall() { return writeSchema; } Modified: store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.cpp =================================================================== --- store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.cpp 2010-11-08 14:17:48 UTC (rev 4411) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.cpp 2010-11-10 00:46:08 UTC (rev 4412) @@ -452,7 +452,7 @@ buf.getRawData(_sBuf, _bufLen); } -void Store::doMethod (string&, const string&, string& outStr) +void Store::doMethod (string&, const string&, string& outStr, const string&) { Manageable::status_t status = Manageable::STATUS_UNKNOWN_METHOD; std::string text; @@ -580,7 +580,7 @@ } -void Store::doMethod (string&, const ::qpid::types::Variant::Map&, ::qpid::types::Variant::Map& outMap) +void Store::doMethod (string&, const ::qpid::types::Variant::Map&, ::qpid::types::Variant::Map& outMap, const string&) { Manageable::status_t status = Manageable::STATUS_UNKNOWN_METHOD; std::string text; Modified: store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.h =================================================================== --- store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.h 2010-11-08 14:17:48 UTC (rev 4411) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.h 2010-11-10 00:46:08 UTC (rev 4412) @@ -104,7 +104,8 @@ void mapDecodeValues(const ::qpid::types::Variant::Map& map); void doMethod(std::string& methodName, const ::qpid::types::Variant::Map& inMap, - ::qpid::types::Variant::Map& outMap); + ::qpid::types::Variant::Map& outMap, + const std::string& userId); std::string getKey() const; uint32_t writePropertiesSize() const; @@ -113,7 +114,8 @@ void writeStatistics(std::string& buf, bool skipHeaders = false); void doMethod(std::string& methodName, const std::string& inBuf, - std::string& outBuf); + std::string& outBuf, + const std::string& userId); writeSchemaCall_t getWriteSchemaCall() { return writeSchema; }

13 years, 7 months

1
0
0 / 0

rhmessaging commits: r4411 - store/trunk/cpp.

by rhmessaging-commits＠lists.jboss.org

Author: kpvdr Date: 2010-11-08 09:17:48 -0500 (Mon, 08 Nov 2010) New Revision: 4411 Modified: store/trunk/cpp/Makefile.am Log: Removed processing of store/perf dir until build issues are resolved here Modified: store/trunk/cpp/Makefile.am =================================================================== --- store/trunk/cpp/Makefile.am 2010-11-04 21:03:47 UTC (rev 4410) +++ store/trunk/cpp/Makefile.am 2010-11-08 14:17:48 UTC (rev 4411) @@ -28,7 +28,7 @@ sysconf_DATA = etc/rhmd.conf -SUBDIRS = lib tests tools perf docs +SUBDIRS = lib tests tools docs # Update libtool, if needed. libtool: $(LIBTOOL_DEPS)

13 years, 7 months

1
0
0 / 0

rhmessaging commits: r4410 - mgmt/newdata/mint/python/mint.

by rhmessaging-commits＠lists.jboss.org

Author: justi9 Date: 2010-11-04 17:03:47 -0400 (Thu, 04 Nov 2010) New Revision: 4410 Modified: mgmt/newdata/mint/python/mint/update.py Log: Merge fix 4387 from trunk: delete broken exception path Modified: mgmt/newdata/mint/python/mint/update.py =================================================================== --- mgmt/newdata/mint/python/mint/update.py 2010-11-01 19:28:39 UTC (rev 4409) +++ mgmt/newdata/mint/python/mint/update.py 2010-11-04 21:03:47 UTC (rev 4410) @@ -191,10 +191,6 @@ # XXX UpdateCommitted except UpdateDropped: thread.stats.dropped += 1 - except UpdateException, e: - log.exception("Update could not be completed") - - thread.conn.rollback() except: log.exception("Update failed")

13 years, 7 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

rhmessaging-commits November 2010