Author: aconway
Date: Wed Jun 18 10:53:30 2008
New Revision: 669236
URL: http://svn.apache.org/viewvc?rev=669236&view=rev
Log:
Bring cluster code up to date.
Modified:
incubator/qpid/trunk/qpid/cpp/INSTALL
incubator/qpid/trunk/qpid/cpp/configure.ac
incubator/qpid/trunk/qpid/cpp/src/Makefile.am
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandler.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.h
incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/ClassifierHandler.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterPlugin.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Handler.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/HeaderProperties.h
incubator/qpid/trunk/qpid/cpp/src/tests/ais_check
incubator/qpid/trunk/qpid/cpp/src/tests/start_cluster
incubator/qpid/trunk/qpid/cpp/xml/cluster.xml
Modified: incubator/qpid/trunk/qpid/cpp/INSTALL
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/INSTALL?rev=669236&r1=669235&r2=669236&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/INSTALL (original)
+++ incubator/qpid/trunk/qpid/cpp/INSTALL Wed Jun 18 10:53:30 2008
@@ -59,9 +59,6 @@
* xqilla <http://xqilla.sourceforge.net/HomePage> (2.0.0)
* xerces-c <http://xerces.apache.org/xerces-c/> (2.7.0)
-Running qpid test suite requires:
- * cppunit <http://cppunit.sourceforge.net> (1.11.4)
-
Qpid has been built using the GNU C++ compiler:
* gcc <http://gcc.gnu.org/> (3.2.3)
@@ -88,7 +85,7 @@
=====================================
On linux most packages can be installed using your distribution's package
management tool. For example on Fedora:
- # yum install boost-devel e2fsprogs-devel pkgconfig openais-devel
cppunit-devel
+ # yum install boost-devel e2fsprogs-devel pkgconfig openais-devel
# yum install gcc-c++ make autoconf automake help2man libtool doxygen
graphviz ruby
Follow the manual installation instruction below for any packages not
Modified: incubator/qpid/trunk/qpid/cpp/configure.ac
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/configure.ac?rev=669236&r1=669235&r2=669236&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/configure.ac (original)
+++ incubator/qpid/trunk/qpid/cpp/configure.ac Wed Jun 18 10:53:30 2008
@@ -46,9 +46,6 @@
esac])
AM_CONDITIONAL([HAVE_DOXYGEN], [test -n "$DOXYGEN"])
-# Check for use of CPG
-AM_CONDITIONAL([CPG], [test x$with_CPG = xyes])
-
AC_ARG_ENABLE(warnings,
[ --enable-warnings turn on lots of compiler warnings (recommended)],
[case "${enableval}" in
@@ -152,10 +149,8 @@
# Check for optional CPG requirement.
LDFLAGS="$LDFLAGS -L/usr/lib/openais -L/usr/lib64/openais"
-
-
AC_ARG_WITH([cpg],
- [AS_HELP_STRING([--with-cpg], [Build with CPG support])],
+ [AS_HELP_STRING([--with-cpg], [Build with CPG support for clustering.])],
[case "${withval}" in
yes) # yes - enable
with_CPG=yes
@@ -167,8 +162,8 @@
;;
*) AC_MSG_ERROR([Bad value ${withval} for --with-cpg option]) ;;
esac],
- [ # not specified - GS 24-APR-2008 temporarily disabled - (enable if
libs/headers available).
- with_CPG=no
+ [ # not specified - enable if libs/headers available.
+ with_CPG=yes
AC_CHECK_HEADERS([openais/cpg.h],,[with_CPG=no])
AC_CHECK_LIB([cpg],[cpg_initialize],,[with_CPG=no])
]
Modified: incubator/qpid/trunk/qpid/cpp/src/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/Makefile.am?rev=669236&r1=669235&r2=669236&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/Makefile.am Wed Jun 18 10:53:30 2008
@@ -15,7 +15,7 @@
# AMQP_FINAL_XML is defined in ../configure.ac
[EMAIL PROTECTED]@
-specs=$(amqp_0_10_xml)
+specs=$(amqp_0_10_xml) $(top_srcdir)/xml/cluster.xml
# Ruby generator.
rgen_dir=$(top_srcdir)/rubygen
@@ -439,7 +439,6 @@
qpid/client/ConnectionImpl.h \
qpid/client/ConnectionSettings.h \
qpid/client/Connector.h \
- qpid/client/ChainableFrameHandler.h \
qpid/client/Demux.h \
qpid/client/Dispatcher.h \
qpid/client/Execution.h \
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp?rev=669236&r1=669235&r2=669236&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp
(original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp Wed
Jun 18 10:53:30 2008
@@ -33,9 +33,6 @@
using boost::dynamic_pointer_cast;
using boost::intrusive_ptr;
-static const uint8_t BASIC = 1;
-static const uint8_t MESSAGE = 2;
-
RecoveryManagerImpl::RecoveryManagerImpl(QueueRegistry& _queues,
ExchangeRegistry& _exchanges, LinkRegistry& _links,
DtxManager& _dtxMgr, uint64_t
_stagingThreshold)
: queues(_queues), exchanges(_exchanges), links(_links), dtxMgr(_dtxMgr),
stagingThreshold(_stagingThreshold) {}
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp?rev=669236&r1=669235&r2=669236&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp Wed Jun 18
10:53:30 2008
@@ -288,7 +288,6 @@
bool SemanticState::ConsumerImpl::accept(intrusive_ptr<Message> msg)
{
- //TODO: remove the now redundant checks (channel.flow & basic|message.qos
removed):
blocked = !(filter(msg) && checkCredit(msg) && parent->flowActive &&
(!ackExpected || parent->checkPrefetch(msg)));
return !blocked;
}
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.h?rev=669236&r1=669235&r2=669236&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.h Wed Jun 18
10:53:30 2008
@@ -54,8 +54,7 @@
* SemanticState holds the L3 and L4 state of an open session, whether
* attached to a channel or suspended.
*/
-class SemanticState : public framing::FrameHandler::Chains,
- public sys::OutputTask,
+class SemanticState : public sys::OutputTask,
private boost::noncopyable
{
class ConsumerImpl : public Consumer, public sys::OutputTask
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandler.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandler.cpp?rev=669236&r1=669235&r2=669236&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandler.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandler.cpp Wed Jun 18
10:53:30 2008
@@ -71,7 +71,7 @@
session = connection.broker.getSessionManager().attach(*this, id, force);
}
-FrameHandler* SessionHandler::getInHandler() { return session.get(); }
+FrameHandler* SessionHandler::getInHandler() { return session.get() ?
&session->in : 0; }
qpid::SessionState* SessionHandler::getState() { return session.get(); }
void SessionHandler::readyToSend() {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp?rev=669236&r1=669235&r2=669236&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp Wed Jun 18
10:53:30 2008
@@ -53,7 +53,11 @@
semanticState(*this, *this),
adapter(semanticState),
msgBuilder(&broker.getStore(), broker.getStagingThreshold()),
- enqueuedOp(boost::bind(&SessionState::enqueued, this, _1))
+ enqueuedOp(boost::bind(&SessionState::enqueued, this, _1)),
+ inLastHandler(*this),
+ outLastHandler(*this),
+ inChain(inLastHandler),
+ outChain(outLastHandler)
{
Manageable* parent = broker.GetVhostObject ();
if (parent != 0) {
@@ -102,20 +106,20 @@
handler = 0;
if (mgmtObject.get() != 0)
mgmtObject->set_attached (0);
- }
+}
void SessionState::attach(SessionHandler& h) {
// activateOutput can be called in a different thread, lock to protect
attached status
- Mutex::ScopedLock l(lock);
+ Mutex::ScopedLock l(lock);
QPID_LOG(debug, getId() << ": attached on broker.");
- handler = &h;
- if (mgmtObject.get() != 0)
- {
- mgmtObject->set_attached (1);
- mgmtObject->set_connectionRef
(h.getConnection().GetManagementObject()->getObjectId());
- mgmtObject->set_channelId (h.getChannel());
- }
+ handler = &h;
+ if (mgmtObject.get() != 0)
+ {
+ mgmtObject->set_attached (1);
+ mgmtObject->set_connectionRef
(h.getConnection().GetManagementObject()->getObjectId());
+ mgmtObject->set_channelId (h.getChannel());
}
+}
void SessionState::activateOutput() {
// activateOutput can be called in a different thread, lock to protect
attached status
@@ -137,7 +141,7 @@
switch (methodId)
{
- case management::Session::METHOD_DETACH :
+ case management::Session::METHOD_DETACH :
if (handler != 0)
{
handler->sendDetach();
@@ -145,18 +149,18 @@
status = Manageable::STATUS_OK;
break;
- case management::Session::METHOD_CLOSE :
+ case management::Session::METHOD_CLOSE :
/*
- if (handler != 0)
- {
- handler->getConnection().closeChannel(handler->getChannel());
- }
- status = Manageable::STATUS_OK;
- break;
+ if (handler != 0)
+ {
+ handler->getConnection().closeChannel(handler->getChannel());
+ }
+ status = Manageable::STATUS_OK;
+ break;
*/
- case management::Session::METHOD_SOLICITACK :
- case management::Session::METHOD_RESETLIFESPAN :
+ case management::Session::METHOD_SOLICITACK :
+ case management::Session::METHOD_RESETLIFESPAN :
status = Manageable::STATUS_NOT_IMPLEMENTED;
break;
}
@@ -218,10 +222,12 @@
receiverCompleted(msg->getCommandId());
if (msg->requiresAccept())
getProxy().getMessage().accept(SequenceSet(msg->getCommandId()));
- }
+}
-void SessionState::handle(AMQFrame& frame)
-{
+void SessionState::handleIn(AMQFrame& f) { inChain.handle(f); }
+void SessionState::handleOut(AMQFrame& f) { outChain.handle(f); }
+
+void SessionState::handleInLast(AMQFrame& frame) {
SequenceNumber commandId = receiverGetCurrent();
try {
//TODO: make command handling more uniform, regardless of whether
@@ -252,6 +258,11 @@
}
}
+void SessionState::handleOutLast(AMQFrame& frame) {
+ assert(handler);
+ handler->out(frame);
+}
+
DeliveryId SessionState::deliver(QueuedMessage& msg, DeliveryToken::shared_ptr
token)
{
uint32_t maxFrameSize = getConnection().getFrameMax();
@@ -267,7 +278,7 @@
void SessionState::senderCompleted(const SequenceSet& commands) {
qpid::SessionState::senderCompleted(commands);
for (SequenceSet::RangeIterator i = commands.rangesBegin(); i !=
commands.rangesEnd(); i++)
- semanticState.completed(i->first(), i->last());
+ semanticState.completed(i->first(), i->last());
}
void SessionState::readyToSend() {
@@ -280,4 +291,8 @@
Broker& SessionState::getBroker() { return broker; }
+framing::FrameHandler::Chain& SessionState::getInChain() { return inChain; }
+
+framing::FrameHandler::Chain& SessionState::getOutChain() { return outChain; }
+
}} // namespace qpid::broker
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.h?rev=669236&r1=669235&r2=669236&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.h Wed Jun 18
10:53:30 2008
@@ -62,10 +62,10 @@
* themselves have state.
*/
class SessionState : public qpid::SessionState,
- public SessionContext,
- public DeliveryAdapter,
+ public SessionContext,
+ public DeliveryAdapter,
public management::Manageable,
- public framing::FrameHandler
+ public framing::FrameHandler::InOutHandler
{
public:
SessionState(Broker&, SessionHandler&, const SessionId&, const
SessionState::Configuration&);
@@ -87,8 +87,6 @@
/** OutputControl **/
void activateOutput();
- void handle(framing::AMQFrame& frame);
-
void senderCompleted(const framing::SequenceSet& ranges);
void sendCompletion();
@@ -99,32 +97,43 @@
// Manageable entry points
management::ManagementObject::shared_ptr GetManagementObject (void) const;
management::Manageable::status_t
- ManagementMethod (uint32_t methodId, management::Args& args);
+ ManagementMethod (uint32_t methodId, management::Args& args);
void readyToSend();
+ framing::FrameHandler::Chain& getInChain();
+ framing::FrameHandler::Chain& getOutChain();
+
private:
+ void handleCommand(framing::AMQMethodBody* method, const
framing::SequenceNumber& id);
+ void handleContent(framing::AMQFrame& frame, const
framing::SequenceNumber& id);
+ void enqueued(boost::intrusive_ptr<Message> msg);
+
+ void handleIn(framing::AMQFrame& frame);
+ void handleOut(framing::AMQFrame& frame);
+
+ // End of the input & output chains.
+ void handleInLast(framing::AMQFrame& frame);
+ void handleOutLast(framing::AMQFrame& frame);
+
Broker& broker;
SessionHandler* handler;
sys::AbsTime expiry; // Used by SessionManager.
sys::Mutex lock;
bool ignoring;
std::string name;
-
SemanticState semanticState;
SessionAdapter adapter;
MessageBuilder msgBuilder;
IncompleteMessageList incomplete;
-
IncompleteMessageList::CompletionListener enqueuedOp;
-
management::Session::shared_ptr mgmtObject;
- void handleCommand(framing::AMQMethodBody* method, const
framing::SequenceNumber& id);
- void handleContent(framing::AMQFrame& frame, const
framing::SequenceNumber& id);
- void enqueued(boost::intrusive_ptr<Message> msg);
+ framing::FrameHandler::MemFunRef<SessionState,
&SessionState::handleInLast> inLastHandler;
+ framing::FrameHandler::MemFunRef<SessionState,
&SessionState::handleOutLast> outLastHandler;
+ framing::FrameHandler::Chain inChain, outChain;
- friend class SessionManager;
+ friend class SessionManager;
};
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/ClassifierHandler.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/ClassifierHandler.cpp?rev=669236&r1=669235&r2=669236&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/ClassifierHandler.cpp
(original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/ClassifierHandler.cpp Wed
Jun 18 10:53:30 2008
@@ -41,11 +41,11 @@
using framing::FrameDefaultVisitor::visit;
using framing::FrameDefaultVisitor::defaultVisit;
- FrameHandler::Chain chosen;
+ FrameHandler* chosen;
AMQFrame& frame;
ClassifierHandler& classifier;
};
-void ClassifierHandler::handle(AMQFrame& f) { Visitor(f, *this).chosen(f); }
+void ClassifierHandler::handle(AMQFrame& f) { Visitor(f,
*this).chosen->handle(f); }
}} // namespace qpid::cluster
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp?rev=669236&r1=669235&r2=669236&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp Wed Jun 18
10:53:30 2008
@@ -71,28 +71,23 @@
void handle(AMQFrame& f) {
next->handle(f);
- Mutex::ScopedLock l(senderLock);
- senderBusy=false;
- senderLock.notify();
+ // FIXME aconway 2008-06-16: solve overtaking problem - async
completion of commands.
+ // Mutex::ScopedLock l(lock);
+ // senderBusy=false;
+ // senderLock.notify();
}
};
-// FIXME aconway 2008-01-29: IList
-void insert(FrameHandler::Chain& c, FrameHandler* h) {
- h->next = c.next;
- c.next = h;
-}
-
struct SessionObserver : public broker::SessionManager::Observer {
Cluster& cluster;
SessionObserver(Cluster& c) : cluster(c) {}
void opened(SessionState& s) {
- // FIXME aconway 2008-01-29: IList for memory management.
+ // FIXME aconway 2008-06-16: clean up chaining and observers.
ClusterSendHandler* sender=new ClusterSendHandler(s, cluster);
ClusterDeliverHandler* deliverer=new ClusterDeliverHandler(*sender,
cluster);
- insert(s.in, deliverer);
- insert(s.in, sender);
+ s.getInChain().insert(deliverer);
+ s.getOutChain().insert(sender);
}
};
}
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterPlugin.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterPlugin.cpp?rev=669236&r1=669235&r2=669236&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterPlugin.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterPlugin.cpp Wed Jun 18
10:53:30 2008
@@ -69,7 +69,7 @@
cluster = boost::in_place(options.name,
options.getUrl(broker->getPort()),
boost::ref(*broker));
- broker->getPreviewSessionManager().add(cluster->getObserver());
+ broker->getSessionManager().add(cluster->getObserver());
}
}
};
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Handler.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Handler.h?rev=669236&r1=669235&r2=669236&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Handler.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Handler.h Wed Jun 18
10:53:30 2008
@@ -46,22 +46,21 @@
/** Pointer to next handler in a linked list. */
Handler<T>* next;
- /** A Chain is a handler that forwards to a modifiable
- * linked list of handlers.
+ /** A Chain is a handler holding a linked list of sub-handlers.
+ * Chain::next is invoked after the full, it is not itself part of the
chain.
+ * Handlers inserted into the chain are deleted by the Chain dtor.
*/
- struct Chain : public Handler<T> {
- Chain(Handler<T>* first=0) : Handler(first) {}
- void operator=(Handler<T>* h) { next = h; }
- void handle(T t) { next->handle(t); }
- // TODO aconway 2007-08-29: chain modifier ops here.
- };
+ class Chain : public Handler<T> {
+ public:
+ Chain(Handler<T>& next_) : Handler(&next_), first(&next_) {}
+ ~Chain() { while (first != next) pop(); }
+ void handle(T t) { first->handle(t); }
+ void insert(Handler<T>* h) { h->next = first; first = h; }
+ bool empty() { return first == next; }
- /** In/out pair of handler chains. */
- struct Chains {
- Chains(Handler<T>* in_=0, Handler<T>* out_=0) : in(in_), out(out_) {}
- void reset(Handler<T>* in_=0, Handler<T>* out_=0) { in = in_; out =
out_; }
- Chain in;
- Chain out;
+ private:
+ void pop() { Handler<T>* p=first; first=first->next; delete p; }
+ Handler<T>* first;
};
/** Adapt any void(T) functor as a Handler.
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/HeaderProperties.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/HeaderProperties.h?rev=669236&r1=669235&r2=669236&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/HeaderProperties.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/HeaderProperties.h Wed Jun
18 10:53:30 2008
@@ -27,8 +27,6 @@
namespace qpid {
namespace framing {
- enum header_classes{BASIC = 60};
-
class HeaderProperties
{
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/ais_check
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/ais_check?rev=669236&r1=669235&r2=669236&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/ais_check (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/ais_check Wed Jun 18 10:53:30 2008
@@ -2,7 +2,7 @@
# Check for requirements, run AIS tests if found.
#
-id -nG | grep '\<ais\>' || \
+id -nG | grep '\<ais\>' >/dev/null || \
NOGROUP="You are not a member of the ais group."
ps -u root | grep aisexec >/dev/null || \
NOAISEXEC="The aisexec daemon is not running as root"
@@ -24,4 +24,4 @@
exit 0; # A warning, not a failure.
fi
-echo ./ais_run | newgrp ais
+echo `dirname $0`/ais_run | newgrp ais
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/start_cluster
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/start_cluster?rev=669236&r1=669235&r2=669236&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/start_cluster (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/start_cluster Wed Jun 18 10:53:30
2008
@@ -9,10 +9,11 @@
rm -f cluster*.log cluster.ports
SIZE=$1
shift
-OPTS=$*
CLUSTER=`whoami` # Cluster name=user name, avoid clashes.
+OPTS="--load-module ../.libs/libqpidcluster.so -dp0 --log-output=cluster$i.log
--cluster-name=$CLUSTER --no-data-dir --auth=no $*"
+
for (( i=0; i<SIZE; ++i )); do
- PORT=`../qpidd --load-module ../.libs/libqpidcluster.so -dp0
--log-output=cluster$i.log --cluster-name $CLUSTER $OPTS` || exit 1
+ PORT=`../qpidd $OPTS` || exit 1
echo $PORT >> cluster.ports
done
Modified: incubator/qpid/trunk/qpid/cpp/xml/cluster.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/xml/cluster.xml?rev=669236&r1=669235&r2=669236&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/xml/cluster.xml (original)
+++ incubator/qpid/trunk/qpid/cpp/xml/cluster.xml Wed Jun 18 10:53:30 2008
@@ -1,37 +1,33 @@
<?xml version="1.0"?>
<!--
- -
- - 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.
- -
- -->
-
-<amqp major="99" minor="0" port="5672">
-
-<class name = "cluster" index = "201">
-
-<doc>Qpid extension class to allow clustered brokers to communicate.</doc>
-
-<method name = "notify" index="10">
- <doc>Notify the cluster of a members URL</doc>
- <!-- No chassis element, this is handled by separte cluster code for now.-->
- <field name="url" domain="longstr" />
-</method>
-
-</class>
-
+-
+- 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.
+-
+-->
+
+<amqp major="0" minor="10" port="5672">
+
+ <class name = "cluster" code = "0x80" label="clustering extensions">
+ <doc>Qpid extension class to allow clustered brokers to communicate.</doc>
+ <control name = "notify" code="0x1" label="notify cluster of a new member">
+ <doc>Notify the cluster of a member URL</doc>
+ <!-- No chassis element, this is handled by separte cluster code for
now.-->
+ <field name="url" type="str16" />
+ </control>
+ </class>
</amqp>
