accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject accumulo git commit: ACCUMULO-3497 Fix up kerberos ITs
Date Fri, 23 Jan 2015 20:38:03 GMT
Repository: accumulo
Updated Branches:
  refs/heads/master b0815affa -> 3db160922


ACCUMULO-3497 Fix up kerberos ITs


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3db16092
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3db16092
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3db16092

Branch: refs/heads/master
Commit: 3db1609222afe0a5bee3ef8e6031f90a1fb810fe
Parents: b0815af
Author: Josh Elser <elserj@apache.org>
Authored: Fri Jan 23 15:35:01 2015 -0500
Committer: Josh Elser <elserj@apache.org>
Committed: Fri Jan 23 15:37:29 2015 -0500

----------------------------------------------------------------------
 .../main/java/org/apache/accumulo/server/rpc/TServerUtils.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/3db16092/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java b/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java
index 4a93e67..70c874d 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java
@@ -396,7 +396,7 @@ public class TServerUtils {
     // ACCUMULO-3497 an easy sanity check we can perform for the user when SASL is enabled.
Clients and servers have to agree upon the FQDN
     // so that the SASL handshake can occur. If the provided hostname doesn't match the FQDN
for this host, fail quickly and inform them to update
     // their configuration.
-    if (!hostname.equals(fqdn)) {
+    if (!"0.0.0.0".equals(hostname) && !hostname.equals(fqdn)) {
       log.error(
           "Expected hostname of '{}' but got '{}'. Ensure the entries in the Accumulo hosts
files (e.g. masters, slaves) are the FQDN for each host when using SASL.",
           fqdn, hostname);
@@ -425,6 +425,7 @@ public class TServerUtils {
     if (address.getPort() == 0) {
       // If we chose a port dynamically, make a new use it (along with the proper hostname)
       address = HostAndPort.fromParts(address.getHostText(), transport.getServerSocket().getLocalPort());
+      log.info("SASL thrift server bound on {}", address);
     }
 
     ThreadPoolExecutor pool = createSelfResizingThreadPool(serverName, numThreads, numSTThreads,
timeBetweenThreadChecks);


Mime
View raw message