QPID-4514: Remove obsolete cluster code, clusterOrderProxy

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1424121 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 1 insertions, 40 deletions

diff --git a/cpp/src/qpid/broker/ConnectionState.h b/cpp/src/qpid/broker/ConnectionState.h
index 4dfd86fd8e..5ca037a0e9 100644
--- a/cpp/src/qpid/broker/ConnectionState.h
+++ b/cpp/src/qpid/broker/ConnectionState.h
@@ -48,7 +48,6 @@ class ConnectionState : public ConnectionToken, public management::Manageable
         heartbeatmax(120),
         userProxyAuth(false), // Can proxy msgs with non-matching auth ids when true (used by federation links & clustering)
         federationLink(true),
-        clusterOrderOut(0),
         isDefaultRealm(false)
     {}
 
@@ -102,15 +101,6 @@ class ConnectionState : public ConnectionToken, public management::Manageable
     framing::ProtocolVersion getVersion() const { return version; }
     void setOutputHandler(qpid::sys::ConnectionOutputHandler* o) { out.set(o); }
 
-    /**
-     * If the broker is part of a cluster, this is a handler provided
-     * by cluster code. It ensures consistent ordering of commands
-     * that are sent based on criteria that are not predictably
-     * ordered cluster-wide, e.g. a timer firing.
-     */
-    framing::FrameHandler* getClusterOrderOutput() { return clusterOrderOut; }
-    void setClusterOrderOutput(framing::FrameHandler& fh) { clusterOrderOut = &fh; }
-
     virtual void requestIOProcessing (boost::function0<void>) = 0;
 
   protected:
@@ -124,7 +114,6 @@ class ConnectionState : public ConnectionToken, public management::Manageable
     bool federationLink;
     std::string federationPeerTag;
     std::vector<Url> knownHosts;
-    framing::FrameHandler* clusterOrderOut;
     std::string userName;
     bool isDefaultRealm;
 };
diff --git a/cpp/src/qpid/broker/SessionHandler.cpp b/cpp/src/qpid/broker/SessionHandler.cpp
index 9888d12be2..0874a6a28e 100644
--- a/cpp/src/qpid/broker/SessionHandler.cpp
+++ b/cpp/src/qpid/broker/SessionHandler.cpp
@@ -34,9 +34,7 @@ using namespace qpid::sys;
 SessionHandler::SessionHandler(Connection& c, ChannelId ch)
     : qpid::amqp_0_10::SessionHandler(&c.getOutput(), ch),
       connection(c),
-      proxy(out),
-      clusterOrderProxy(c.getClusterOrderOutput() ?
-                        new SetChannelProxy(ch, c.getClusterOrderOutput()) : 0)
+      proxy(out)
 {}
 
 SessionHandler::~SessionHandler() {}
diff --git a/cpp/src/qpid/broker/SessionHandler.h b/cpp/src/qpid/broker/SessionHandler.h
index 21c736fa37..d42b7838bb 100644
--- a/cpp/src/qpid/broker/SessionHandler.h
+++ b/cpp/src/qpid/broker/SessionHandler.h
@@ -71,17 +71,6 @@ class SessionHandler : public qpid::amqp_0_10::SessionHandler {
     framing::AMQP_ClientProxy& getProxy() { return proxy; }
     const framing::AMQP_ClientProxy& getProxy() const { return proxy; }
 
-    /**
-     * If commands are sent based on the local time (e.g. in timers), they don't have
-     * a well-defined ordering across cluster nodes.
-     * This proxy is for sending such commands. In a clustered broker it will take steps
-     * to synchronize command order across the cluster. In a stand-alone broker
-     * it is just a synonym for getProxy()
-     */
-    framing::AMQP_ClientProxy& getClusterOrderProxy() {
-        return clusterOrderProxy.get() ? *clusterOrderProxy : proxy;
-    }
-
     virtual void handleDetach();
     void attached(const std::string& name);//used by 'pushing' inter-broker bridges
     void attachAs(const std::string& name);//used by 'pulling' inter-broker bridges
@@ -108,7 +97,6 @@ class SessionHandler : public qpid::amqp_0_10::SessionHandler {
     Connection& connection;
     framing::AMQP_ClientProxy proxy;
     std::auto_ptr<SessionState> session;
-    std::auto_ptr<SetChannelProxy> clusterOrderProxy;
     boost::shared_ptr<ErrorListener> errorListener;
 };
 
diff --git a/cpp/src/qpid/broker/SessionState.cpp b/cpp/src/qpid/broker/SessionState.cpp
index a6494bc362..a1bfcd47e5 100644
--- a/cpp/src/qpid/broker/SessionState.cpp
+++ b/cpp/src/qpid/broker/SessionState.cpp
@@ -337,11 +337,6 @@ Broker& SessionState::getBroker() { return broker; }
 // dead sessions are kept and interfere with failover.
 void SessionState::setTimeout(uint32_t) { }
 
-framing::AMQP_ClientProxy& SessionState::getClusterOrderProxy() {
-    return handler->getClusterOrderProxy();
-}
-
-
 // Current received command is an execution.sync command.
 // Complete this command only when all preceding commands have completed.
 // (called via the invoker() in handleCommand() above)
diff --git a/cpp/src/qpid/broker/SessionState.h b/cpp/src/qpid/broker/SessionState.h
index ae28df8026..a60e75d192 100644
--- a/cpp/src/qpid/broker/SessionState.h
+++ b/cpp/src/qpid/broker/SessionState.h
@@ -153,15 +153,6 @@ class SessionState : public qpid::SessionState,
 
     void sendAcceptAndCompletion();
 
-    /**
-     * If commands are sent based on the local time (e.g. in timers), they don't have
-     * a well-defined ordering across cluster nodes.
-     * This proxy is for sending such commands. In a clustered broker it will take steps
-     * to synchronize command order across the cluster. In a stand-alone broker
-     * it is just a synonym for getProxy()
-     */
-    framing::AMQP_ClientProxy& getClusterOrderProxy();
-
     Broker& broker;
     SessionHandler* handler;
     sys::AbsTime expiry;        // Used by SessionManager.