You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by az...@apache.org on 2008/10/25 19:09:28 UTC
svn commit: r707866 - in
/webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering:
control/wka/ tribes/
Author: azeez
Date: Sat Oct 25 10:09:28 2008
New Revision: 707866
URL: http://svn.apache.org/viewvc?rev=707866&view=rev
Log:
ACTIVE/PASSIVE setting seems to have broken WKA based membership on EC2. Removing some parts of this impl which is breaking the WKA on EC2 feature.
Modified:
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/control/wka/MemberJoinedCommand.java
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/control/wka/RpcMembershipRequestHandler.java
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/MembershipManager.java
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesMembershipListener.java
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/WkaBasedMembershipScheme.java
Modified: webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/control/wka/MemberJoinedCommand.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/control/wka/MemberJoinedCommand.java?rev=707866&r1=707865&r2=707866&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/control/wka/MemberJoinedCommand.java (original)
+++ webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/control/wka/MemberJoinedCommand.java Sat Oct 25 10:09:28 2008
@@ -52,4 +52,8 @@
membershipManager.memberAdded(member);
}
}
+
+ public String toString() {
+ return "MemberJoinedCommand: " + member;
+ }
}
Modified: webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/control/wka/RpcMembershipRequestHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/control/wka/RpcMembershipRequestHandler.java?rev=707866&r1=707865&r2=707866&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/control/wka/RpcMembershipRequestHandler.java (original)
+++ webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/control/wka/RpcMembershipRequestHandler.java Sat Oct 25 10:09:28 2008
@@ -74,6 +74,9 @@
} else if (msg instanceof MemberJoinedCommand) {
log.info("Received MEMBER_JOINED message from " + TribesUtil.getName(sender));
MemberJoinedCommand command = (MemberJoinedCommand) msg;
+ if(log.isDebugEnabled()){
+ log.debug(command);
+ }
try {
command.setMembershipManager(membershipManager);
Modified: webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/MembershipManager.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/MembershipManager.java?rev=707866&r1=707865&r2=707866&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/MembershipManager.java (original)
+++ webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/MembershipManager.java Sat Oct 25 10:09:28 2008
@@ -127,6 +127,11 @@
*/
public synchronized boolean memberAdded(Member member) {
+ if(log.isDebugEnabled()){
+ log.debug("members.contains(member) =" + members.contains(member) );
+ log.debug("Is in my domain: " + TribesUtil.isInDomain(member, domain));
+ }
+
// If this member already exists or if the member belongs to another domain,
// there is no need to add it
if (members.contains(member) || !TribesUtil.isInDomain(member, domain)) {
Modified: webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesMembershipListener.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesMembershipListener.java?rev=707866&r1=707865&r2=707866&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesMembershipListener.java (original)
+++ webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesMembershipListener.java Sat Oct 25 10:09:28 2008
@@ -39,15 +39,18 @@
public void memberAdded(Member member) {
if (membershipManager.memberAdded(member)) {
log.info("New member " + TribesUtil.getName(member) + " joined cluster.");
- if (TribesUtil.toAxis2Member(member).isActive()) {
+ /*if (TribesUtil.toAxis2Member(member).isActive()) {
} else {
- }
+ }*/
}
// System.err.println("++++++ IS COORD="+TribesClusterManager.nbc.isCoordinator());
}
public void memberDisappeared(Member member) {
log.info("Member " + TribesUtil.getName(member) + " left cluster");
+ membershipManager.memberDisappeared(member);
+
// System.err.println("++++++ IS COORD="+TribesClusterManager.nbc.isCoordinator());
+
}
}
Modified: webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/WkaBasedMembershipScheme.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/WkaBasedMembershipScheme.java?rev=707866&r1=707865&r2=707866&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/WkaBasedMembershipScheme.java (original)
+++ webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/WkaBasedMembershipScheme.java Sat Oct 25 10:09:28 2008
@@ -306,7 +306,7 @@
}
// Add the NonBlockingCoordinator.
- channel.addInterceptor(new Axis2Coordinator(membershipListener));
+// channel.addInterceptor(new Axis2Coordinator(membershipListener));
staticMembershipInterceptor = new StaticMembershipInterceptor();
staticMembershipInterceptor.setLocalMember(primaryMembershipManager.getLocalMember());