zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From iv...@apache.org
Subject svn commit: r1618737 - in /zookeeper/bookkeeper/trunk: ./ bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/ bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/ bookkeeper-server/src/main/java/org/apache/bookkeeper/net/ bookkeeper-se...
Date Mon, 18 Aug 2014 21:03:42 GMT
Author: ivank
Date: Mon Aug 18 21:03:41 2014
New Revision: 1618737

URL: http://svn.apache.org/r1618737
Log:
BOOKKEEPER-630: Add tag to o.a.b.net.* to indict which release of hadoop they came from, move
DNS to o.a.b.net.* and indent (sijie via ivank)

Change-Id: I9dd16912da6f23543d069434e9419495fdf8f314

Added:
    zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/DNS.java
Removed:
    zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/net/DNS.java
Modified:
    zookeeper/bookkeeper/trunk/CHANGES.txt
    zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java
    zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/ZkLedgerUnderreplicationManager.java
    zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/AbstractDNSToSwitchMapping.java
    zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/CachedDNSToSwitchMapping.java
    zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/DNSToSwitchMapping.java
    zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/NetUtils.java
    zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/NetworkTopology.java
    zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/Node.java
    zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/NodeBase.java
    zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/ScriptBasedMapping.java

Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1618737&r1=1618736&r2=1618737&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Mon Aug 18 21:03:41 2014
@@ -214,6 +214,8 @@ Trunk (unreleased changes)
 
         BOOKKEEPER-704: reconnectable zookeeper client wrapper (sijie via ivank)
 
