From dev-return-194132-archive-asf-public=cust-asf.ponee.io@tomcat.apache.org Tue Oct 16 07:37:25 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 518B2180649 for ; Tue, 16 Oct 2018 07:37:25 +0200 (CEST) Received: (qmail 80539 invoked by uid 500); 16 Oct 2018 05:37:23 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 80529 invoked by uid 99); 16 Oct 2018 05:37:23 -0000 Received: from mail-relay.apache.org (HELO mailrelay2-lw-us.apache.org) (207.244.88.137) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Oct 2018 05:37:23 +0000 Received: from mail-oi1-f180.google.com (mail-oi1-f180.google.com [209.85.167.180]) by mailrelay2-lw-us.apache.org (ASF Mail Server at mailrelay2-lw-us.apache.org) with ESMTPSA id D4CF0A3C for ; Tue, 16 Oct 2018 05:37:22 +0000 (UTC) Received: by mail-oi1-f180.google.com with SMTP id u197-v6so17016761oif.5 for ; Mon, 15 Oct 2018 22:37:22 -0700 (PDT) X-Gm-Message-State: ABuFfogWFmmSvH7eZGQeIjqbkNRTxJKWzmkCXdC0DJw07kJcz6q+5f4b P74PkaaRrCw+kzH9T3W5jKcPUjZqRMV0e5G5Rw8= X-Google-Smtp-Source: ACcGV60+/Bs7A2qpwBYVo8b8gdOOk0kVJunNLNCf+h8Bi+RkDnizzkj/wsNovajsA5pHrY4eVmcXtItUhea5144RIJw= X-Received: by 2002:a54:4516:: with SMTP id l22-v6mr11172540oil.0.1539668242338; Mon, 15 Oct 2018 22:37:22 -0700 (PDT) MIME-Version: 1.0 References: <20181015083927.E7E463A143A@svn01-us-west.apache.org> In-Reply-To: <20181015083927.E7E463A143A@svn01-us-west.apache.org> From: Keiichi Fujino Date: Tue, 16 Oct 2018 14:37:13 +0900 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r1843886 - in /tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud: CloudMembershipService.java KubernetesMembershipProvider.java To: Tomcat Developers List Content-Type: multipart/alternative; boundary="000000000000a82eaa057851f236" --000000000000a82eaa057851f236 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 2018=E5=B9=B410=E6=9C=8815=E6=97=A5(=E6=9C=88) 17:39 : > Author: remm > Date: Mon Oct 15 08:39:26 2018 > New Revision: 1843886 > > URL: http://svn.apache.org/viewvc?rev=3D1843886&view=3Drev > Log: > Try to get the member uid from the cloud, it seems more appropriate > overall. > > Modified: > > tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMember= shipService.java > > tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/KubernetesM= embershipProvider.java > > Modified: > tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMember= shipService.java > URL: > http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes= /membership/cloud/CloudMembershipService.java?rev=3D1843886&r1=3D1843885&r2= =3D1843886&view=3Ddiff > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- > tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMember= shipService.java > (original) > +++ > tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMember= shipService.java > Mon Oct 15 08:39:26 2018 > @@ -18,9 +18,6 @@ > package org.apache.catalina.tribes.membership.cloud; > > import java.io.IOException; > -import java.net.InetAddress; > -import java.security.MessageDigest; > -import java.security.NoSuchAlgorithmException; > > import javax.management.ObjectName; > > @@ -42,6 +39,7 @@ public class CloudMembershipService exte > public static final String MEMBERSHIP_PROVIDER_CLASS_NAME =3D > "membershipProviderClassName"; > private static final String KUBE =3D "kubernetes"; > private static final String KUBE_PROVIDER_CLASS =3D > "org.apache.catalina.tribes.membership.cloud.KubernetesMembershipProvider= "; > + static final byte[] INITIAL_ID =3D new byte[16]; > > private MembershipProvider membershipProvider; > private MemberImpl localMember; > @@ -173,13 +171,7 @@ public class CloudMembershipService exte > > if (localMember =3D=3D null) { > localMember =3D new MemberImpl(); > - try { > - // Set localMember unique ID to md5 hash of hostname > - localMember.setUniqueId(MessageDigest.getInstance("md5") > - > .digest(InetAddress.getLocalHost().getHostName().getBytes())); > - } catch (NoSuchAlgorithmException e) { > - throw new IOException(e); > - } > + localMember.setUniqueId(INITIAL_ID); > localMember.setLocal(true); > } > localMember.setHostname(host); > > Modified: > tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/KubernetesM= embershipProvider.java > URL: > http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes= /membership/cloud/KubernetesMembershipProvider.java?rev=3D1843886&r1=3D1843= 885&r2=3D1843886&view=3Ddiff > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- > tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/KubernetesM= embershipProvider.java > (original) > +++ > tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/KubernetesM= embershipProvider.java > Mon Oct 15 08:39:26 2018 > @@ -203,10 +203,15 @@ public class KubernetesMembershipProvide > > // We found ourselves, ignore > if (name.equals(hostName)) { > + // Update the UID on initial lookup > + Member localMember =3D service.getLocalMember(false)= ; > + if (localMember.getUniqueId() =3D=3D > CloudMembershipService.INITIAL_ID && localMember instanceof MemberImpl) { > + byte[] id =3D > md5.digest(uid.getBytes(StandardCharsets.US_ASCII)); > + ((MemberImpl) localMember).setUniqueId(id); > + } > continue; > } > > - byte[] id =3D > md5.digest(uid.getBytes(StandardCharsets.US_ASCII)); > long aliveTime =3D > Duration.between(Instant.parse(creationTimestamp), startTime).getSeconds(= ) > * 1000; // aliveTime is in ms > > MemberImpl member =3D null; > @@ -218,6 +223,7 @@ public class KubernetesMembershipProvide > > log.error(sm.getString("kubernetesMembershipProvider.memberError"), e); > continue; > } > + byte[] id =3D > md5.digest(uid.getBytes(StandardCharsets.US_ASCII)); > member.setUniqueId(id); > members.add(member); > } > > > > Thanks for the fix. Is this uniqueId 16 bytes? The uniqueId should be 16 bytes in channel Specs. > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org > For additional commands, e-mail: dev-help@tomcat.apache.org > > -- > Keiichi.Fujino > --000000000000a82eaa057851f236--