You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2013/03/31 03:14:40 UTC

[21/51] git commit: cluster: free_connections should be assigned before num_connections @ClusterHandler::startClusterEvent(...)

cluster: free_connections should be assigned before num_connections @ClusterHandler::startClusterEvent(...)

When cluster member is removed from the cluster, it will trigger a
core when deleting the cluster machine, 2 days later.

Signed-off-by: Zhao Yongming <mi...@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/09b28d44
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/09b28d44
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/09b28d44

Branch: refs/heads/3.3.x
Commit: 09b28d447bb266172f4ad6e16a8ebbb17aec74e6
Parents: 13411cb
Author: quehan <qu...@taobao.com>
Authored: Wed Mar 20 11:11:06 2013 +0800
Committer: Zhao Yongming <mi...@gmail.com>
Committed: Thu Mar 21 15:53:39 2013 +0800

----------------------------------------------------------------------
 iocore/cluster/ClusterHandlerBase.cc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/09b28d44/iocore/cluster/ClusterHandlerBase.cc
----------------------------------------------------------------------
diff --git a/iocore/cluster/ClusterHandlerBase.cc b/iocore/cluster/ClusterHandlerBase.cc
index fddba69..a8ee01c 100644
--- a/iocore/cluster/ClusterHandlerBase.cc
+++ b/iocore/cluster/ClusterHandlerBase.cc
@@ -1044,8 +1044,8 @@ ClusterHandler::startClusterEvent(int event, Event * e)
                 if (m->clusterHandlers[i])
                   m->clusterHandlers[i]->downing = true;
               }
-              m->num_connections = machine->num_connections;
               m->free_connections -= (m->num_connections - machine->num_connections);
+              m->num_connections = machine->num_connections;
               // delete_this
               failed = -2;
               MUTEX_UNTAKE_LOCK(the_cluster_config_mutex, this_ethread());