February 2009 - rhmessaging-commits

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

by rhmessaging-commits＠lists.jboss.org

Author: justi9 Date: 2009-02-04 17:16:44 -0500 (Wed, 04 Feb 2009) New Revision: 3108 Modified: mgmt/trunk/cumin/python/cumin/queue.py Log: Format null column values, and fix the bindings link Modified: mgmt/trunk/cumin/python/cumin/queue.py =================================================================== --- mgmt/trunk/cumin/python/cumin/queue.py 2009-02-04 19:22:38 UTC (rev 3107) +++ mgmt/trunk/cumin/python/cumin/queue.py 2009-02-04 22:16:44 UTC (rev 3108) @@ -122,8 +122,11 @@ def render_title(self, session, data): return "Consumers" - def render_content(self, session, data): - return data["consumers"] + def render_value(self, session, value): + if value is None: + return fmt_none_brief() + else: + return value class BindingsColumn(SqlTableColumn): def render_title(self, session, data): @@ -131,8 +134,10 @@ def render_content(self, session, data): queue = Identifiable(data["id"]) - href = self.frame.queue.get_href(session, queue) - return fmt_link(href, data["bindings"]) + branch = session.branch() + self.frame.queue.object.set(branch, queue) + self.frame.queue.view.bindings.show(branch) + return fmt_link(branch.marshal(), data["bindings"] or "0") class EnqueuedColumn(NullSortColumn, FreshDataOnlyColumn): def render_title(self, session, data): @@ -164,6 +169,12 @@ unit = self.parent.unit.get(session) return unit == "b" and "bdepth" or "mdepth" + def render_value(self, session, value): + if value is None: + return fmt_none_brief() + else: + return value + class TopQueueSet(TopTable): def __init__(self, app, name): super(TopQueueSet, self).__init__(app, name)

15 years, 10 months

1
0
0 / 0

rhmessaging commits: r3107 - in mgmt/trunk/cumin: resources and 1 other directory.

by rhmessaging-commits＠lists.jboss.org

Author: justi9 Date: 2009-02-04 14:22:38 -0500 (Wed, 04 Feb 2009) New Revision: 3107 Added: mgmt/trunk/cumin/resources/shadowman-36.png Modified: mgmt/trunk/cumin/python/cumin/page.py Log: Replace the MRG logo graphic with a shadowman Modified: mgmt/trunk/cumin/python/cumin/page.py =================================================================== --- mgmt/trunk/cumin/python/cumin/page.py 2009-02-04 19:14:29 UTC (rev 3106) +++ mgmt/trunk/cumin/python/cumin/page.py 2009-02-04 19:22:38 UTC (rev 3107) @@ -263,7 +263,7 @@ return "MRG Management" def render_icon_href(self, session): - return "resource?name=mrg-36.png" + return "resource?name=shadowman-36.png" class OverviewTab(Widget): def __init__(self, app, name): Added: mgmt/trunk/cumin/resources/shadowman-36.png =================================================================== (Binary files differ) Property changes on: mgmt/trunk/cumin/resources/shadowman-36.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

15 years, 10 months

1
0
0 / 0

rhmessaging commits: r3106 - store/trunk/cpp/lib/jrnl.

by rhmessaging-commits＠lists.jboss.org

Author: kpvdr Date: 2009-02-04 14:14:29 -0500 (Wed, 04 Feb 2009) New Revision: 3106 Modified: store/trunk/cpp/lib/jrnl/jexception.hpp Log: Changed PTHREAD_CHK macro to abort instead of throwing an exception. This will allow the stack trace for occurrences of BZ484048 to be captured. Modified: store/trunk/cpp/lib/jrnl/jexception.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/jexception.hpp 2009-02-04 15:05:05 UTC (rev 3105) +++ store/trunk/cpp/lib/jrnl/jexception.hpp 2009-02-04 19:14:29 UTC (rev 3106) @@ -43,6 +43,8 @@ } } +#include <cstdio> +#include <cstdlib> #include <cstring> #include <exception> #include <string> @@ -60,10 +62,17 @@ #define PTHREAD_CHK(err, pfn, cls, fn) if(err != 0) { \ std::ostringstream oss; \ - oss << pfn << " failed: " << FORMAT_SYSERR(err); \ - throw jexception(jerrno::JERR__PTHREAD, oss.str(), cls, fn); \ + oss << cls << "::" << fn << "(): " << pfn; \ + errno = err; \ + ::perror(oss.str().c_str()); \ + ::abort(); \ } +#define ASSERT(cond, msg) if(cond == 0) { \ + std::cerr << msg << std::endl; \ + ::abort(); \ + } + namespace mrg { namespace journal

