Author: chug
Date: Fri Sep 7 20:24:43 2012
New Revision: 1382155
URL: http://svn.apache.org/viewvc?rev=1382155&view=rev
Log:
QPID-4142 C++ Broker connection counting. Revert r1371772 which applied only to
0.18 and is obsolete on trunk.
Modified:
qpid/trunk/qpid/cpp/src/qpid/acl/Acl.cpp
qpid/trunk/qpid/cpp/src/qpid/acl/Acl.h
qpid/trunk/qpid/cpp/src/qpid/acl/AclConnectionCounter.cpp
qpid/trunk/qpid/cpp/src/qpid/acl/AclConnectionCounter.h
qpid/trunk/qpid/cpp/src/qpid/broker/AclModule.h
qpid/trunk/qpid/cpp/src/qpid/broker/Connection.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/acl/Acl.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/acl/Acl.cpp?rev=1382155&r1=1382154&r2=1382155&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/acl/Acl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/acl/Acl.cpp Fri Sep 7 20:24:43 2012
@@ -141,13 +141,6 @@ bool Acl::approveConnection(const qpid::
return connectionCounter->approveConnection(conn);
}
-
-void Acl::setUserId(const qpid::broker::Connection& connection, const
std::string& username)
-{
- connectionCounter->setUserId(connection, username);
-}
-
-
bool Acl::approveCreateQueue(const std::string& userId, const std::string&
queueName)
{
return resourceCounter->approveCreateQueue(userId, queueName);
Modified: qpid/trunk/qpid/cpp/src/qpid/acl/Acl.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/acl/Acl.h?rev=1382155&r1=1382154&r2=1382155&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/acl/Acl.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/acl/Acl.h Fri Sep 7 20:24:43 2012
@@ -98,7 +98,6 @@ public:
// Resource quota tracking
virtual bool approveConnection(const broker::Connection& connection);
- virtual void setUserId(const broker::Connection& connection, const
std::string& username);
virtual bool approveCreateQueue(const std::string& userId, const
std::string& queueName);
virtual void recordDestroyQueue(const std::string& queueName);
Modified: qpid/trunk/qpid/cpp/src/qpid/acl/AclConnectionCounter.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/acl/AclConnectionCounter.cpp?rev=1382155&r1=1382154&r2=1382155&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/acl/AclConnectionCounter.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/acl/AclConnectionCounter.cpp Fri Sep 7
20:24:43 2012
@@ -296,47 +296,6 @@ bool ConnectionCounter::approveConnectio
}
}
-
-//
-// setUserId
-// On cluster shadow connections, track a new user id for this connection.
-//
-void ConnectionCounter::setUserId(const broker::Connection& connection,
- const std::string& username)
-{
- Mutex::ScopedLock locker(dataLock);
-
- connectCountsMap_t::iterator eRef =
connectProgressMap.find(connection.getMgmtId());
- if (eRef != connectProgressMap.end()) {
- if ((*eRef).second == C_OPENED){
- // Connection has been opened so that current user has been counted
- if (connection.isShadow()) {
- // This is a shadow connection and therefore receives userId
changes
- QPID_LOG(debug, "Changing User ID for cluster connection: "
- << connection.getMgmtId() << ", old user:'" <<
connection.getUserId()
- << "', new user:'" << username << "'");
-
- // Decrement user in-use count for old userId
- releaseLH(connectByNameMap,
- connection.getUserId(),
- nameLimit);
- // Increment user in-use count for new userId
- (void) countConnectionLH(connectByNameMap, username,
nameLimit, false);
- } else {
- QPID_LOG(warning, "Changing User ID for non-cluster
connections is not supported: "
- << connection.getMgmtId() << ", old user " <<
connection.getUserId()
- << ", new user " << username);
- }
- } else {
- // connection exists but has not been opened.
- // setUserId is called in normal course. The user gets counted
when connection is opened.
- }
- } else {
- // Connection does not exist.
- }
-}
-
-
//
// getClientIp - given a connection's mgmtId return the client host part.
//
Modified: qpid/trunk/qpid/cpp/src/qpid/acl/AclConnectionCounter.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/acl/AclConnectionCounter.h?rev=1382155&r1=1382154&r2=1382155&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/acl/AclConnectionCounter.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/acl/AclConnectionCounter.h Fri Sep 7 20:24:43
2012
@@ -94,7 +94,6 @@ public:
// Connection counting
bool approveConnection(const broker::Connection& conn);
- void setUserId(const broker::Connection& connection, const std::string&
username);
};
}} // namespace qpid::ha
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/AclModule.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/AclModule.h?rev=1382155&r1=1382154&r2=1382155&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/AclModule.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/AclModule.h Fri Sep 7 20:24:43 2012
@@ -153,10 +153,6 @@ namespace broker {
*/
virtual bool approveConnection (const Connection& connection)=0;
- /** Change connection's counted userId
- */
- virtual void setUserId(const Connection& connection, const
std::string& username)=0;
-
/** Approve queue creation by counting per-user.
*/
virtual bool approveCreateQueue(const std::string& userId, const
std::string& queueName)=0;
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Connection.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Connection.cpp?rev=1382155&r1=1382154&r2=1382155&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Connection.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Connection.cpp Fri Sep 7 20:24:43 2012
@@ -25,7 +25,6 @@
#include "qpid/broker/Bridge.h"
#include "qpid/broker/Broker.h"
#include "qpid/broker/Queue.h"
-#include "qpid/broker/AclModule.h"
#include "qpid/sys/SecuritySettings.h"
#include "qpid/sys/ClusterSafe.h"
@@ -279,13 +278,6 @@ void Connection::notifyConnectionForced(
void Connection::setUserId(const string& userId)
{
- // Account for changing userId
- AclModule* acl = broker.getAcl();
- if (acl)
- {
- acl->setUserId(*this, userId);
- }
-
ConnectionState::setUserId(userId);
// In a cluster, the cluster code will raise the connect event
// when the connection is replicated to the cluster.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
