You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2015/02/17 19:45:02 UTC
[1/2] stratos git commit: Change the fault members identifying way
Repository: stratos
Updated Branches:
refs/heads/master 3eb11a11c -> 46857a355
Change the fault members identifying way
When same host having more than one instance and if one instance goes
down fault member map contain the host name. It is a bug. It must be
unique for each instance. Change identifier to mamber_id witch unique
one in conf file
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/0c44d494
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/0c44d494
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/0c44d494
Branch: refs/heads/master
Commit: 0c44d4948ce93802490fa1ca0e80d3316361c29d
Parents: 3eb11a1
Author: sajithswa <sa...@gmail.com>
Authored: Tue Feb 17 21:27:45 2015 +0530
Committer: sajithswa <sa...@gmail.com>
Committed: Tue Feb 17 21:27:45 2015 +0530
----------------------------------------------------------------------
.../balancer/endpoint/TenantAwareLoadBalanceEndpoint.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/0c44d494/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/endpoint/TenantAwareLoadBalanceEndpoint.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/endpoint/TenantAwareLoadBalanceEndpoint.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/endpoint/TenantAwareLoadBalanceEndpoint.java
index 84e4cbe..8e41807 100644
--- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/endpoint/TenantAwareLoadBalanceEndpoint.java
+++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/endpoint/TenantAwareLoadBalanceEndpoint.java
@@ -801,10 +801,10 @@ public class TenantAwareLoadBalanceEndpoint extends org.apache.synapse.endpoints
private org.apache.axis2.clustering.Member currentMember;
private Endpoint currentEp;
private EndpointReference to;
- private Map<String, Boolean> faultyMembers;
+ private Map<String, Boolean> faultyMemberIds;
public TenantAwareLoadBalanceFaultHandler() {
- faultyMembers = new HashMap<String, Boolean>();
+ faultyMemberIds = new HashMap<String, Boolean>();
}
@Override
@@ -848,7 +848,7 @@ public class TenantAwareLoadBalanceEndpoint extends org.apache.synapse.endpoints
}
// Add current member to faulty members
- faultyMembers.put(currentMember.getHostName(), true);
+ faultyMemberIds.put(currentMember.getProperties().getProperty(LoadBalancerConstants.MEMBER_ID), true);
currentMember = findNextMember(synCtx);
if (currentMember == null) {
@@ -858,7 +858,7 @@ public class TenantAwareLoadBalanceEndpoint extends org.apache.synapse.endpoints
}
throwSynapseException(synCtx, 404, msg);
}
- if (faultyMembers.containsKey(currentMember.getHostName())) {
+ if (faultyMemberIds.containsKey(currentMember.getProperties().getProperty(LoadBalancerConstants.MEMBER_ID))) {
// This member has been identified as faulty previously. It implies that
// this request could not be served by any of the members in the cluster.
throwSynapseException(synCtx, 404, String.format("Requested resource could not be found"));
[2/2] stratos git commit: This closes #231 on GitHub
Posted by im...@apache.org.
This closes #231 on GitHub
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/46857a35
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/46857a35
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/46857a35
Branch: refs/heads/master
Commit: 46857a35562ab209c5f4653e8cc1cb829e72d232
Parents: 0c44d49
Author: Imesh Gunaratne <im...@apache.org>
Authored: Wed Feb 18 00:14:52 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Wed Feb 18 00:14:52 2015 +0530
----------------------------------------------------------------------
----------------------------------------------------------------------