svn commit: r1849113 - in /tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud: CloudMembershipProvider.java DNSMembershipProvider.java KubernetesMembershipProvider.java

[remm]

Author: remm
Date: Mon Dec 17 17:26:52 2018
New Revision: 1849113

URL: http://svn.apache.org/viewvc?rev=1849113&view=rev
Log:
Use ip rather than name to match the local member.

Modified:
    
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java
    
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java
    
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java?rev=1849113&r1=1849112&r2=1849113&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java
 Mon Dec 17 17:26:52 2018
@@ -52,8 +52,8 @@ public abstract class CloudMembershipPro
 
     protected Map<String, String> headers = new HashMap<>();
 
+    protected String localIp;
     protected int port;
-    protected String hostName;
 
     protected long expirationTime = 5000;
 
@@ -87,7 +87,7 @@ public abstract class CloudMembershipPro
         connectionTimeout = 
Integer.parseInt(properties.getProperty("connectionTimeout", "1000"));
         readTimeout = Integer.parseInt(properties.getProperty("readTimeout", 
"1000"));
 
-        hostName = InetAddress.getLocalHost().getHostName();
+        localIp = InetAddress.getLocalHost().getHostAddress();
         port = Integer.parseInt(properties.getProperty("tcpListenPort"));
 
         expirationTime = 
Long.parseLong(properties.getProperty("expirationTime", "5000"));

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java?rev=1849113&r1=1849112&r2=1849113&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java
 Mon Dec 17 17:26:52 2018
@@ -80,7 +80,7 @@ public class DNSMembershipProvider exten
                 String ip = inetAddress.getHostAddress();
                 byte[] id = md5.digest(ip.getBytes());
                 // We found ourselves, ignore
-                if (inetAddress.getHostName().equals(hostName)) {
+                if (localIp.equals(ip)) {
                     // Update the UID on initial lookup
                     Member localMember = service.getLocalMember(false);
                     if (localMember.getUniqueId() == 
CloudMembershipService.INITIAL_ID && localMember instanceof MemberImpl) {

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java?rev=1849113&r1=1849112&r2=1849113&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java
 Mon Dec 17 17:26:52 2018
@@ -174,7 +174,6 @@ public class KubernetesMembershipProvide
                     
log.warn(sm.getString("kubernetesMembershipProvider.invalidPod"));
                     continue;
                 }
-                String name = nameObject.toString();
                 Object objectUid = metadata.get("uid");
                 Object creationTimestampObject = 
metadata.get("creationTimestamp");
                 if (creationTimestampObject == null) {
@@ -201,7 +200,7 @@ public class KubernetesMembershipProvide
                 String uid = (objectUid == null) ? podIP : 
objectUid.toString();
 
                 // We found ourselves, ignore
-                if (name.equals(hostName)) {
+                if (localIp.equals(podIP)) {
                     // Update the UID on initial lookup
                     Member localMember = service.getLocalMember(false);
                     if (localMember.getUniqueId() == 
CloudMembershipService.INITIAL_ID && localMember instanceof MemberImpl) {



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org