This is an automated email from the ASF dual-hosted git repository.

mkevo pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git


The following commit(s) were added to refs/heads/develop by this push:
     new 1f2fc24  GEODE-8613: Removing exclusive access to creation/closing of 
pool connections (#676)
1f2fc24 is described below

commit 1f2fc24b43a1ac70f74c289eb2e72fa14c9f44a9
Author: Alberto Gomez <alberto.go...@est.tech>
AuthorDate: Wed Oct 21 18:04:36 2020 +0200

    GEODE-8613: Removing exclusive access to creation/closing of pool 
connections (#676)
---
 cppcache/src/ThinClientPoolDM.cpp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/cppcache/src/ThinClientPoolDM.cpp 
b/cppcache/src/ThinClientPoolDM.cpp
index f4ff158..dcc816b 100644
--- a/cppcache/src/ThinClientPoolDM.cpp
+++ b/cppcache/src/ThinClientPoolDM.cpp
@@ -510,7 +510,6 @@ void 
ThinClientPoolDM::restoreMinConnections(std::atomic<bool>& isRunning) {
   int restored = 0;
 
   if (m_poolSize < min) {
-    std::lock_guard<decltype(mutex_)> lock(mutex_);
     while (m_poolSize < min && limit-- && isRunning) {
       TcrConnection* conn = nullptr;
       bool maxConnLimit = false;
@@ -1631,7 +1630,6 @@ GfErrType 
ThinClientPoolDM::getConnectionToAnEndPoint(std::string epNameStr,
 GfErrType ThinClientPoolDM::createPoolConnectionToAEndPoint(
     TcrConnection*& conn, TcrEndpoint* theEP, bool& maxConnLimit,
     bool appThreadrequest) {
-  std::lock_guard<decltype(mutex_)> lock(mutex_);
   GfErrType error = GF_NOERR;
   conn = nullptr;
   int min = 0;
@@ -1694,7 +1692,6 @@ void ThinClientPoolDM::reducePoolSize(int num) {
 GfErrType ThinClientPoolDM::createPoolConnection(
     TcrConnection*& conn, std::set<ServerLocation>& excludeServers,
     bool& maxConnLimit, const TcrConnection* currentserver) {
-  std::lock_guard<decltype(mutex_)> lock(mutex_);
   GfErrType error = GF_NOERR;
   int max = m_attrs->getMaxConnections();
   if (max == -1) {
@@ -1860,7 +1857,6 @@ GfErrType ThinClientPoolDM::sendRequestToEP(const 
TcrMessage& request,
         _GEODE_SAFE_DELETE(conn);
       }
       if (putConnInPool) {
-        std::lock_guard<decltype(mutex_)> lock(mutex_);
         reducePoolSize(1);
       }
       currentEndpoint->setConnectionStatus(false);
@@ -1943,7 +1939,6 @@ GfErrType ThinClientPoolDM::sendRequestToEP(const 
TcrMessage& request,
     } else if (error != GF_NOERR) {
       currentEndpoint->setConnectionStatus(false);
       if (putConnInPool) {
-        std::lock_guard<decltype(mutex_)> lock(mutex_);
         removeEPConnections(1);
       }
     }
@@ -1998,13 +1993,11 @@ TcrEndpoint* ThinClientPoolDM::addEP(const std::string& 
endpointName) {
 }
 
 void ThinClientPoolDM::netDown() {
-  std::lock_guard<decltype(mutex_)> lock(mutex_);
   close();
   reset();
 }
 
 void ThinClientPoolDM::pingServerLocal() {
-  std::lock_guard<decltype(mutex_)> lock(mutex_);
   std::lock_guard<decltype(m_endpointsLock)> guard(m_endpointsLock);
   for (auto& it : m_endpoints) {
     auto endpoint = it.second;
@@ -2104,7 +2097,6 @@ bool ThinClientPoolDM::canItBeDeleted(TcrConnection* 
conn) {
   if (conn && candidateForDeletion) {
     TcrEndpoint* endPt = conn->getEndpointObject();
     {
-      std::lock_guard<decltype(mutex_)> lock(mutex_);
       std::lock_guard<decltype(endPt->getQueueHostedMutex())> guardQueue(
           endPt->getQueueHostedMutex());
       bool queue = endPt->isQueueHosted();

Reply via email to