15 years, 10 months

1
0
0 / 0

rhmessaging commits: r3105 - store/trunk/cpp.

by rhmessaging-commits＠lists.jboss.org

Author: kpvdr Date: 2009-02-04 10:05:05 -0500 (Wed, 04 Feb 2009) New Revision: 3105 Modified: store/trunk/cpp/README Log: Additional notes for README file. Modified: store/trunk/cpp/README =================================================================== --- store/trunk/cpp/README 2009-02-04 13:50:06 UTC (rev 3104) +++ store/trunk/cpp/README 2009-02-04 15:05:05 UTC (rev 3105) @@ -44,6 +44,10 @@ -- DISTRIBUTION-SPECIFIC NOTES --- +On a RHEL4, some files must be patched to accomodate an early version of boost +and gcc. See cpp/rhel4-support/README. Note that there are some warnings seen on +RHEL4 builds and tests that are not present on other platforms. + On a Fedora system install prerequisites via: yum install libaio-devel db4-devel qpidd-devel

15 years, 10 months

1
0
0 / 0

rhmessaging commits: r3104 - store/trunk/cpp.

by rhmessaging-commits＠lists.jboss.org

Author: kpvdr Date: 2009-02-04 08:50:06 -0500 (Wed, 04 Feb 2009) New Revision: 3104 Modified: store/trunk/cpp/README Log: Update to README file Modified: store/trunk/cpp/README =================================================================== --- store/trunk/cpp/README 2009-02-03 20:44:17 UTC (rev 3103) +++ store/trunk/cpp/README 2009-02-04 13:50:06 UTC (rev 3104) @@ -1,30 +1,52 @@ -== MessageStore plugin for qpid c++ broker == +== Asynchronous Message Store Plugin for Qpid c++ Broker == -Pre-requisites: +-- PREREQUISITES -- + + - libaio-devel libs - qpid broker headers and libraries (see below) - - all pre-requisites for qpid + - all prerequisites for qpid (see qpid's cpp/INSTALL file) - berkeley db4 (tested with version 4.3.29) - python (to run system tests) For the qpid requirements you can either install the qpidd-devel package or check-out the qpid source from: - https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid + https://svn.apache.org/repos/asf/qpid/trunk/qpid -To use a checkout ./configure --with-qpid-checkout=<path_to_qpid> +-- BUILDING -- -* 'make' or 'make all' will build the module +The following steps should build the package (all from the cpp directory): -* 'make check' will run unit and system tests. Use - 'make check TESTS=run-unit-tests' or - 'make check TESTS=system_test.sh' to run these separately. +0. If you are using an svn checkout of qpidd, then build this package following + the instructions in the cpp/INSTALL file from that project. The store will not + link without the libqpidcommon.so library from that project. If you installed + the qpidd package, then this library is installed. -Note: system tests require --with-qpid-checkout and also need python. -They will be skipped otherwise. +1. './bootstrap' (This initializes the autotools) -On a fedora system install prerequisites via: - yum install db4-devel qpidd-devel +2. If the qpidd package is installed, then: + './configure' + + Otherwise, if using an svn checkout of qpidd (as opposed to installing + the qpidd package), then: + + './configure --with-qpid-checkout=<path_to_qpid>' + + (Point to the top-level qpid dir in which the cpp and python dirs exist) + +3. 'make' or 'make all' will build the module + 'make check' will run unit and system tests. + +Note: Some system tests require qpid's python test framework, and therefore +will not run unless python is installed and qpidd is installed from +subversion and the --with-qpid-checkout option is used in configure. + +-- DISTRIBUTION-SPECIFIC NOTES --- + +On a Fedora system install prerequisites via: + yum install libaio-devel db4-devel qpidd-devel + On a Debian-based system, install prerequisites via: apt-get install libdb4.3++-dev

15 years, 10 months

1
0
0 / 0

rhmessaging commits: r3103 - in store/trunk/cpp: lib/jrnl and 1 other directories.

by rhmessaging-commits＠lists.jboss.org

Author: kpvdr Date: 2009-02-03 15:44:17 -0500 (Tue, 03 Feb 2009) New Revision: 3103 Modified: store/trunk/cpp/lib/MessageStoreImpl.cpp store/trunk/cpp/lib/MessageStoreImpl.h store/trunk/cpp/lib/jrnl/jinf.cpp store/trunk/cpp/lib/jrnl/jinf.hpp store/trunk/cpp/tests/jrnl/_st_read.cpp Log: Partial fix for BZ 483822 - "Persistent clusters encounter null queue names". Prevented the creation and recovery of null queues. Modified: store/trunk/cpp/lib/MessageStoreImpl.cpp =================================================================== --- store/trunk/cpp/lib/MessageStoreImpl.cpp 2009-02-03 19:57:26 UTC (rev 3102) +++ store/trunk/cpp/lib/MessageStoreImpl.cpp 2009-02-03 20:44:17 UTC (rev 3103) @@ -424,6 +424,12 @@ value = args.get("qpid.file_size"); if (value.get() != 0 && !value->empty() && value->convertsTo<int>()) localFileSizeSblks = (u_int32_t) value->get<int>() * JRNL_RMGR_PAGE_SIZE; + + if (queue.getName().size() == 0) + { + QPID_LOG(error, "Cannot create store for empty (null) queue name - ignoring and attempting to continue."); + return; + } { // TODO: Is this mutex necessary? @@ -698,9 +704,14 @@ //set the persistenceId and update max as required queue->setPersistenceId(key.id); - const char* queueName = queue->getName().c_str(); + const std::string queueName = queue->getName().c_str(); JournalImpl* jQueue = 0; + if (queueName.size() == 0) { + QPID_LOG(error, "Cannot recover empty (null) queue name - ignoring and attempting to continue."); + break; + } + { qpid::sys::Mutex::ScopedLock sl(jrnlCreateLock); jQueue = new JournalImpl(queueName, getJrnlDir(queueName), std::string("JournalData"), defJournalGetEventsTimeout, defJournalFlushTimeout); } @@ -1770,11 +1781,11 @@ return h; } -std::string MessageStoreImpl::getJrnlDir(const char* queueName) //for exmaple /var/rhm/ + queueDir/ +std::string MessageStoreImpl::getJrnlDir(const std::string& queueName) //for exmaple /var/rhm/ + queueDir/ { std::stringstream dir; dir << getJrnlBaseDir() << std::hex << std::setfill('0') << std::setw(4); - dir << (bHash(queueName) % 29); // Use a prime number for better distribution across dirs + dir << (bHash(queueName.c_str()) % 29); // Use a prime number for better distribution across dirs dir << "/" << queueName << "/"; return dir.str(); } Modified: store/trunk/cpp/lib/MessageStoreImpl.h =================================================================== --- store/trunk/cpp/lib/MessageStoreImpl.h 2009-02-03 19:57:26 UTC (rev 3102) +++ store/trunk/cpp/lib/MessageStoreImpl.h 2009-02-03 20:44:17 UTC (rev 3103) @@ -243,7 +243,7 @@ void createJrnlQueue(const qpid::broker::PersistableQueue& queue); u_int32_t bHash(const std::string str); std::string getJrnlDir(const qpid::broker::PersistableQueue& queue); //for exmaple /var/rhm/ + queueDir/ - std::string getJrnlDir(const char* queueName); + std::string getJrnlDir(const std::string& queueName); std::string getJrnlBaseDir(); std::string getBdbBaseDir(); std::string getTplBaseDir(); Modified: store/trunk/cpp/lib/jrnl/jinf.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/jinf.cpp 2009-02-03 19:57:26 UTC (rev 3102) +++ store/trunk/cpp/lib/jrnl/jinf.cpp 2009-02-03 20:44:17 UTC (rev 3103) @@ -50,6 +50,7 @@ jinf::jinf(const std::string& jinf_filename, bool validate_flag): _jver(0), + _filename(jinf_filename), _num_jfiles(0), _ae(false), _ae_max_jfiles(0), @@ -66,7 +67,7 @@ _initial_owi(false), _frot(false) { - read(jinf_filename); + read(_filename); if (validate_flag) validate(); } @@ -93,7 +94,9 @@ _valid_flag(false), _analyzed_flag(false), _initial_owi(false) -{} +{ + set_filename(); +} jinf::~jinf() {} @@ -105,18 +108,21 @@ std::ostringstream oss; if (_jver != RHM_JDAT_VERSION) { + oss << "File \"" << _filename << "\": "; oss << "RHM_JDAT_VERSION mismatch: " << _jver; oss << "; required=" << RHM_JDAT_VERSION << std::endl; err = true; } if (_num_jfiles < JRNL_MIN_NUM_FILES) { + oss << "File \"" << _filename << "\": "; oss << "Number of journal files too small: found=" << _num_jfiles; oss << "; minimum=" << JRNL_MIN_NUM_FILES << std::endl; err = true; } if (_num_jfiles > JRNL_MAX_NUM_FILES) { + oss << "File \"" << _filename << "\": "; oss << "Number of journal files too large: found=" << _num_jfiles; oss << "; maximum=" << JRNL_MAX_NUM_FILES << std::endl; err = true; @@ -125,12 +131,14 @@ { if (_ae_max_jfiles > _num_jfiles) { + oss << "File \"" << _filename << "\": "; oss << "Number of journal files exceeds auto-expansion limit: found=" << _num_jfiles; oss << "; maximum=" << _ae_max_jfiles; err = true; } if (_ae_max_jfiles > JRNL_MAX_NUM_FILES) { + oss << "File \"" << _filename << "\": "; oss << "Auto-expansion file limit too large: found=" << _ae_max_jfiles; oss << "; maximum=" << JRNL_MAX_NUM_FILES; err = true; @@ -138,18 +146,21 @@ } if (_jfsize_sblks < JRNL_MIN_FILE_SIZE) { + oss << "File \"" << _filename << "\": "; oss << "Journal file size too small: found=" << _jfsize_sblks; oss << "; minimum=" << JRNL_MIN_FILE_SIZE << " (sblks)" << std::endl; err = true; } if (_sblk_size_dblks != JRNL_SBLK_SIZE) { + oss << "File \"" << _filename << "\": "; oss << "JRNL_SBLK_SIZE mismatch: " << _sblk_size_dblks; oss << "; required=" << JRNL_SBLK_SIZE << std::endl; err = true; } if (_dblk_size != JRNL_DBLK_SIZE) { + oss << "File \"" << _filename << "\": "; oss << "JRNL_DBLK_SIZE mismatch: " << _dblk_size; oss << "; required=" << JRNL_DBLK_SIZE << std::endl; err = true; @@ -362,6 +373,14 @@ } void +jinf::set_filename() +{ + std::ostringstream oss; + oss << _jdir << "/" << _base_filename << "." << JRNL_INFO_EXTENSION; + _filename = oss.str().c_str(); +} + +void jinf::read(const std::string& jinf_filename) { // TODO: This is *not* an XML reader, rather for simplicity, it is a brute-force line reader which relies on string @@ -446,12 +465,20 @@ int target2_char = '\"'; char* t1 = std::strstr(line, target1_str); if (t1 == 0) - throw jexception(jerrno::JERR_JINF_NOVALUESTR, line, "jinf", "find_value"); + { + std::ostringstream oss; + oss << "File \"" << _filename << "\": line=" << line; + throw jexception(jerrno::JERR_JINF_NOVALUESTR, oss.str(), "jinf", "find_value"); + } t1 += std::strlen(target1_str); char* t2 = std::strchr(t1, target2_char); if (t2 == 0) - throw jexception(jerrno::JERR_JINF_BADVALUESTR, line, "jinf", "find_value"); + { + std::ostringstream oss; + oss << "File \"" << _filename << "\": line=" << line; + throw jexception(jerrno::JERR_JINF_BADVALUESTR, oss.str(), "jinf", "find_value"); + } *t2 = '\0'; return t1; } Modified: store/trunk/cpp/lib/jrnl/jinf.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/jinf.hpp 2009-02-03 19:57:26 UTC (rev 3102) +++ store/trunk/cpp/lib/jrnl/jinf.hpp 2009-02-03 20:44:17 UTC (rev 3103) @@ -56,6 +56,7 @@ std::string _jid; std::string _jdir; std::string _base_filename; + std::string _filename; timespec _ts; u_int16_t _num_jfiles; bool _ae; @@ -116,6 +117,7 @@ std::string xml_str() const; private: + void set_filename(); void read(const std::string& jinf_filename); bool bool_value(char* line) const; u_int16_t u_int16_value(char* line) const; Modified: store/trunk/cpp/tests/jrnl/_st_read.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/_st_read.cpp 2009-02-03 19:57:26 UTC (rev 3102) +++ store/trunk/cpp/tests/jrnl/_st_read.cpp 2009-02-03 20:44:17 UTC (rev 3103) @@ -89,7 +89,7 @@ catch(const exception& e) { BOOST_FAIL(e.what()); } cout << "ok" << endl; } -/* + QPID_AUTO_TEST_CASE(multi_page_enqueue_read_dequeue_block) { string test_name = get_test_name(test_filename, "multi_page_enqueue_read_dequeue_block"); @@ -156,7 +156,7 @@ catch(const exception& e) { BOOST_FAIL(e.what()); } cout << "ok" << endl; } -*/ + QPID_AUTO_TEST_CASE(enqueue_recovered_read_dequeue) { string test_name = get_test_name(test_filename, "enqueue_recovered_read_dequeue");

15 years, 10 months

1
0
0 / 0

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

by rhmessaging-commits＠lists.jboss.org

Author: justi9 Date: 2009-02-03 14:57:26 -0500 (Tue, 03 Feb 2009) New Revision: 3102 Modified: mgmt/trunk/cumin/python/cumin/page.strings Log: Tidy up the top tabs css Modified: mgmt/trunk/cumin/python/cumin/page.strings =================================================================== --- mgmt/trunk/cumin/python/cumin/page.strings 2009-02-03 18:55:32 UTC (rev 3101) +++ mgmt/trunk/cumin/python/cumin/page.strings 2009-02-03 19:57:26 UTC (rev 3102) @@ -2,11 +2,16 @@ #head { padding: 0; border-bottom: 1px solid #999; - border-top: 3px solid #000; color: #ddd; background: #666 url("resource?name=mrg-banner.png") no-repeat scroll center; } +#trans0 { + background-color: black; + height: 0.15em; + width: 100%; +} + #head a { color: #c0d0e0; } @@ -17,8 +22,6 @@ #head .tabs { padding: 0 0 0.25em 0.5em; - margin: 0; - list-style: none; } #head .tabs li { @@ -26,11 +29,12 @@ } #head .tabs li a { - padding: 0.275em 0.5em; + padding: 0.225em 0.5em 0.275em 0.5em; border-right: 2px solid #444; background-color: #333; color: #ccc; line-height: 1.5em; + vertical-align: -15%; } #head .tabs li:last-child a { @@ -40,8 +44,6 @@ #head .tabs li a.selected { background-color: #000; color: #fff; - position: relative; - z-index: 2; } #body { @@ -98,7 +100,7 @@ content: ""; } -#trans { +#trans1 { padding: 0; margin: 0; border-top: 1px solid #bbb; @@ -137,6 +139,7 @@ } [MainFrame.html] +<div id="trans0"/> <div id="head"> <div> <div id="user"> @@ -157,14 +160,14 @@ <span>{failed_count}</span> failed </a> </div> -<script type="text/javascript"> + <script type="text/javascript"> cumin.modelListeners["actions"] = updateActions -</script> + </script> <ul id="context">{frames}</ul> </div> </div> -<div id="trans"></div> +<div id="trans1"></div> <div id="body">{mode}</div> <div id="foot"/>

15 years, 10 months

1
0
0 / 0

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

by rhmessaging-commits＠lists.jboss.org

Author: justi9 Date: 2009-02-03 13:55:32 -0500 (Tue, 03 Feb 2009) New Revision: 3101 Modified: mgmt/trunk/cumin/python/cumin/page.strings Log: Tidy up the cumin header styles Modified: mgmt/trunk/cumin/python/cumin/page.strings =================================================================== --- mgmt/trunk/cumin/python/cumin/page.strings 2009-02-03 18:38:01 UTC (rev 3100) +++ mgmt/trunk/cumin/python/cumin/page.strings 2009-02-03 18:55:32 UTC (rev 3101) @@ -8,7 +8,7 @@ } #head a { - color: #fff; + color: #c0d0e0; } body.modal #head { @@ -53,15 +53,14 @@ } #user { - padding: 0.25em 0.25em 0 1em; + padding: 0.25em 0.5em; float: right; - list-style: none; color: #fff; - margin: 0; + font-size: 0.9em; } -#user li { - display: inline; +#logout { + color: #06c; } #actions { @@ -140,10 +139,11 @@ [MainFrame.html] <div id="head"> <div> - <ul id="user"> - <li>Hi, <strong>{user_name}</strong></li> - <li><a class="nav" onclick="wooly.clearUpdates()" href="{logout_href}">Log Out</a></li> - </ul> + <div id="user"> + Hi, {user_name} + <strong>·</strong> + <a id="logout" onclick="wooly.clearUpdates()" href="{logout_href}">Log Out</a> + </div> {tabs} </div>

15 years, 10 months

1
0
0 / 0

rhmessaging commits: r3100 - mgmt/trunk/wooly/python/wooly.

by rhmessaging-commits＠lists.jboss.org

Author: justi9 Date: 2009-02-03 13:38:01 -0500 (Tue, 03 Feb 2009) New Revision: 3100 Modified: mgmt/trunk/wooly/python/wooly/widgets.strings Log: Lighten non-selected tab text Modified: mgmt/trunk/wooly/python/wooly/widgets.strings =================================================================== --- mgmt/trunk/wooly/python/wooly/widgets.strings 2009-02-03 17:55:10 UTC (rev 3099) +++ mgmt/trunk/wooly/python/wooly/widgets.strings 2009-02-03 18:38:01 UTC (rev 3100) @@ -16,8 +16,8 @@ padding: 0.275em 0.5em; border-top: 1px solid #ccc; border-right: 1px solid #ccc; + color: #333; background-color: #f7f7f7; - color: #000; line-height: 1.5em; } @@ -26,6 +26,7 @@ } ul.TabbedModeSet.tabs li a.selected { + color: #000; background-color: #fff; position: relative; z-index: 2;

15 years, 10 months

1
0
0 / 0

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

by rhmessaging-commits＠lists.jboss.org

Author: justi9 Date: 2009-02-03 12:55:10 -0500 (Tue, 03 Feb 2009) New Revision: 3099 Modified: mgmt/trunk/cumin/python/cumin/widgets.strings Log: Lighten disabled button text a little Modified: mgmt/trunk/cumin/python/cumin/widgets.strings =================================================================== --- mgmt/trunk/cumin/python/cumin/widgets.strings 2009-02-03 16:47:37 UTC (rev 3098) +++ mgmt/trunk/cumin/python/cumin/widgets.strings 2009-02-03 17:55:10 UTC (rev 3099) @@ -135,8 +135,8 @@ } button.disabled { - color: #666; - border: 1px solid #EAEAEA; + color: #bbb; + border: 1px solid #ddd; } button.disabled:hover { background-color: #f7f7f7;

15 years, 10 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 February 2009