You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bookkeeper.apache.org by si...@apache.org on 2020/08/13 08:39:51 UTC

[bookkeeper] branch master updated: NP check for print BookieSocketAddress and a better format

This is an automated email from the ASF dual-hosted git repository.

sijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git


The following commit(s) were added to refs/heads/master by this push:
     new d1dac6b  NP check for print BookieSocketAddress and a better format
d1dac6b is described below

commit d1dac6b9f34ca7e27698914c1c336770d3743333
Author: Rudy Steiner <ru...@163.com>
AuthorDate: Thu Aug 13 16:39:44 2020 +0800

    NP check for print BookieSocketAddress and a better format
    
    Descriptions of the changes in this PR:
    
    
    
    ### Motivation
    
    NP check for print BookieSocketAddress and a better format to fix issues #2376 and #2371
    
    ### Changes
    * NP check for print BookieSocketAddress on listbookies command
    * A better format mentioned on #2376
    
    Master Issue: #2376 #2371
    
    
    
    
    Reviewers: Enrico Olivelli <eo...@gmail.com>, Sijie Guo <None>, Rajan Dhabalia <rd...@apache.org>
    
    This closes #2380 from rudy2steiner/list_bookie
---
 .../tools/cli/helpers/CommandHelpers.java          | 39 +++++++++++++++-------
 .../commands/bookies/ListBookiesCommandTest.java   | 15 +++++++--
 2 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/tools/cli/helpers/CommandHelpers.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/tools/cli/helpers/CommandHelpers.java
index 88ac52e..a1dc1ab 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/tools/cli/helpers/CommandHelpers.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/tools/cli/helpers/CommandHelpers.java
@@ -19,35 +19,50 @@
 package org.apache.bookkeeper.tools.cli.helpers;
 
 import com.google.common.net.InetAddresses;
+import java.net.InetAddress;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import org.apache.bookkeeper.net.BookieSocketAddress;
 
+
 /**
  * Helper classes used by the cli commands.
  */
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class CommandHelpers {
 
+    private  static final String UNKNOWN = "UNKNOWN";
     /*
      * The string returned is of the form:
-     * 'hostname'('otherformofhostname'):'port number'
-     *
-     * where hostname and otherformofhostname are ipaddress and
-     * canonicalhostname or viceversa
+     * BookieID:bookieId, IP:ip, Port: port, Hostname: hostname
+     * When using hostname as bookie id, it's possible that the host is no longer valid and
+     * can't get a ip from the hostname, so using UNKNOWN to indicate ip is unknown for the hostname
      */
     public static String getBookieSocketAddrStringRepresentation(BookieSocketAddress bookieId) {
         String hostname = bookieId.getHostName();
-        boolean isHostNameIpAddress = InetAddresses.isInetAddress(hostname);
-        String otherFormOfHostname = null;
-        if (isHostNameIpAddress) {
-            otherFormOfHostname = bookieId.getSocketAddress().getAddress().getCanonicalHostName();
+        String bookieID = bookieId.toString();
+        String realHostname;
+        String ip = null;
+        if (InetAddresses.isInetAddress(hostname)){
+            ip = hostname;
+            realHostname = bookieId.getSocketAddress().getAddress().getCanonicalHostName();
         } else {
-            otherFormOfHostname = bookieId.getSocketAddress().getAddress().getHostAddress();
+           InetAddress ia = bookieId.getSocketAddress().getAddress();
+           if (null != ia){
+              ip = ia.getHostAddress();
+           } else {
+              ip = UNKNOWN;
+           }
+           realHostname = hostname;
         }
-        String bookieSocketAddrStringRepresentation = hostname + "(" + otherFormOfHostname + ")" + ":"
-                + bookieId.getSocketAddress().getPort();
-        return bookieSocketAddrStringRepresentation;
+        return formatBookieSocketAddress(bookieID, ip, bookieId.getPort(), realHostname);
+    }
+
+    /**
+     * Format {@link BookieSocketAddress}.
+     **/
+    public static String formatBookieSocketAddress(String bookieId, String ip, int port, String hostName){
+       return String.format("BookieID:%s, IP:%s, Port:%d, Hostname:%s", bookieId, ip, port, hostName);
     }
 
 }
diff --git a/tools/ledger/src/test/java/org/apache/bookkeeper/tools/cli/commands/bookies/ListBookiesCommandTest.java b/tools/ledger/src/test/java/org/apache/bookkeeper/tools/cli/commands/bookies/ListBookiesCommandTest.java
index 9bd68a1..5f394e1 100644
--- a/tools/ledger/src/test/java/org/apache/bookkeeper/tools/cli/commands/bookies/ListBookiesCommandTest.java
+++ b/tools/ledger/src/test/java/org/apache/bookkeeper/tools/cli/commands/bookies/ListBookiesCommandTest.java
@@ -94,9 +94,12 @@ public class ListBookiesCommandTest extends DiscoveryCommandTestBase {
 
     private static Set<BookieSocketAddress> createBookies(int startPort, int numBookies) {
         Set<BookieSocketAddress> bookies = new TreeSet<>(new BookieAddressComparator());
-        for (int i = 0; i < numBookies; i++) {
+        int i = 0;
+        for (; i < numBookies - 1; i++) {
             bookies.add(new BookieSocketAddress("127.0.0.1", startPort + i));
         }
+        // mix an unknown hostname bookieId
+        bookies.add(new BookieSocketAddress("unknown", startPort + i));
         return bookies;
     }
 
@@ -105,8 +108,14 @@ public class ListBookiesCommandTest extends DiscoveryCommandTestBase {
             PowerMockito.verifyStatic(
                 CommandHelpers.class,
                 times(numCalls));
-            CommandHelpers.getBookieSocketAddrStringRepresentation(
-                eq(new BookieSocketAddress("127.0.0.1", startPort + 1)));
+            if (i == numBookies - 1){
+                CommandHelpers.getBookieSocketAddrStringRepresentation(
+                        eq(new BookieSocketAddress("unknown", startPort + i)));
+            } else {
+                CommandHelpers.getBookieSocketAddrStringRepresentation(
+                        eq(new BookieSocketAddress("127.0.0.1", startPort + i)));
+            }
+
         }
     }