You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by tr...@apache.org on 2012/02/09 22:11:42 UTC
svn commit: r1242526 [1/2] - in /qpid/trunk/qpid: cpp/include/qpid/sys/
cpp/src/ cpp/src/qpid/broker/ cpp/src/qpid/management/
cpp/src/qpid/sys/posix/ cpp/src/qpid/sys/windows/
java/broker/src/main/java/org/apache/qpid/qmf/ java/broker/src/xsl/ specs/
...
Author: tross
Date: Thu Feb 9 21:11:41 2012
New Revision: 1242526
URL: http://svn.apache.org/viewvc?rev=1242526&view=rev
Log:
QPID-3824 - Additional queue statistics, posix memory statistics, and broker-scope statistics
Added:
qpid/trunk/qpid/cpp/include/qpid/sys/MemStat.h
qpid/trunk/qpid/cpp/src/qpid/sys/posix/MemStat.cpp
qpid/trunk/qpid/cpp/src/qpid/sys/windows/MemStat.cpp
qpid/trunk/qpid/tests/src/py/qpid_tests/broker_0_10/stats.py
qpid/trunk/qpid/tools/src/py/qpidtoollibs/
qpid/trunk/qpid/tools/src/py/qpidtoollibs/__init__.py
qpid/trunk/qpid/tools/src/py/qpidtoollibs/broker.py
qpid/trunk/qpid/tools/src/py/qpidtoollibs/disp.py
Modified:
qpid/trunk/qpid/cpp/src/CMakeLists.txt
qpid/trunk/qpid/cpp/src/Makefile.am
qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.h
qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/Message.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h
qpid/trunk/qpid/cpp/src/qpid/broker/QueuePolicy.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/QueuePolicy.h
qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp
qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.h
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java
qpid/trunk/qpid/java/broker/src/xsl/qmf.xsl
qpid/trunk/qpid/specs/management-schema.xml
qpid/trunk/qpid/tests/src/py/qpid_tests/broker_0_10/__init__.py
qpid/trunk/qpid/tools/setup.py
qpid/trunk/qpid/tools/src/py/qpid-stat
Added: qpid/trunk/qpid/cpp/include/qpid/sys/MemStat.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/sys/MemStat.h?rev=1242526&view=auto
==============================================================================
--- qpid/trunk/qpid/cpp/include/qpid/sys/MemStat.h (added)
+++ qpid/trunk/qpid/cpp/include/qpid/sys/MemStat.h Thu Feb 9 21:11:41 2012
@@ -0,0 +1,38 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+#ifndef sys_MemStat
+#define sys_MemStat
+
+#include "qpid/CommonImportExport.h"
+#include "qmf/org/apache/qpid/broker/Memory.h"
+
+namespace qpid {
+namespace sys {
+
+ class QPID_COMMON_CLASS_EXTERN MemStat {
+ public:
+ QPID_COMMON_EXTERN static void loadMemInfo(qmf::org::apache::qpid::broker::Memory* object);
+ };
+
+}}
+
+#endif
+
Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=1242526&r1=1242525&r2=1242526&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Thu Feb 9 21:11:41 2012
@@ -669,6 +669,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL Windows)
qpid/sys/windows/SystemInfo.cpp
qpid/sys/windows/Thread.cpp
qpid/sys/windows/Time.cpp
+ qpid/sys/windows/MemStat.cpp
qpid/client/windows/SaslFactory.cpp
${sslcommon_windows_SOURCES}
)
@@ -740,6 +741,7 @@ else (CMAKE_SYSTEM_NAME STREQUAL Windows
qpid/sys/posix/FileSysDir.cpp
qpid/sys/posix/IOHandle.cpp
qpid/sys/posix/LockFile.cpp
+ qpid/sys/posix/MemStat.cpp
qpid/sys/posix/Mutex.cpp
qpid/sys/posix/PipeHandle.cpp
qpid/sys/posix/PollableCondition.cpp
Modified: qpid/trunk/qpid/cpp/src/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/Makefile.am?rev=1242526&r1=1242525&r2=1242526&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/src/Makefile.am Thu Feb 9 21:11:41 2012
@@ -53,6 +53,7 @@ windows_dist = \
../include/qpid/sys/windows/Time.h \
qpid/sys/windows/uuid.cpp \
qpid/sys/windows/uuid.h \
+ qpid/sys/windows/MemStat.cpp \
windows/QpiddBroker.cpp \
windows/SCM.h \
windows/SCM.cpp \
@@ -163,6 +164,7 @@ libqpidcommon_la_SOURCES += \
qpid/sys/posix/Time.cpp \
qpid/sys/posix/Thread.cpp \
qpid/sys/posix/Shlib.cpp \
+ qpid/sys/posix/MemStat.cpp \
qpid/sys/posix/Mutex.cpp \
qpid/sys/posix/Fork.cpp \
qpid/sys/posix/StrError.cpp \
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp?rev=1242526&r1=1242525&r2=1242526&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp Thu Feb 9 21:11:41 2012
@@ -194,6 +194,7 @@ Broker::Broker(const Broker::Options& co
conf.replayFlushLimit*1024, // convert kb to bytes.
conf.replayHardLimit*1024),
*this),
+ mgmtObject(0),
queueCleaner(queues, &timer),
queueEvents(poller,!conf.asyncQueueEvents),
recovery(true),
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp?rev=1242526&r1=1242525&r2=1242526&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp Thu Feb 9 21:11:41 2012
@@ -142,6 +142,7 @@ void DeliveryRecord::reject()
//just drop it
QPID_LOG(info, "Dropping rejected message from " << queue->getName());
}
+ queue->countRejected();
dequeue();
setEnded();
}
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.cpp?rev=1242526&r1=1242525&r2=1242526&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.cpp Thu Feb 9 21:11:41 2012
@@ -142,6 +142,8 @@ void Exchange::doRoute(Deliverable& msg,
//QPID_LOG(warning, "Exchange " << getName() << " could not route message; no matching binding found");
mgmtExchange->inc_msgDrops ();
mgmtExchange->inc_byteDrops (msg.contentSize ());
+ if (brokerMgmtObject)
+ brokerMgmtObject->inc_discardsNoRoute();
}
else
{
@@ -161,7 +163,7 @@ void Exchange::routeIVE(){
Exchange::Exchange (const string& _name, Manageable* parent, Broker* b) :
name(_name), durable(false), persistenceId(0), sequence(false),
- sequenceNo(0), ive(false), mgmtExchange(0), broker(b), destroyed(false)
+ sequenceNo(0), ive(false), mgmtExchange(0), brokerMgmtObject(0), broker(b), destroyed(false)
{
if (parent != 0 && broker != 0)
{
@@ -172,6 +174,8 @@ Exchange::Exchange (const string& _name,
mgmtExchange->set_durable(durable);
mgmtExchange->set_autoDelete(false);
agent->addObject(mgmtExchange, 0, durable);
+ if (broker)
+ brokerMgmtObject = (qmf::org::apache::qpid::broker::Broker*) broker->GetManagementObject();
}
}
}
@@ -179,7 +183,7 @@ Exchange::Exchange (const string& _name,
Exchange::Exchange(const string& _name, bool _durable, const qpid::framing::FieldTable& _args,
Manageable* parent, Broker* b)
: name(_name), durable(_durable), alternateUsers(0), persistenceId(0),
- args(_args), sequence(false), sequenceNo(0), ive(false), mgmtExchange(0), broker(b), destroyed(false)
+ args(_args), sequence(false), sequenceNo(0), ive(false), mgmtExchange(0), brokerMgmtObject(0), broker(b), destroyed(false)
{
if (parent != 0 && broker != 0)
{
@@ -191,6 +195,8 @@ Exchange::Exchange(const string& _name,
mgmtExchange->set_autoDelete(false);
mgmtExchange->set_arguments(ManagementAgent::toMap(args));
agent->addObject(mgmtExchange, 0, durable);
+ if (broker)
+ brokerMgmtObject = (qmf::org::apache::qpid::broker::Broker*) broker->GetManagementObject();
}
}
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.h?rev=1242526&r1=1242525&r2=1242526&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.h Thu Feb 9 21:11:41 2012
@@ -32,6 +32,7 @@
#include "qpid/management/Manageable.h"
#include "qmf/org/apache/qpid/broker/Exchange.h"
#include "qmf/org/apache/qpid/broker/Binding.h"
+#include "qmf/org/apache/qpid/broker/Broker.h"
namespace qpid {
namespace broker {
@@ -158,6 +159,7 @@ protected:
};
qmf::org::apache::qpid::broker::Exchange* mgmtExchange;
+ qmf::org::apache::qpid::broker::Broker* brokerMgmtObject;
public:
typedef boost::shared_ptr<Exchange> shared_ptr;
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.cpp?rev=1242526&r1=1242525&r2=1242526&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.cpp Thu Feb 9 21:11:41 2012
@@ -200,6 +200,8 @@ void HeadersExchange::route(Deliverable&
mgmtExchange->inc_byteReceives(msg.contentSize());
mgmtExchange->inc_msgDrops();
mgmtExchange->inc_byteDrops(msg.contentSize());
+ if (brokerMgmtObject)
+ brokerMgmtObject->inc_discardsNoRoute();
}
return;
}
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Message.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Message.cpp?rev=1242526&r1=1242525&r2=1242526&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Message.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Message.cpp Thu Feb 9 21:11:41 2012
@@ -270,6 +270,7 @@ void Message::sendContent(const Queue& q
morecontent = getContentFrame(queue, frame, maxContentSize, offset);
out.handle(frame);
}
+ queue.countLoadedFromDisk(contentSize());
} else {
Count c;
frames.map_if(c, TypeFilter<CONTENT_BODY>());
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp?rev=1242526&r1=1242525&r2=1242526&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp Thu Feb 9 21:11:41 2012
@@ -109,6 +109,7 @@ Queue::Queue(const string& _name, bool _
persistenceId(0),
policyExceeded(false),
mgmtObject(0),
+ brokerMgmtObject(0),
eventMode(0),
insertSeqNo(0),
broker(b),
@@ -123,14 +124,20 @@ Queue::Queue(const string& _name, bool _
if (agent != 0) {
mgmtObject = new _qmf::Queue(agent, this, parent, _name, _store != 0, _autodelete, _owner != 0);
agent->addObject(mgmtObject, 0, store != 0);
+ brokerMgmtObject = (qmf::org::apache::qpid::broker::Broker*) broker->GetManagementObject();
+ if (brokerMgmtObject)
+ brokerMgmtObject->inc_queueCount();
}
}
}
Queue::~Queue()
{
- if (mgmtObject != 0)
+ if (mgmtObject != 0) {
mgmtObject->resourceDestroy();
+ if (brokerMgmtObject)
+ brokerMgmtObject->dec_queueCount();
+ }
}
bool isLocalTo(const OwnershipToken* token, boost::intrusive_ptr<Message>& msg)
@@ -204,6 +211,10 @@ void Queue::process(boost::intrusive_ptr
if (mgmtObject != 0){
mgmtObject->inc_msgTxnEnqueues ();
mgmtObject->inc_byteTxnEnqueues (msg->contentSize ());
+ if (brokerMgmtObject) {
+ brokerMgmtObject->inc_msgTxnEnqueues ();
+ brokerMgmtObject->inc_byteTxnEnqueues (msg->contentSize ());
+ }
}
}
@@ -221,7 +232,13 @@ void Queue::requeue(const QueuedMessage&
if (alternateExchange.get()) {
DeliverableMessage dmsg(msg.payload);
alternateExchange->routeWithAlternate(dmsg);
+ if (brokerMgmtObject)
+ brokerMgmtObject->inc_abandonedViaAlt();
+ } else {
+ if (brokerMgmtObject)
+ brokerMgmtObject->inc_abandoned();
}
+ mgntDeqStats(msg.payload);
} else {
messages->reinsert(msg);
listeners.populate(copy);
@@ -234,8 +251,8 @@ void Queue::requeue(const QueuedMessage&
enqueue(0, payload);
}
}
+ observeRequeue(msg, locker);
}
- observeRequeue(msg, locker);
}
copy.notify();
}
@@ -323,6 +340,11 @@ Queue::ConsumeCode Queue::consumeNextMes
c->setPosition(msg.position);
acquire( msg.position, msg, locker);
dequeue( 0, msg );
+ if (mgmtObject) {
+ mgmtObject->inc_discardsTtl();
+ if (brokerMgmtObject)
+ brokerMgmtObject->inc_discardsTtl();
+ }
continue;
}
@@ -504,6 +526,15 @@ void Queue::purgeExpired(qpid::sys::Dura
messages->removeIf(boost::bind(&collect_if_expired, boost::ref(expired), _1));
}
+ //
+ // Report the count of discarded-by-ttl messages
+ //
+ if (mgmtObject && !expired.empty()) {
+ mgmtObject->inc_discardsTtl(expired.size());
+ if (brokerMgmtObject)
+ brokerMgmtObject->inc_discardsTtl(expired.size());
+ }
+
for (std::deque<QueuedMessage>::const_iterator i = expired.begin();
i != expired.end(); ++i) {
{
@@ -638,6 +669,19 @@ uint32_t Queue::purge(const uint32_t pur
Mutex::ScopedLock locker(messageLock);
messages->removeIf( boost::bind<bool>(boost::ref(c), _1) );
+
+ if (mgmtObject && !c.matches.empty()) {
+ if (dest.get()) {
+ mgmtObject->inc_reroutes(c.matches.size());
+ if (brokerMgmtObject)
+ brokerMgmtObject->inc_reroutes(c.matches.size());
+ } else {
+ mgmtObject->inc_discardsPurge(c.matches.size());
+ if (brokerMgmtObject)
+ brokerMgmtObject->inc_discardsPurge(c.matches.size());
+ }
+ }
+
for (std::deque<QueuedMessage>::iterator qmsg = c.matches.begin();
qmsg != c.matches.end(); ++qmsg) {
// Update observers and message state:
@@ -710,8 +754,14 @@ void Queue::push(boost::intrusive_ptr<Me
if (insertSeqNo) msg->insertCustomProperty(seqNoKey, sequence);
dequeueRequired = messages->push(qm, removed);
- if (dequeueRequired)
+ if (dequeueRequired) {
observeAcquire(removed, locker);
+ if (mgmtObject) {
+ mgmtObject->inc_discardsLvq();
+ if (brokerMgmtObject)
+ brokerMgmtObject->inc_discardsLvq();
+ }
+ }
listeners.populate(copy);
observeEnqueue(qm, locker);
}
@@ -799,10 +849,30 @@ bool Queue::enqueue(TransactionContext*
std::deque<QueuedMessage> dequeues;
{
Mutex::ScopedLock locker(messageLock);
- policy->tryEnqueue(msg);
+ try {
+ policy->tryEnqueue(msg);
+ } catch(ResourceLimitExceededException&) {
+ if (mgmtObject) {
+ mgmtObject->inc_discardsOverflow();
+ if (brokerMgmtObject)
+ brokerMgmtObject->inc_discardsOverflow();
+ }
+ throw;
+ }
policy->getPendingDequeues(dequeues);
}
//depending on policy, may have some dequeues that need to performed without holding the lock
+
+ //
+ // Count the dequeues as ring-discards. We know that these aren't rejects because
+ // policy->tryEnqueue would have thrown an exception.
+ //
+ if (mgmtObject && !dequeues.empty()) {
+ mgmtObject->inc_discardsRing(dequeues.size());
+ if (brokerMgmtObject)
+ brokerMgmtObject->inc_discardsRing(dequeues.size());
+ }
+
for_each(dequeues.begin(), dequeues.end(), boost::bind(&Queue::dequeue, this, (TransactionContext*) 0, _1));
}
@@ -871,6 +941,10 @@ void Queue::dequeueCommitted(const Queue
if (mgmtObject != 0) {
mgmtObject->inc_msgTxnDequeues();
mgmtObject->inc_byteTxnDequeues(msg.payload->contentSize());
+ if (brokerMgmtObject) {
+ brokerMgmtObject->inc_msgTxnDequeues();
+ brokerMgmtObject->inc_byteTxnDequeues(msg.payload->contentSize());
+ }
}
}
@@ -893,8 +967,8 @@ void Queue::popAndDequeue(const Mutex::S
*/
void Queue::observeDequeue(const QueuedMessage& msg, const Mutex::ScopedLock&)
{
- if (policy.get()) policy->dequeued(msg);
mgntDeqStats(msg.payload);
+ if (policy.get()) policy->dequeued(msg);
for (Observers::const_iterator i = observers.begin(); i != observers.end(); ++i) {
try{
(*i)->dequeued(msg);
@@ -909,6 +983,12 @@ void Queue::observeDequeue(const QueuedM
*/
void Queue::observeAcquire(const QueuedMessage& msg, const Mutex::ScopedLock&)
{
+ if (mgmtObject) {
+ mgmtObject->inc_acquires();
+ if (brokerMgmtObject)
+ brokerMgmtObject->inc_acquires();
+ }
+
for (Observers::const_iterator i = observers.begin(); i != observers.end(); ++i) {
try{
(*i)->acquired(msg);
@@ -923,6 +1003,12 @@ void Queue::observeAcquire(const QueuedM
*/
void Queue::observeRequeue(const QueuedMessage& msg, const Mutex::ScopedLock&)
{
+ if (mgmtObject) {
+ mgmtObject->inc_releases();
+ if (brokerMgmtObject)
+ brokerMgmtObject->inc_releases();
+ }
+
for (Observers::const_iterator i = observers.begin(); i != observers.end(); ++i) {
try{
(*i)->requeued(msg);
@@ -1079,14 +1165,22 @@ void Queue::configureImpl(const FieldTab
void Queue::destroyed()
{
unbind(broker->getExchanges());
- if (alternateExchange.get()) {
+ {
Mutex::ScopedLock locker(messageLock);
while(!messages->empty()){
DeliverableMessage msg(messages->front().payload);
- alternateExchange->routeWithAlternate(msg);
+ if (alternateExchange.get()) {
+ if (brokerMgmtObject)
+ brokerMgmtObject->inc_abandonedViaAlt();
+ alternateExchange->routeWithAlternate(msg);
+ } else {
+ if (brokerMgmtObject)
+ brokerMgmtObject->inc_abandoned();
+ }
popAndDequeue(locker);
}
- alternateExchange->decAlternateUsers();
+ if (alternateExchange.get())
+ alternateExchange->decAlternateUsers();
}
if (store) {
@@ -1124,6 +1218,8 @@ void Queue::unbind(ExchangeRegistry& exc
void Queue::setPolicy(std::auto_ptr<QueuePolicy> _policy)
{
policy = _policy;
+ if (policy.get())
+ policy->setQueue(this);
}
const QueuePolicy* Queue::getPolicy()
@@ -1291,6 +1387,40 @@ void Queue::setExternalQueueStore(Extern
}
}
+void Queue::countRejected() const
+{
+ if (mgmtObject) {
+ mgmtObject->inc_discardsSubscriber();
+ if (brokerMgmtObject)
+ brokerMgmtObject->inc_discardsSubscriber();
+ }
+}
+
+void Queue::countFlowedToDisk(uint64_t size) const
+{
+ if (mgmtObject) {
+ mgmtObject->inc_msgFtdEnqueues();
+ mgmtObject->inc_byteFtdEnqueues(size);
+ if (brokerMgmtObject) {
+ brokerMgmtObject->inc_msgFtdEnqueues();
+ brokerMgmtObject->inc_byteFtdEnqueues(size);
+ }
+ }
+}
+
+void Queue::countLoadedFromDisk(uint64_t size) const
+{
+ if (mgmtObject) {
+ mgmtObject->inc_msgFtdDequeues();
+ mgmtObject->inc_byteFtdDequeues(size);
+ if (brokerMgmtObject) {
+ brokerMgmtObject->inc_msgFtdDequeues();
+ brokerMgmtObject->inc_byteFtdDequeues(size);
+ }
+ }
+}
+
+
ManagementObject* Queue::GetManagementObject (void) const
{
return (ManagementObject*) mgmtObject;
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h?rev=1242526&r1=1242525&r2=1242526&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h Thu Feb 9 21:11:41 2012
@@ -39,6 +39,7 @@
#include "qpid/sys/Timer.h"
#include "qpid/management/Manageable.h"
#include "qmf/org/apache/qpid/broker/Queue.h"
+#include "qmf/org/apache/qpid/broker/Broker.h"
#include "qpid/framing/amqp_types.h"
#include <boost/shared_ptr.hpp>
@@ -92,7 +93,6 @@ class Queue : public boost::enable_share
typedef std::set< boost::shared_ptr<QueueObserver> > Observers;
enum ConsumeCode {NO_MESSAGES=0, CANT_CONSUME=1, CONSUMED=2};
-
const std::string name;
const bool autodelete;
MessageStore* store;
@@ -119,6 +119,7 @@ class Queue : public boost::enable_share
boost::shared_ptr<Exchange> alternateExchange;
framing::SequenceNumber sequence;
qmf::org::apache::qpid::broker::Queue* mgmtObject;
+ qmf::org::apache::qpid::broker::Broker* brokerMgmtObject;
sys::AtomicValue<uint32_t> dequeueSincePurge; // Count dequeues since last purge.
int eventMode;
Observers observers;
@@ -165,9 +166,13 @@ class Queue : public boost::enable_share
if (mgmtObject != 0) {
mgmtObject->inc_msgTotalEnqueues ();
mgmtObject->inc_byteTotalEnqueues (msg->contentSize ());
+ brokerMgmtObject->inc_msgTotalEnqueues ();
+ brokerMgmtObject->inc_byteTotalEnqueues (msg->contentSize ());
if (msg->isPersistent ()) {
mgmtObject->inc_msgPersistEnqueues ();
mgmtObject->inc_bytePersistEnqueues (msg->contentSize ());
+ brokerMgmtObject->inc_msgPersistEnqueues ();
+ brokerMgmtObject->inc_bytePersistEnqueues (msg->contentSize ());
}
}
}
@@ -176,9 +181,13 @@ class Queue : public boost::enable_share
if (mgmtObject != 0){
mgmtObject->inc_msgTotalDequeues ();
mgmtObject->inc_byteTotalDequeues (msg->contentSize());
+ brokerMgmtObject->inc_msgTotalDequeues ();
+ brokerMgmtObject->inc_byteTotalDequeues (msg->contentSize());
if (msg->isPersistent ()){
mgmtObject->inc_msgPersistDequeues ();
mgmtObject->inc_bytePersistDequeues (msg->contentSize());
+ brokerMgmtObject->inc_msgPersistDequeues ();
+ brokerMgmtObject->inc_bytePersistDequeues (msg->contentSize());
}
}
}
@@ -355,6 +364,11 @@ class Queue : public boost::enable_share
virtual void setExternalQueueStore(ExternalQueueStore* inst);
+ // Increment the rejected-by-consumer counter.
+ void countRejected() const;
+ void countFlowedToDisk(uint64_t size) const;
+ void countLoadedFromDisk(uint64_t size) const;
+
// Manageable entry points
management::ManagementObject* GetManagementObject (void) const;
management::Manageable::status_t
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/QueuePolicy.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/QueuePolicy.cpp?rev=1242526&r1=1242525&r2=1242526&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/QueuePolicy.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/QueuePolicy.cpp Thu Feb 9 21:11:41 2012
@@ -31,7 +31,7 @@ using namespace qpid::broker;
using namespace qpid::framing;
QueuePolicy::QueuePolicy(const std::string& _name, uint32_t _maxCount, uint64_t _maxSize, const std::string& _type) :
- maxCount(_maxCount), maxSize(_maxSize), type(_type), count(0), size(0), policyExceeded(false), name(_name) {
+ maxCount(_maxCount), maxSize(_maxSize), type(_type), count(0), size(0), policyExceeded(false), queue(0), name(_name) {
QPID_LOG(info, "Queue \"" << name << "\": Policy created: type=" << type << "; maxCount=" << maxCount << "; maxSize=" << maxSize);
}
@@ -204,7 +204,11 @@ FlowToDiskPolicy::FlowToDiskPolicy(const
bool FlowToDiskPolicy::checkLimit(boost::intrusive_ptr<Message> m)
{
- if (!QueuePolicy::checkLimit(m)) m->requestContentRelease();
+ if (!QueuePolicy::checkLimit(m)) {
+ m->requestContentRelease();
+ if (queue)
+ queue->countFlowedToDisk(m->contentSize());
+ }
return true;
}
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/QueuePolicy.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/QueuePolicy.h?rev=1242526&r1=1242525&r2=1242526&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/QueuePolicy.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/QueuePolicy.h Thu Feb 9 21:11:41 2012
@@ -33,6 +33,8 @@
namespace qpid {
namespace broker {
+class Queue;
+
class QueuePolicy
{
static uint64_t defaultMaxSize;
@@ -44,8 +46,8 @@ class QueuePolicy
uint64_t size;
bool policyExceeded;
-
protected:
+ Queue* queue;
uint64_t getCurrentQueueSize() const { return size; }
public:
@@ -72,6 +74,8 @@ class QueuePolicy
void decode ( framing::Buffer& buffer );
uint32_t encodedSize() const;
virtual void getPendingDequeues(Messages& result);
+ std::string getType() const { return type; }
+ void setQueue(Queue* q) { queue = q; }
static QPID_BROKER_EXTERN std::auto_ptr<QueuePolicy> createQueuePolicy(const std::string& name, const qpid::framing::FieldTable& settings);
static QPID_BROKER_EXTERN std::auto_ptr<QueuePolicy> createQueuePolicy(const std::string& name, uint32_t maxCount, uint64_t maxSize, const std::string& type = REJECT);
Modified: qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp?rev=1242526&r1=1242525&r2=1242526&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp Thu Feb 9 21:11:41 2012
@@ -122,7 +122,7 @@ ManagementAgent::ManagementAgent (const
suppressed(false), disallowAllV1Methods(false),
vendorNameKey(defaultVendorName), productNameKey(defaultProductName),
qmf1Support(qmfV1), qmf2Support(qmfV2), maxReplyObjs(100),
- msgBuffer(MA_BUFFER_SIZE)
+ msgBuffer(MA_BUFFER_SIZE), memstat(0)
{
nextObjectId = 1;
brokerBank = 1;
@@ -132,6 +132,9 @@ ManagementAgent::ManagementAgent (const
clientWasAdded = false;
attrMap["_vendor"] = defaultVendorName;
attrMap["_product"] = defaultProductName;
+
+ memstat = new qmf::org::apache::qpid::broker::Memory(this, 0, "amqp-broker");
+ addObject(memstat, "amqp-broker");
}
ManagementAgent::~ManagementAgent ()
@@ -720,6 +723,7 @@ void ManagementAgent::periodicProcessing
static_cast<_qmf::Broker*>(broker->GetManagementObject())->set_uptime(uptime);
moveNewObjectsLH();
+ qpid::sys::MemStat::loadMemInfo(memstat);
//
// Clear the been-here flag on all objects in the map.
@@ -1834,6 +1838,9 @@ void ManagementAgent::handleGetQueryLH(B
string className (value->get<string>());
std::list<ObjectId>matches;
+ if (className == "memory")
+ qpid::sys::MemStat::loadMemInfo(memstat);
+
// build up a set of all objects to be dumped
for (ManagementObjectMap::iterator iter = managementObjects.begin();
iter != managementObjects.end();
@@ -1946,6 +1953,8 @@ void ManagementAgent::handleGetQueryLH(c
packageName = s_iter->second.asString();
}
+ if (className == "memory")
+ qpid::sys::MemStat::loadMemInfo(memstat);
/*
* Unpack the _object_id element of the query if it is present. If it is present, find that one
@@ -1968,6 +1977,7 @@ void ManagementAgent::handleGetQueryLH(c
Variant::Map values;
Variant::Map oidMap;
+ object->writeTimestamps(map_);
object->mapEncodeValues(values, true, true); // write both stats and properties
objId.mapEncode(oidMap);
map_["_values"] = values;
Modified: qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.h?rev=1242526&r1=1242525&r2=1242526&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.h Thu Feb 9 21:11:41 2012
@@ -32,6 +32,8 @@
#include "qpid/management/ManagementEvent.h"
#include "qpid/management/Manageable.h"
#include "qmf/org/apache/qpid/broker/Agent.h"
+#include "qmf/org/apache/qpid/broker/Memory.h"
+#include "qpid/sys/MemStat.h"
#include "qpid/types/Variant.h"
#include <qpid/framing/AMQFrame.h>
#include <qpid/framing/FieldValue.h>
@@ -343,6 +345,11 @@ private:
char eventBuffer[MA_BUFFER_SIZE];
framing::ResizableBuffer msgBuffer;
+ //
+ // Memory statistics object
+ //
+ qmf::org::apache::qpid::broker::Memory *memstat;
+
void writeData ();
void periodicProcessing (void);
void deleteObjectNowLH(const ObjectId& oid);
Added: qpid/trunk/qpid/cpp/src/qpid/sys/posix/MemStat.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/posix/MemStat.cpp?rev=1242526&view=auto
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/posix/MemStat.cpp (added)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/posix/MemStat.cpp Thu Feb 9 21:11:41 2012
@@ -0,0 +1,38 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include "qpid/sys/MemStat.h"
+#include <malloc.h>
+
+void qpid::sys::MemStat::loadMemInfo(qmf::org::apache::qpid::broker::Memory* object)
+{
+ struct mallinfo info(mallinfo());
+
+ object->set_malloc_arena(info.arena);
+ object->set_malloc_ordblks(info.ordblks);
+ object->set_malloc_hblks(info.hblks);
+ object->set_malloc_hblkhd(info.hblkhd);
+ object->set_malloc_uordblks(info.uordblks);
+ object->set_malloc_fordblks(info.fordblks);
+ object->set_malloc_keepcost(info.keepcost);
+}
+
+
Added: qpid/trunk/qpid/cpp/src/qpid/sys/windows/MemStat.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/windows/MemStat.cpp?rev=1242526&view=auto
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/windows/MemStat.cpp (added)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/windows/MemStat.cpp Thu Feb 9 21:11:41 2012
@@ -0,0 +1,29 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include "qpid/sys/MemStat.h"
+
+qpid::sys::MemStat::loadMemInfo(qmf::org::apache::qpid::broker::Memory*)
+{
+ // TODO: Add Windows-specific memory stats to the object and load them here.
+}
+
+
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java?rev=1242526&r1=1242525&r2=1242526&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java Thu Feb 9 21:11:41 2012
@@ -678,6 +678,204 @@ public class QMFService implements Confi
return (System.currentTimeMillis() - _obj.getCreateTime()) * 1000000L;
}
+ public Long getQueueCount()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getMsgTotalEnqueues()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getMsgTotalDequeues()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getByteTotalEnqueues()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getByteTotalDequeues()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getMsgDepth()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getByteDepth()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getMsgPersistEnqueues()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getMsgPersistDequeues()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getBytePersistEnqueues()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getBytePersistDequeues()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getMsgTxnEnqueues()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getMsgTxnDequeues()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getByteTxnEnqueues()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getByteTxnDequeues()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getMsgFtdEnqueues()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getMsgFtdDequeues()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getByteFtdEnqueues()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getByteFtdDequeues()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getMsgFtdDepth()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getByteFtdDepth()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getReleases()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getAcquires()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getDiscardsNoRoute()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getDiscardsTtl()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getDiscardsRing()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getDiscardsLvq()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getDiscardsOverflow()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getDiscardsSubscriber()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getDiscardsPurge()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getReroutes()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getAbandoned()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getAbandonedViaAlt()
+ {
+ // TODO
+ return 0L;
+ }
+
public BrokerSchema.BrokerClass.EchoMethodResponseCommand echo(final BrokerSchema.BrokerClass.EchoMethodResponseCommandFactory factory,
final Long sequence,
final String body)
@@ -1064,6 +1262,96 @@ public class QMFService implements Confi
return _obj.getPersistentByteDequeues();
}
+ public Long getMsgFtdEnqueues()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getMsgFtdDequeues()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getByteFtdEnqueues()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getByteFtdDequeues()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getMsgFtdDepth()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getByteFtdDepth()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getReleases()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getAcquires()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getDiscardsTtl()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getDiscardsRing()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getDiscardsLvq()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getDiscardsOverflow()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getDiscardsSubscriber()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getDiscardsPurge()
+ {
+ // TODO
+ return 0L;
+ }
+
+ public Long getReroutes()
+ {
+ // TODO
+ return 0L;
+ }
+
public Long getConsumerCount()
{
return (long) _obj.getConsumerCount();
Modified: qpid/trunk/qpid/java/broker/src/xsl/qmf.xsl
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/xsl/qmf.xsl?rev=1242526&r1=1242525&r2=1242526&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/xsl/qmf.xsl (original)
+++ qpid/trunk/qpid/java/broker/src/xsl/qmf.xsl Thu Feb 9 21:11:41 2012
@@ -794,9 +794,14 @@ public class <xsl:value-of select="$Clas
<xsl:when test="$type='objId'">OBJECTREFERENCE</xsl:when>
<xsl:when test="$type='sstr'">STR8</xsl:when>
<xsl:when test="$type='lstr'">STR16</xsl:when>
+<xsl:when test="$type='uint8'">UINT8</xsl:when>
<xsl:when test="$type='uint16'">UINT16</xsl:when>
<xsl:when test="$type='uint32'">UINT32</xsl:when>
<xsl:when test="$type='uint64'">UINT64</xsl:when>
+<xsl:when test="$type='int8'">INT8</xsl:when>
+<xsl:when test="$type='int16'">INT16</xsl:when>
+<xsl:when test="$type='int32'">INT32</xsl:when>
+<xsl:when test="$type='int64'">INT64</xsl:when>
<xsl:when test="$type='uuid'">UUID</xsl:when>
<xsl:when test="$type='deltaTime'">DELTATIME</xsl:when>
<xsl:when test="$type='count32'">UINT32</xsl:when>
@@ -813,9 +818,14 @@ public class <xsl:value-of select="$Clas
<xsl:when test="$type='objId'"><xsl:value-of select="$referenceType"/>Object</xsl:when>
<xsl:when test="$type='sstr'">String</xsl:when>
<xsl:when test="$type='lstr'">String</xsl:when>
+ <xsl:when test="$type='uint8'">Integer</xsl:when>
<xsl:when test="$type='uint16'">Integer</xsl:when>
<xsl:when test="$type='uint32'">Long</xsl:when>
<xsl:when test="$type='uint64'">Long</xsl:when>
+ <xsl:when test="$type='int8'">Integer</xsl:when>
+ <xsl:when test="$type='int16'">Integer</xsl:when>
+ <xsl:when test="$type='int32'">Long</xsl:when>
+ <xsl:when test="$type='int64'">Long</xsl:when>
<xsl:when test="$type='uuid'">UUID</xsl:when>
<xsl:when test="$type='deltaTime'">Long</xsl:when>
<xsl:when test="$type='count32'">Long</xsl:when>
@@ -831,9 +841,14 @@ public class <xsl:value-of select="$Clas
<xsl:when test="$type='objId'">writeBin128( <xsl:value-of select="$var"/>.getId() )</xsl:when>
<xsl:when test="$type='sstr'">writeStr8( <xsl:value-of select="$var"/> )</xsl:when>
<xsl:when test="$type='lstr'">writeStr16( <xsl:value-of select="$var"/> )</xsl:when>
+ <xsl:when test="$type='uint8'">writeUint8( <xsl:value-of select="$var"/> )</xsl:when>
<xsl:when test="$type='uint16'">writeUint16( <xsl:value-of select="$var"/> )</xsl:when>
<xsl:when test="$type='uint32'">writeUint32( <xsl:value-of select="$var"/> )</xsl:when>
<xsl:when test="$type='uint64'">writeUint64( <xsl:value-of select="$var"/> )</xsl:when>
+ <xsl:when test="$type='int8'">writeInt8( <xsl:value-of select="$var"/> )</xsl:when>
+ <xsl:when test="$type='int16'">writeInt16( <xsl:value-of select="$var"/> )</xsl:when>
+ <xsl:when test="$type='int32'">writeInt32( <xsl:value-of select="$var"/> )</xsl:when>
+ <xsl:when test="$type='int64'">writeInt64( <xsl:value-of select="$var"/> )</xsl:when>
<xsl:when test="$type='uuid'">writeUuid( <xsl:value-of select="$var"/> )</xsl:when>
<xsl:when test="$type='deltaTime'">writeUint64( <xsl:value-of select="$var"/> )</xsl:when>
<xsl:when test="$type='count32'">writeUint32( <xsl:value-of select="$var"/> )</xsl:when>
@@ -849,9 +864,14 @@ public class <xsl:value-of select="$Clas
<xsl:when test="$type='objId'">readBin128()</xsl:when>
<xsl:when test="$type='sstr'">readStr8()</xsl:when>
<xsl:when test="$type='lstr'">readStr16()</xsl:when>
+ <xsl:when test="$type='uint8'">readUint8()</xsl:when>
<xsl:when test="$type='uint16'">readUint16()</xsl:when>
<xsl:when test="$type='uint32'">readUint32()</xsl:when>
<xsl:when test="$type='uint64'">readUint64()</xsl:when>
+ <xsl:when test="$type='int8'">readInt8()</xsl:when>
+ <xsl:when test="$type='int16'">readInt16()</xsl:when>
+ <xsl:when test="$type='int32'">readInt32()</xsl:when>
+ <xsl:when test="$type='int64'">readInt64()</xsl:when>
<xsl:when test="$type='uuid'">readUuid()</xsl:when>
<xsl:when test="$type='deltaTime'">readUint64()</xsl:when>
<xsl:when test="$type='count32'">readUint32()</xsl:when>
Modified: qpid/trunk/qpid/specs/management-schema.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/specs/management-schema.xml?rev=1242526&r1=1242525&r2=1242526&view=diff
==============================================================================
--- qpid/trunk/qpid/specs/management-schema.xml (original)
+++ qpid/trunk/qpid/specs/management-schema.xml Thu Feb 9 21:11:41 2012
@@ -57,6 +57,22 @@
<!--
===============================================================
+ Memory
+ ===============================================================
+ -->
+ <class name="Memory">
+ <property name="name" type="sstr" access="RC" index="y" desc="Index for the broker at this agent"/>
+ <property name="malloc_arena" type="uint64" access="RO" optional="y" desc="Total size of memory allocated with `sbrk' by `malloc', in bytes"/>
+ <property name="malloc_ordblks" type="uint64" access="RO" optional="y" desc="The number of chunks not in use"/>
+ <property name="malloc_hblks" type="uint64" access="RO" optional="y" desc="Total number of chunks allocated with `mmap'"/>
+ <property name="malloc_hblkhd" type="uint64" access="RO" optional="y" desc="Total size of memory allocated with `mmap', in bytes"/>
+ <property name="malloc_uordblks" type="uint64" access="RO" optional="y" desc="Total size of memory occupied by chunks handed out by `malloc'"/>
+ <property name="malloc_fordblks" type="uint64" access="RO" optional="y" desc="Total size of memory occupied by free (not in use) chunks"/>
+ <property name="malloc_keepcost" type="uint64" access="RO" optional="y" desc="The size of the top-most releasable chunk that normally borders the end of the heap"/>
+ </class>
+
+ <!--
+ ===============================================================
Broker
===============================================================
-->
@@ -73,6 +89,40 @@
<property name="dataDir" type="lstr" access="RO" optional="y" desc="Persistent configuration storage location"/>
<statistic name="uptime" type="deltaTime"/>
+ <statistic name="queueCount" type="count64" unit="queue" desc="Number of queues in the broker"/>
+ <statistic name="msgTotalEnqueues" type="count64" unit="message" desc="Total messages enqueued to broker"/>
+ <statistic name="msgTotalDequeues" type="count64" unit="message" desc="Total messages dequeued from broker"/>
+ <statistic name="byteTotalEnqueues" type="count64" unit="octet" desc="Total bytes enqueued to broker"/>
+ <statistic name="byteTotalDequeues" type="count64" unit="octet" desc="Total bytes dequeued from broker"/>
+ <statistic name="msgDepth" type="count64" unit="message" desc="Current number of messages on queues in broker" assign="msgTotalEnqueues - msgTotalDequeues"/>
+ <statistic name="byteDepth" type="count64" unit="octet" desc="Current number of bytes on queues in broker" assign="byteTotalEnqueues - byteTotalDequeues"/>
+ <statistic name="msgPersistEnqueues" type="count64" unit="message" desc="Total persistent messages enqueued to broker"/>
+ <statistic name="msgPersistDequeues" type="count64" unit="message" desc="Total persistent messages dequeued from broker"/>
+ <statistic name="bytePersistEnqueues" type="count64" unit="octet" desc="Total persistent bytes enqueued to broker"/>
+ <statistic name="bytePersistDequeues" type="count64" unit="octet" desc="Total persistent bytes dequeued from broker"/>
+ <statistic name="msgTxnEnqueues" type="count64" unit="message" desc="Total transactional messages enqueued to broker"/>
+ <statistic name="msgTxnDequeues" type="count64" unit="message" desc="Total transactional messages dequeued from broker"/>
+ <statistic name="byteTxnEnqueues" type="count64" unit="octet" desc="Total transactional bytes enqueued to broker"/>
+ <statistic name="byteTxnDequeues" type="count64" unit="octet" desc="Total transactional bytes dequeued from broker"/>
+ <statistic name="msgFtdEnqueues" type="count64" unit="message" desc="Total message bodies released from memory and flowed-to-disk on broker"/>
+ <statistic name="msgFtdDequeues" type="count64" unit="message" desc="Total message bodies dequeued from the broker having been flowed-to-disk"/>
+ <statistic name="byteFtdEnqueues" type="count64" unit="octet" desc="Total bytes released from memory and flowed-to-disk on broker"/>
+ <statistic name="byteFtdDequeues" type="count64" unit="octet" desc="Total bytes dequeued from the broker having been flowed-to-disk"/>
+ <statistic name="msgFtdDepth" type="count64" unit="message" desc="Current number of messages flowed-to-disk" assign="msgFtdEnqueues - msgFtdDequeues"/>
+ <statistic name="byteFtdDepth" type="count64" unit="octet" desc="Current number of bytes flowed-to-disk" assign="byteFtdEnqueues - byteFtdDequeues"/>
+ <statistic name="releases" type="count64" unit="message" desc="Acquired messages reinserted into the queue"/>
+ <statistic name="acquires" type="count64" unit="message" desc="Messages acquired from the queue"/>
+ <statistic name="discardsNoRoute" type="count64" unit="message" desc="Messages discarded due to no-route from exchange"/>
+ <statistic name="discardsTtl" type="count64" unit="message" desc="Messages discarded due to TTL expiration"/>
+ <statistic name="discardsRing" type="count64" unit="message" desc="Messages discarded due to ring-queue overflow"/>
+ <statistic name="discardsLvq" type="count64" unit="message" desc="Messages discarded due to LVQ insert"/>
+ <statistic name="discardsOverflow" type="count64" unit="message" desc="Messages discarded due to reject-policy overflow"/>
+ <statistic name="discardsSubscriber" type="count64" unit="message" desc="Messages discarded due to subscriber reject"/>
+ <statistic name="discardsPurge" type="count64" unit="message" desc="Messages discarded due to management purge"/>
+ <statistic name="reroutes" type="count64" unit="message" desc="Messages dequeued to management re-route"/>
+ <statistic name="abandoned" type="count64" unit="message" desc="Messages left in a deleted queue"/>
+ <statistic name="abandonedViaAlt" type="count64" unit="message" desc="Messages routed to alternate exchange from a deleted queue"/>
+
<method name="echo" desc="Request a response to test the path to the management broker">
<arg name="sequence" dir="IO" type="uint32" default="0"/>
<arg name="body" dir="IO" type="lstr" default=""/>
@@ -187,6 +237,31 @@
<statistic name="byteTxnDequeues" type="count64" unit="octet" desc="Transactional messages dequeued"/>
<statistic name="bytePersistEnqueues" type="count64" unit="octet" desc="Persistent messages enqueued"/>
<statistic name="bytePersistDequeues" type="count64" unit="octet" desc="Persistent messages dequeued"/>
+
+ <!-- Flow-to-disk Statistics -->
+
+ <statistic name="msgFtdEnqueues" type="count64" unit="message" desc="Total message bodies released from memory and flowed-to-disk on broker"/>
+ <statistic name="msgFtdDequeues" type="count64" unit="message" desc="Total message bodies dequeued from the broker having been flowed-to-disk"/>
+ <statistic name="byteFtdEnqueues" type="count64" unit="octet" desc="Total bytes released from memory and flowed-to-disk on broker"/>
+ <statistic name="byteFtdDequeues" type="count64" unit="octet" desc="Total bytes dequeued from the broker having been flowed-to-disk"/>
+ <statistic name="msgFtdDepth" type="count64" unit="message" desc="Current number of messages flowed-to-disk" assign="msgFtdEnqueues - msgFtdDequeues"/>
+ <statistic name="byteFtdDepth" type="count64" unit="octet" desc="Current number of bytes flowed-to-disk" assign="byteFtdEnqueues - byteFtdDequeues"/>
+
+ <!-- Acquire and Release Statistics - These do not affect msgDepth since msgDepth includes acquired-but-not-completed messages. -->
+
+ <statistic name="releases" type="count64" unit="message" desc="Acquired messages reinserted into the queue"/>
+ <statistic name="acquires" type="count64" unit="message" desc="Messages acquired from the queue"/>
+
+ <!-- Dequeue Details - all of these are included in msgTotalDequeues -->
+
+ <statistic name="discardsTtl" type="count64" unit="message" desc="Messages discarded due to TTL expiration"/>
+ <statistic name="discardsRing" type="count64" unit="message" desc="Messages discarded due to ring-queue overflow"/>
+ <statistic name="discardsLvq" type="count64" unit="message" desc="Messages discarded due to LVQ insert"/>
+ <statistic name="discardsOverflow" type="count64" unit="message" desc="Messages discarded due to reject-policy overflow"/>
+ <statistic name="discardsSubscriber" type="count64" unit="message" desc="Messages discarded due to subscriber reject"/>
+ <statistic name="discardsPurge" type="count64" unit="message" desc="Messages discarded due to management purge"/>
+ <statistic name="reroutes" type="count64" unit="message" desc="Messages dequeued to management re-route"/>
+
<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"/>
Modified: qpid/trunk/qpid/tests/src/py/qpid_tests/broker_0_10/__init__.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tests/src/py/qpid_tests/broker_0_10/__init__.py?rev=1242526&r1=1242525&r2=1242526&view=diff
==============================================================================
--- qpid/trunk/qpid/tests/src/py/qpid_tests/broker_0_10/__init__.py (original)
+++ qpid/trunk/qpid/tests/src/py/qpid_tests/broker_0_10/__init__.py Thu Feb 9 21:11:41 2012
@@ -35,3 +35,4 @@ from threshold import *
from extensions import *
from msg_groups import *
from new_api import *
+from stats import *
Added: qpid/trunk/qpid/tests/src/py/qpid_tests/broker_0_10/stats.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tests/src/py/qpid_tests/broker_0_10/stats.py?rev=1242526&view=auto
==============================================================================
--- qpid/trunk/qpid/tests/src/py/qpid_tests/broker_0_10/stats.py (added)
+++ qpid/trunk/qpid/tests/src/py/qpid_tests/broker_0_10/stats.py Thu Feb 9 21:11:41 2012
@@ -0,0 +1,489 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+from qpid.messaging import *
+from qpid.tests.messaging import Base
+import qmf.console
+from time import sleep
+import os
+import sys
+
+home = os.environ.get("QPID_TOOLS_HOME", os.path.normpath("../../../../tools/src/py"))
+sys.path.append(os.path.join(home, "python"))
+
+from qpidtoollibs.broker import BrokerAgent
+
+#
+# Tests the Broker's statistics reporting
+#
+
+class BrokerStatsTests(Base):
+ """
+ Tests of the broker's statistics
+ """
+
+ def assertEqual(self, left, right, text=None):
+ if not left == right:
+ print "assertEqual failure: %r != %r" % (left, right)
+ if text:
+ print " %r" % text
+ assert None
+
+ def failUnless(self, value, text=None):
+ if value:
+ return
+ print "failUnless failure",
+ if text:
+ print ": %r" % text
+ else:
+ print
+ assert None
+
+ def fail(self, text=None):
+ if text:
+ print "Fail: %r" % text
+ assert None
+
+ def setup_connection(self):
+ return Connection.establish(self.broker, **self.connection_options())
+
+ def setup_session(self, tx=False):
+ return self.conn.session(transactional=tx)
+
+ def setup_access(self):
+ return BrokerAgent(self.conn)
+
+
+ def test_enqueues_dequeues(self):
+ agent = self.setup_access()
+ start_broker = agent.getBroker()
+
+ sess = self.setup_session()
+ tx = sess.sender("enqueue_test;{create:always,delete:always}")
+ rx = sess.receiver("enqueue_test")
+
+ queue = agent.getQueue("enqueue_test")
+ self.failUnless(queue, "expected a valid queue object")
+ self.assertEqual(queue.msgTotalEnqueues, 0, "msgTotalEnqueues")
+ self.assertEqual(queue.byteTotalEnqueues, 0, "byteTotalEnqueues")
+ self.assertEqual(queue.msgTotalDequeues, 0, "msgTotalDequeues")
+ self.assertEqual(queue.byteTotalDequeues, 0, "byteTotalDequeues")
+ self.assertEqual(queue.msgDepth, 0, "msgDepth")
+ self.assertEqual(queue.byteDepth, 0, "byteDepth")
+
+ tx.send("0123456789")
+ tx.send("01234567890123456789")
+ tx.send("012345678901234567890123456789")
+ tx.send("0123456789012345678901234567890123456789")
+
+ queue.update()
+ self.assertEqual(queue.msgTotalEnqueues, 4, "msgTotalEnqueues")
+ self.assertEqual(queue.byteTotalEnqueues, 100, "byteTotalEnqueues")
+ self.assertEqual(queue.msgTotalDequeues, 0, "msgTotalDequeues")
+ self.assertEqual(queue.byteTotalDequeues, 0, "byteTotalDequeues")
+ self.assertEqual(queue.msgDepth, 4, "msgDepth")
+ self.assertEqual(queue.byteDepth, 100, "byteDepth")
+
+ now_broker = agent.getBroker()
+ self.failUnless((now_broker.msgTotalEnqueues - start_broker.msgTotalEnqueues) >= 4, "broker msgTotalEnqueues")
+ self.failUnless((now_broker.byteTotalEnqueues - start_broker.byteTotalEnqueues) >= 100, "broker byteTotalEnqueues")
+
+ m = rx.fetch()
+ m = rx.fetch()
+ sess.acknowledge()
+
+ queue.update()
+ self.assertEqual(queue.msgTotalEnqueues, 4, "msgTotalEnqueues")
+ self.assertEqual(queue.byteTotalEnqueues, 100, "byteTotalEnqueues")
+ self.assertEqual(queue.msgTotalDequeues, 2, "msgTotalDequeues")
+ self.assertEqual(queue.byteTotalDequeues, 30, "byteTotalDequeues")
+ self.assertEqual(queue.msgDepth, 2, "msgDepth")
+ self.assertEqual(queue.byteDepth, 70, "byteDepth")
+
+ now_broker = agent.getBroker()
+ self.failUnless((now_broker.msgTotalDequeues - start_broker.msgTotalDequeues) >= 2, "broker msgTotalDequeues")
+ self.failUnless((now_broker.byteTotalDequeues - start_broker.byteTotalDequeues) >= 30, "broker byteTotalDequeues")
+
+ sess.close()
+
+ now_broker = agent.getBroker()
+ self.assertEqual(now_broker.abandoned - start_broker.abandoned, 2, "expect 2 abandoned messages")
+ self.assertEqual(now_broker.msgDepth, start_broker.msgDepth, "expect broker message depth to be unchanged")
+ self.assertEqual(now_broker.byteDepth, start_broker.byteDepth, "expect broker byte depth to be unchanged")
+
+
+ def test_transactional_enqueues_dequeues(self):
+ agent = self.setup_access()
+ start_broker = agent.getBroker()
+
+ sess = self.setup_session(True)
+ tx = sess.sender("tx_enqueue_test;{create:always,delete:always}")
+
+ tx.send("0123456789")
+ tx.send("0123456789")
+ tx.send("0123456789")
+ tx.send("0123456789")
+
+ queue = agent.getQueue("tx_enqueue_test")
+ self.failUnless(queue, "expected a valid queue object")
+ self.assertEqual(queue.msgTotalEnqueues, 0, "msgTotalEnqueues pre-tx-commit")
+ self.assertEqual(queue.byteTotalEnqueues, 0, "byteTotalEnqueues pre-tx-commit")
+ self.assertEqual(queue.msgTxnEnqueues, 0, "msgTxnEnqueues pre-tx-commit")
+ self.assertEqual(queue.byteTxnEnqueues, 0, "byteTxnEnqueues pre-tx-commit")
+ self.assertEqual(queue.msgTotalDequeues, 0, "msgTotalDequeues pre-tx-commit")
+ self.assertEqual(queue.byteTotalDequeues, 0, "byteTotalDequeues pre-tx-commit")
+ self.assertEqual(queue.msgTxnDequeues, 0, "msgTxnDequeues pre-tx-commit")
+ self.assertEqual(queue.byteTxnDequeues, 0, "byteTxnDequeues pre-tx-commit")
+
+ sess.commit()
+ queue.update()
+ self.assertEqual(queue.msgTotalEnqueues, 4, "msgTotalEnqueues post-tx-commit")
+ self.assertEqual(queue.byteTotalEnqueues, 40, "byteTotalEnqueues post-tx-commit")
+ self.assertEqual(queue.msgTxnEnqueues, 4, "msgTxnEnqueues post-tx-commit")
+ self.assertEqual(queue.byteTxnEnqueues, 40, "byteTxnEnqueues post-tx-commit")
+ self.assertEqual(queue.msgTotalDequeues, 0, "msgTotalDequeues post-tx-commit")
+ self.assertEqual(queue.byteTotalDequeues, 0, "byteTotalDequeues post-tx-commit")
+ self.assertEqual(queue.msgTxnDequeues, 0, "msgTxnDequeues post-tx-commit")
+ self.assertEqual(queue.byteTxnDequeues, 0, "byteTxnDequeues post-tx-commit")
+
+ sess2 = self.setup_session(True)
+ rx = sess2.receiver("tx_enqueue_test")
+
+ m = rx.fetch()
+ m = rx.fetch()
+ m = rx.fetch()
+ m = rx.fetch()
+
+ queue.update()
+ self.assertEqual(queue.msgTotalEnqueues, 4, "msgTotalEnqueues pre-rx-commit")
+ self.assertEqual(queue.byteTotalEnqueues, 40, "byteTotalEnqueues pre-rx-commit")
+ self.assertEqual(queue.msgTxnEnqueues, 4, "msgTxnEnqueues pre-rx-commit")
+ self.assertEqual(queue.byteTxnEnqueues, 40, "byteTxnEnqueues pre-rx-commit")
+ self.assertEqual(queue.msgTotalDequeues, 0, "msgTotalDequeues pre-rx-commit")
+ self.assertEqual(queue.byteTotalDequeues, 0, "byteTotalDequeues pre-rx-commit")
+ self.assertEqual(queue.msgTxnDequeues, 0, "msgTxnDequeues pre-rx-commit")
+ self.assertEqual(queue.byteTxnDequeues, 0, "byteTxnDequeues pre-rx-commit")
+
+ sess2.acknowledge()
+ sess2.commit()
+
+ queue.update()
+ self.assertEqual(queue.msgTotalEnqueues, 4, "msgTotalEnqueues post-rx-commit")
+ self.assertEqual(queue.byteTotalEnqueues, 40, "byteTotalEnqueues post-rx-commit")
+ self.assertEqual(queue.msgTxnEnqueues, 4, "msgTxnEnqueues post-rx-commit")
+ self.assertEqual(queue.byteTxnEnqueues, 40, "byteTxnEnqueues post-rx-commit")
+ self.assertEqual(queue.msgTotalDequeues, 4, "msgTotalDequeues post-rx-commit")
+ self.assertEqual(queue.byteTotalDequeues, 40, "byteTotalDequeues post-rx-commit")
+ self.assertEqual(queue.msgTxnDequeues, 4, "msgTxnDequeues post-rx-commit")
+ self.assertEqual(queue.byteTxnDequeues, 40, "byteTxnDequeues post-rx-commit")
+
+ sess.close()
+ sess2.close()
+
+ now_broker = agent.getBroker()
+ self.assertEqual(now_broker.msgTxnEnqueues - start_broker.msgTxnEnqueues, 4, "broker msgTxnEnqueues")
+ self.assertEqual(now_broker.byteTxnEnqueues - start_broker.byteTxnEnqueues, 40, "broker byteTxnEnqueues")
+ self.assertEqual(now_broker.msgTxnDequeues - start_broker.msgTxnDequeues, 4, "broker msgTxnDequeues")
+ self.assertEqual(now_broker.byteTxnDequeues - start_broker.byteTxnDequeues, 40, "broker byteTxnDequeues")
+
+
+ def test_discards_no_route(self):
+ agent = self.setup_access()
+ start_broker = agent.getBroker()
+
+ sess = self.setup_session()
+ tx = sess.sender("amq.topic/non.existing.key")
+ tx.send("NO_ROUTE")
+ tx.send("NO_ROUTE")
+ tx.send("NO_ROUTE")
+ tx.send("NO_ROUTE")
+ tx.send("NO_ROUTE")
+
+ now_broker = agent.getBroker()
+
+ self.assertEqual(now_broker.discardsNoRoute - start_broker.discardsNoRoute, 5, "Expect 5 no-routes")
+
+ sess.close()
+
+
+ def test_abandoned_alt(self):
+ agent = self.setup_access()
+ start_broker = agent.getBroker()
+
+ sess = self.setup_session()
+ tx = sess.sender("abandon_alt;{create:always,delete:always,node:{x-declare:{alternate-exchange:'amq.fanout'}}}")
+ rx = sess.receiver("abandon_alt")
+ rx.capacity = 2
+
+ tx.send("ABANDON_ALT")
+ tx.send("ABANDON_ALT")
+ tx.send("ABANDON_ALT")
+ tx.send("ABANDON_ALT")
+ tx.send("ABANDON_ALT")
+
+ rx.fetch()
+
+ sess.close()
+ now_broker = agent.getBroker()
+ self.assertEqual(now_broker.abandonedViaAlt - start_broker.abandonedViaAlt, 5, "Expect 5 abandonedViaAlt")
+ self.assertEqual(now_broker.abandoned - start_broker.abandoned, 0, "Expect 0 abandoned")
+
+
+ def test_discards_ttl(self):
+ agent = self.setup_access()
+ start_broker = agent.getBroker()
+
+ sess = self.setup_session()
+ tx = sess.sender("discards_ttl;{create:always,delete:always}")
+ msg = Message("TTL")
+ msg.ttl = 1
+
+ tx.send(msg)
+ tx.send(msg)
+ tx.send(msg)
+ tx.send(msg)
+ tx.send(msg)
+ tx.send(msg)
+
+ sleep(2)
+
+ rx = sess.receiver("discards_ttl")
+ try:
+ rx.fetch(0)
+ except:
+ pass
+
+ now_broker = agent.getBroker()
+ queue = agent.getQueue("discards_ttl")
+
+ self.failUnless(queue, "expected a valid queue object")
+ self.assertEqual(queue.discardsTtl, 6, "expect 6 TTL discards on queue")
+ self.assertEqual(now_broker.discardsTtl - start_broker.discardsTtl, 6, "expect 6 TTL discards on broker")
+ self.assertEqual(queue.msgTotalDequeues, 6, "expect 6 total dequeues on queue")
+
+ sess.close()
+
+
+ def test_discards_limit_overflow(self):
+ agent = self.setup_access()
+ start_broker = agent.getBroker()
+
+ sess = self.setup_session()
+ tx = sess.sender("discards_limit;{create:always,node:{x-declare:{arguments:{'qpid.max_count':3,'qpid.flow_stop_count':0}}}}")
+ tx.send("LIMIT")
+ tx.send("LIMIT")
+ tx.send("LIMIT")
+ try:
+ tx.send("LIMIT")
+ self.fail("expected to fail sending 4th message")
+ except:
+ pass
+
+ now_broker = agent.getBroker()
+ queue = agent.getQueue("discards_limit")
+
+ self.failUnless(queue, "expected a valid queue object")
+ self.assertEqual(queue.discardsOverflow, 1, "expect 1 overflow discard on queue")
+ self.assertEqual(now_broker.discardsOverflow - start_broker.discardsOverflow, 1, "expect 1 overflow discard on broker")
+
+ ##
+ ## Shut down and restart the connection to clear the error condition.
+ ##
+ try:
+ self.conn.close()
+ except:
+ pass
+ self.conn = self.setup_connection()
+
+ ##
+ ## Re-create the session to delete the queue.
+ ##
+ sess = self.setup_session()
+ tx = sess.sender("discards_limit;{create:always,delete:always}")
+ sess.close()
+
+
+ def test_discards_ring_overflow(self):
+ agent = self.setup_access()
+ start_broker = agent.getBroker()
+
+ sess = self.setup_session()
+ tx = sess.sender("discards_ring;{create:always,delete:always,node:{x-declare:{arguments:{'qpid.max_count':3,'qpid.flow_stop_count':0,'qpid.policy_type':ring}}}}")
+
+ tx.send("RING")
+ tx.send("RING")
+ tx.send("RING")
+ tx.send("RING")
+ tx.send("RING")
+
+ now_broker = agent.getBroker()
+ queue = agent.getQueue("discards_ring")
+
+ self.failUnless(queue, "expected a valid queue object")
+ self.assertEqual(queue.discardsRing, 2, "expect 2 ring discards on queue")
+ self.assertEqual(now_broker.discardsRing - start_broker.discardsRing, 2, "expect 2 ring discards on broker")
+ self.assertEqual(queue.msgTotalDequeues, 2, "expect 2 total dequeues on queue")
+
+ sess.close()
+
+
+ def test_discards_lvq_replace(self):
+ agent = self.setup_access()
+ start_broker = agent.getBroker()
+
+ sess = self.setup_session()
+ tx = sess.sender("discards_lvq;{create:always,delete:always,node:{x-declare:{arguments:{'qpid.max_count':3,'qpid.flow_stop_count':0,'qpid.last_value_queue_key':key}}}}")
+ msgA = Message("LVQ_A")
+ msgA.properties['key'] = 'AAA'
+ msgB = Message("LVQ_B")
+ msgB.properties['key'] = 'BBB'
+
+ tx.send(msgA)
+ tx.send(msgB)
+ tx.send(msgA)
+ tx.send(msgA)
+ tx.send(msgB)
+
+ now_broker = agent.getBroker()
+ queue = agent.getQueue("discards_lvq")
+
+ self.failUnless(queue, "expected a valid queue object")
+ self.assertEqual(queue.discardsLvq, 3, "expect 3 lvq discards on queue")
+ self.assertEqual(now_broker.discardsLvq - start_broker.discardsLvq, 3, "expect 3 lvq discards on broker")
+ self.assertEqual(queue.msgTotalDequeues, 3, "expect 3 total dequeues on queue")
+
+ sess.close()
+
+
+ def test_discards_reject(self):
+ agent = self.setup_access()
+ start_broker = agent.getBroker()
+
+ sess = self.setup_session()
+ tx = sess.sender("discards_reject;{create:always,delete:always}")
+ tx.send("REJECT")
+ tx.send("REJECT")
+ tx.send("REJECT")
+
+ rx = sess.receiver("discards_reject")
+ m = rx.fetch()
+ sess.acknowledge()
+ m1 = rx.fetch()
+ m2 = rx.fetch()
+ sess.acknowledge(m1, Disposition(REJECTED))
+ sess.acknowledge(m2, Disposition(REJECTED))
+
+ now_broker = agent.getBroker()
+ queue = agent.getQueue("discards_reject")
+
+ self.failUnless(queue, "expected a valid queue object")
+ self.assertEqual(queue.discardsSubscriber, 2, "expect 2 reject discards on queue")
+ self.assertEqual(now_broker.discardsSubscriber - start_broker.discardsSubscriber, 2, "expect 2 reject discards on broker")
+ self.assertEqual(queue.msgTotalDequeues, 3, "expect 3 total dequeues on queue")
+
+ sess.close()
+
+
+ def test_message_release(self):
+ agent = self.setup_access()
+ start_broker = agent.getBroker()
+
+ sess = self.setup_session()
+ tx = sess.sender("message_release;{create:always,delete:always}")
+ tx.send("RELEASE")
+ tx.send("RELEASE")
+ tx.send("RELEASE")
+ tx.send("RELEASE")
+ tx.send("RELEASE")
+
+ rx = sess.receiver("message_release")
+ m1 = rx.fetch()
+ m2 = rx.fetch()
+ sess.acknowledge(m1, Disposition(RELEASED))
+ sess.acknowledge(m2, Disposition(RELEASED))
+
+ now_broker = agent.getBroker()
+ queue = agent.getQueue("message_release")
+
+ self.failUnless(queue, "expected a valid queue object")
+ self.assertEqual(queue.acquires, 2, "expect 2 acquires on queue")
+ self.failUnless(now_broker.acquires - start_broker.acquires >= 2, "expect at least 2 acquires on broker")
+ self.assertEqual(queue.msgTotalDequeues, 0, "expect 0 total dequeues on queue")
+
+ self.assertEqual(queue.releases, 2, "expect 2 releases on queue")
+ self.failUnless(now_broker.releases - start_broker.releases >= 2, "expect at least 2 releases on broker")
+
+ sess.close()
+
+
+ def test_discards_purge(self):
+ agent = self.setup_access()
+ start_broker = agent.getBroker()
+
+ sess = self.setup_session()
+ tx = sess.sender("discards_purge;{create:always,delete:always}")
+ tx.send("PURGE")
+ tx.send("PURGE")
+ tx.send("PURGE")
+ tx.send("PURGE")
+ tx.send("PURGE")
+
+ queue = agent.getQueue("discards_purge")
+ self.failUnless(queue, "expected a valid queue object")
+
+ queue.purge(3)
+ queue.update()
+
+ now_broker = agent.getBroker()
+ self.assertEqual(queue.discardsPurge, 3, "expect 3 purge discards on queue")
+ self.assertEqual(now_broker.discardsPurge - start_broker.discardsPurge, 3, "expect 3 purge discards on broker")
+ self.assertEqual(queue.msgTotalDequeues, 3, "expect 3 total dequeues on queue")
+
+ sess.close()
+
+
+ def test_reroutes(self):
+ agent = self.setup_access()
+ start_broker = agent.getBroker()
+
+ sess = self.setup_session()
+ tx = sess.sender("reroute;{create:always,delete:always}")
+ tx.send("REROUTE")
+ tx.send("REROUTE")
+ tx.send("REROUTE")
+ tx.send("REROUTE")
+ tx.send("REROUTE")
+ tx.send("REROUTE")
+ tx.send("REROUTE")
+ tx.send("REROUTE")
+
+ queue = agent.getQueue("reroute")
+ self.failUnless(queue, "expected a valid queue object")
+
+ queue.reroute(5, False, 'amq.fanout')
+ queue.update()
+
+ now_broker = agent.getBroker()
+ self.assertEqual(queue.reroutes, 5, "expect 5 reroutes on queue")
+ self.assertEqual(now_broker.reroutes - start_broker.reroutes, 5, "expect 5 reroutes on broker")
+ self.assertEqual(queue.msgTotalDequeues, 5, "expect 5 total dequeues on queue")
+
+ sess.close()
+
+
Modified: qpid/trunk/qpid/tools/setup.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/setup.py?rev=1242526&r1=1242525&r2=1242526&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/setup.py (original)
+++ qpid/trunk/qpid/tools/setup.py Thu Feb 9 21:11:41 2012
@@ -23,15 +23,16 @@ setup(name="qpid-tools",
version="0.15",
author="Apache Qpid",
author_email="dev@qpid.apache.org",
- scripts=["src/py/qpid-cluster",
- "src/py/qpid-cluster-store",
- "src/py/qpid-config",
- "src/py/qpid-printevents",
- "src/py/qpid-queue-stats",
- "src/py/qpid-route",
- "src/py/qpid-stat",
- "src/py/qpid-tool",
- "src/py/qmf-tool"],
+ packages=["qpidtoollibs"],
+ scripts=["qpid-cluster",
+ "qpid-cluster-store",
+ "qpid-config",
+ "qpid-printevents",
+ "qpid-queue-stats",
+ "qpid-route",
+ "qpid-stat",
+ "qpid-tool",
+ "qmf-tool"],
url="http://qpid.apache.org/",
license="Apache Software License",
description="Diagnostic and management tools for Apache Qpid brokers.")
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org