+        BOOKKEEPER-630: Add tag to o.a.b.net.* to indict which release of hadoop they came
from, move DNS to o.a.b.net.* and indent (sijie via ivank)
+
       bookkeeper-benchmark:
 
         BOOKKEEPER-768: fix typo 'seconds' to milliseconds in benchmark output (jialin via
sijie)

Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java?rev=1618737&r1=1618736&r2=1618737&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java
(original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java
Mon Aug 18 21:03:41 2014
@@ -49,6 +49,7 @@ import org.apache.bookkeeper.jmx.BKMBean
 import org.apache.bookkeeper.meta.LedgerManager;
 import org.apache.bookkeeper.meta.LedgerManagerFactory;
 import org.apache.bookkeeper.net.BookieSocketAddress;
+import org.apache.bookkeeper.net.DNS;
 import org.apache.bookkeeper.proto.BookkeeperInternalCallbacks.WriteCallback;
 import org.apache.bookkeeper.stats.Counter;
 import org.apache.bookkeeper.stats.Gauge;
@@ -58,7 +59,6 @@ import org.apache.bookkeeper.util.BookKe
 import org.apache.bookkeeper.util.IOUtils;
 import org.apache.bookkeeper.util.MathUtils;
 import org.apache.bookkeeper.util.ZkUtils;
-import org.apache.bookkeeper.util.net.DNS;
 import org.apache.bookkeeper.zookeeper.ZooKeeperWatcherBase;
 import org.apache.commons.io.FileUtils;
 import org.apache.zookeeper.CreateMode;

Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/ZkLedgerUnderreplicationManager.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/ZkLedgerUnderreplicationManager.java?rev=1618737&r1=1618736&r2=1618737&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/ZkLedgerUnderreplicationManager.java
(original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/ZkLedgerUnderreplicationManager.java
Mon Aug 18 21:03:41 2014
@@ -18,12 +18,12 @@
 
 package org.apache.bookkeeper.meta;
 
+import org.apache.bookkeeper.net.DNS;
 import org.apache.bookkeeper.replication.ReplicationEnableCb;
 import org.apache.bookkeeper.replication.ReplicationException;
 import org.apache.bookkeeper.replication.ReplicationException.UnavailableException;
 import org.apache.bookkeeper.util.BookKeeperConstants;
 import org.apache.bookkeeper.util.ZkUtils;
-import org.apache.bookkeeper.util.net.DNS;
 
 import org.apache.bookkeeper.proto.BookkeeperInternalCallbacks.GenericCallback;
 import org.apache.bookkeeper.proto.DataFormats.LedgerRereplicationLayoutFormat;

Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/AbstractDNSToSwitchMapping.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/AbstractDNSToSwitchMapping.java?rev=1618737&r1=1618736&r2=1618737&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/AbstractDNSToSwitchMapping.java
(original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/AbstractDNSToSwitchMapping.java
Mon Aug 18 21:03:41 2014
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
+// This code has been copied from hadoop-common 0.23.1
 package org.apache.bookkeeper.net;
 
 import java.util.HashSet;

Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/CachedDNSToSwitchMapping.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/CachedDNSToSwitchMapping.java?rev=1618737&r1=1618736&r2=1618737&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/CachedDNSToSwitchMapping.java
(original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/CachedDNSToSwitchMapping.java
Mon Aug 18 21:03:41 2014
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+// This code has been copied from hadoop-common 0.23.1
 package org.apache.bookkeeper.net;
 
 import java.util.ArrayList;

Added: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/DNS.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/DNS.java?rev=1618737&view=auto
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/DNS.java
(added)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/DNS.java
Mon Aug 18 21:03:41 2014
@@ -0,0 +1,340 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+// This code has been copied from hadoop-common 2.0.4-alpha
+package org.apache.bookkeeper.net;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.net.UnknownHostException;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.LinkedHashSet;
+import java.util.Vector;
+
+import javax.naming.NamingException;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.InitialDirContext;
+
+/**
+ * A class that provides direct and reverse lookup functionalities, allowing
+ * the querying of specific network interfaces or nameservers.
+ */
+public class DNS {
+
+    private static final Logger LOG = LoggerFactory.getLogger(DNS.class);
+
+    /**
+     * The cached hostname -initially null.
+     */
+
+    private static final String cachedHostname = resolveLocalHostname();
+    private static final String cachedHostAddress = resolveLocalHostIPAddress();
+    private static final String LOCALHOST = "localhost";
+
+    /**
+     * Returns the hostname associated with the specified IP address by the
+     * provided nameserver.
+     * <p/>
+     * Loopback addresses
+     *
+     * @param hostIp The address to reverse lookup
+     * @param ns     The host name of a reachable DNS server
+     * @return The host name associated with the provided IP
+     * @throws NamingException If a NamingException is encountered
+     */
+    public static String reverseDns(InetAddress hostIp, String ns)
+            throws NamingException {
+        //
+        // Builds the reverse IP lookup form
+        // This is formed by reversing the IP numbers and appending in-addr.arpa
+        //
+        String[] parts = hostIp.getHostAddress().split("\\.");
+        String reverseIP = parts[3] + "." + parts[2] + "." + parts[1] + "."
+                + parts[0] + ".in-addr.arpa";
+
+        DirContext ictx = new InitialDirContext();
+        Attributes attribute;
+        try {
+            attribute = ictx.getAttributes("dns://"               // Use "dns:///" if the
default
+                    + ((ns == null) ? "" : ns) +
+                    // nameserver is to be used
+                    "/" + reverseIP, new String[]{"PTR"});
+        } finally {
+            ictx.close();
+        }
+
+        return attribute.get("PTR").get().toString();
+    }
+
+    /**
+     * @return NetworkInterface for the given subinterface name (eg eth0:0)
+     * or null if no interface with the given name can be found
+     */
+    private static NetworkInterface getSubinterface(String strInterface)
+            throws SocketException {
+        Enumeration<NetworkInterface> nifs =
+                NetworkInterface.getNetworkInterfaces();
+
+        while (nifs.hasMoreElements()) {
+            Enumeration<NetworkInterface> subNifs =
+                    nifs.nextElement().getSubInterfaces();
+
+            while (subNifs.hasMoreElements()) {
+                NetworkInterface nif = subNifs.nextElement();
+                if (nif.getName().equals(strInterface)) {
+                    return nif;
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * @param nif network interface to get addresses for
+     * @return set containing addresses for each subinterface of nif,
+     * see below for the rationale for using an ordered set
+     */
+    private static LinkedHashSet<InetAddress> getSubinterfaceInetAddrs(
+            NetworkInterface nif) {
+        LinkedHashSet<InetAddress> addrs = new LinkedHashSet<InetAddress>();
+        Enumeration<NetworkInterface> subNifs = nif.getSubInterfaces();
+        while (subNifs.hasMoreElements()) {
+            NetworkInterface subNif = subNifs.nextElement();
+            addrs.addAll(Collections.list(subNif.getInetAddresses()));
+        }
+        return addrs;
+    }
+
+    /**
+     * Like {@link DNS#getIPs(String, boolean), but returns all
+     * IPs associated with the given interface and its subinterfaces.
+     */
+    public static String[] getIPs(String strInterface)
+            throws UnknownHostException {
+        return getIPs(strInterface, true);
+    }
+
+    /**
+     * Returns all the IPs associated with the provided interface, if any, in
+     * textual form.
+     *
+     * @param strInterface        The name of the network interface or sub-interface to query
+     *                            (eg eth0 or eth0:0) or the string "default"
+     * @param returnSubinterfaces Whether to return IPs associated with subinterfaces of
+     *                            the given interface
+     * @return A string vector of all the IPs associated with the provided
+     * interface. The local host IP is returned if the interface
+     * name "default" is specified or there is an I/O error looking
+     * for the given interface.
+     * @throws UnknownHostException If the given interface is invalid
+     */
+    public static String[] getIPs(String strInterface,
+                                  boolean returnSubinterfaces) throws UnknownHostException
{
+        if ("default".equals(strInterface)) {
+            return new String[]{cachedHostAddress};
+        }
+        NetworkInterface netIf;
+        try {
+            netIf = NetworkInterface.getByName(strInterface);
+            if (netIf == null) {
+                netIf = getSubinterface(strInterface);
+            }
+        } catch (SocketException e) {
+            LOG.warn("I/O error finding interface " + strInterface +
+                    ": " + e.getMessage());
+            return new String[]{cachedHostAddress};
+        }
+        if (netIf == null) {
+            throw new UnknownHostException("No such interface " + strInterface);
+        }
+
+        // NB: Using a LinkedHashSet to preserve the order for callers
+        // that depend on a particular element being 1st in the array.
+        // For example, getDefaultIP always returns the first element.
+        LinkedHashSet<InetAddress> allAddrs = new LinkedHashSet<InetAddress>();
+        allAddrs.addAll(Collections.list(netIf.getInetAddresses()));
+        if (!returnSubinterfaces) {
+            allAddrs.removeAll(getSubinterfaceInetAddrs(netIf));
+        }
+
+        String ips[] = new String[allAddrs.size()];
+        int i = 0;
+        for (InetAddress addr : allAddrs) {
+            ips[i++] = addr.getHostAddress();
+        }
+        return ips;
+    }
+
+
+    /**
+     * Returns the first available IP address associated with the provided
+     * network interface or the local host IP if "default" is given.
+     *
+     * @param strInterface The name of the network interface or subinterface to query
+     *                     (e.g. eth0 or eth0:0) or the string "default"
+     * @return The IP address in text form, the local host IP is returned
+     * if the interface name "default" is specified
+     * @throws UnknownHostException If the given interface is invalid
+     */
+    public static String getDefaultIP(String strInterface)
+            throws UnknownHostException {
+        String[] ips = getIPs(strInterface);
+        return ips[0];
+    }
+
+    /**
+     * Returns all the host names associated by the provided nameserver with the
+     * address bound to the specified network interface
+     *
+     * @param strInterface The name of the network interface or subinterface to query
+     *                     (e.g. eth0 or eth0:0)
+     * @param nameserver   The DNS host name
+     * @return A string vector of all host names associated with the IPs tied to
+     * the specified interface
+     * @throws UnknownHostException if the given interface is invalid
+     */
+    public static String[] getHosts(String strInterface, String nameserver)
+            throws UnknownHostException {
+        String[] ips = getIPs(strInterface);
+        Vector<String> hosts = new Vector<String>();
+        for (int ctr = 0; ctr < ips.length; ctr++) {
+            try {
+                hosts.add(reverseDns(InetAddress.getByName(ips[ctr]),
+                        nameserver));
+            } catch (UnknownHostException ignored) {
+            } catch (NamingException ignored) {
+            }
+        }
+        if (hosts.isEmpty()) {
+            LOG.warn("Unable to determine hostname for interface " + strInterface);
+            return new String[]{cachedHostname};
+        } else {
+            return hosts.toArray(new String[hosts.size()]);
+        }
+    }
+
+
+    /**
+     * Determine the local hostname; retrieving it from cache if it is known
+     * If we cannot determine our host name, return "localhost"
+     *
+     * @return the local hostname or "localhost"
+     */
+    private static String resolveLocalHostname() {
+        String localhost;
+        try {
+            localhost = InetAddress.getLocalHost().getCanonicalHostName();
+        } catch (UnknownHostException e) {
+            LOG.warn("Unable to determine local hostname "
+                    + "-falling back to \"" + LOCALHOST + "\"", e);
+            localhost = LOCALHOST;
+        }
+        return localhost;
+    }
+
+
+    /**
+     * Get the IPAddress of the local host as a string.
+     * This will be a loop back value if the local host address cannot be
+     * determined.
+     * If the loopback address of "localhost" does not resolve, then the system's
+     * network is in such a state that nothing is going to work. A message is
+     * logged at the error level and a null pointer returned, a pointer
+     * which will trigger failures later on the application
+     *
+     * @return the IPAddress of the local host or null for a serious problem.
+     */
+    private static String resolveLocalHostIPAddress() {
+        String address;
+        try {
+            address = InetAddress.getLocalHost().getHostAddress();
+        } catch (UnknownHostException e) {
+            LOG.warn("Unable to determine address of the host"
+                    + "-falling back to \"" + LOCALHOST + "\" address", e);
+            try {
+                address = InetAddress.getByName(LOCALHOST).getHostAddress();
+            } catch (UnknownHostException noLocalHostAddressException) {
+                //at this point, deep trouble
+                LOG.error("Unable to determine local loopback address "
+                        + "of \"" + LOCALHOST + "\" " +
+                        "-this system's network configuration is unsupported", e);
+                address = null;
+            }
+        }
+        return address;
+    }
+
+    /**
+     * Returns all the host names associated by the default nameserver with the
+     * address bound to the specified network interface
+     *
+     * @param strInterface The name of the network interface to query (e.g. eth0)
+     * @return The list of host names associated with IPs bound to the network
+     * interface
+     * @throws UnknownHostException If one is encountered while querying the default interface
+     */
+    public static String[] getHosts(String strInterface)
+            throws UnknownHostException {
+        return getHosts(strInterface, null);
+    }
+
+    /**
+     * Returns the default (first) host name associated by the provided
+     * nameserver with the address bound to the specified network interface
+     *
+     * @param strInterface The name of the network interface to query (e.g. eth0)
+     * @param nameserver   The DNS host name
+     * @return The default host names associated with IPs bound to the network
+     * interface
+     * @throws UnknownHostException If one is encountered while querying the default interface
+     */
+    public static String getDefaultHost(String strInterface, String nameserver)
+            throws UnknownHostException {
+        if ("default".equals(strInterface)) {
+            return cachedHostname;
+        }
+
+        if ("default".equals(nameserver)) {
+            return getDefaultHost(strInterface);
+        }
+
+        String[] hosts = getHosts(strInterface, nameserver);
+        return hosts[0];
+    }
+
+    /**
+     * Returns the default (first) host name associated by the default
+     * nameserver with the address bound to the specified network interface
+     *
+     * @param strInterface The name of the network interface to query (e.g. eth0).
+     *                     Must not be null.
+     * @return The default host name associated with IPs bound to the network
+     * interface
+     * @throws UnknownHostException If one is encountered while querying the default interface
+     */
+    public static String getDefaultHost(String strInterface)
+            throws UnknownHostException {
+        return getDefaultHost(strInterface, null);
+    }
+
+}

Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/DNSToSwitchMapping.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/DNSToSwitchMapping.java?rev=1618737&r1=1618736&r2=1618737&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/DNSToSwitchMapping.java
(original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/DNSToSwitchMapping.java
Mon Aug 18 21:03:41 2014
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+// This code has been copied from hadoop-common 0.23.1
 package org.apache.bookkeeper.net;
 
 import java.util.List;

Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/NetUtils.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/NetUtils.java?rev=1618737&r1=1618736&r2=1618737&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/NetUtils.java
(original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/NetUtils.java
Mon Aug 18 21:03:41 2014
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+// This code has been copied from hadoop-common 0.23.1
 package org.apache.bookkeeper.net;
 
 import java.net.InetAddress;

Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/NetworkTopology.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/NetworkTopology.java?rev=1618737&r1=1618736&r2=1618737&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/NetworkTopology.java
(original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/NetworkTopology.java
Mon Aug 18 21:03:41 2014
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+// This code has been copied from hadoop-common 0.23.1
 package org.apache.bookkeeper.net;
 
 import java.util.ArrayList;

Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/Node.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/Node.java?rev=1618737&r1=1618736&r2=1618737&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/Node.java
(original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/Node.java
Mon Aug 18 21:03:41 2014
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+// This code has been copied from hadoop-common 0.23.1
 package org.apache.bookkeeper.net;
 
 import com.google.common.annotations.Beta;

Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/NodeBase.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/NodeBase.java?rev=1618737&r1=1618736&r2=1618737&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/NodeBase.java
(original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/NodeBase.java
Mon Aug 18 21:03:41 2014
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+// This code has been copied from hadoop-common 0.23.1
 package org.apache.bookkeeper.net;
 
 /** A base class that implements interface Node

Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/ScriptBasedMapping.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/ScriptBasedMapping.java?rev=1618737&r1=1618736&r2=1618737&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/ScriptBasedMapping.java
(original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/ScriptBasedMapping.java
Mon Aug 18 21:03:41 2014
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
+// This code has been copied from hadoop-common 0.23.1
 package org.apache.bookkeeper.net;
 
 import java.io.File;



Mime
View raw message