Author: thejas
Date: Sun Sep 28 17:44:01 2014
New Revision: 1628091
URL: http://svn.apache.org/r1628091
Log:
HIVE-8277 : IP address string in HS2, metastore have a "/" prefix (Thejas Nair,
reviewed by Vaibhav Gumashta)
Modified:
hive/branches/branch-0.14/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStoreIpAddress.java
hive/branches/branch-0.14/itests/hive-unit/src/test/java/org/apache/hive/jdbc/authorization/TestHS2AuthzContext.java
hive/branches/branch-0.14/metastore/src/java/org/apache/hadoop/hive/metastore/TSetIpAddressProcessor.java
hive/branches/branch-0.14/metastore/src/test/org/apache/hadoop/hive/metastore/IpAddressListener.java
hive/branches/branch-0.14/service/src/java/org/apache/hive/service/auth/TSetIpAddressProcessor.java
Modified:
hive/branches/branch-0.14/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStoreIpAddress.java
URL:
http://svn.apache.org/viewvc/hive/branches/branch-0.14/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStoreIpAddress.java?rev=1628091&r1=1628090&r2=1628091&view=diff
==============================================================================
---
hive/branches/branch-0.14/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStoreIpAddress.java
(original)
+++
hive/branches/branch-0.14/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStoreIpAddress.java
Sun Sep 28 17:44:01 2014
@@ -21,6 +21,7 @@ package org.apache.hadoop.hive.metastore
import junit.framework.TestCase;
import org.apache.hadoop.hive.conf.HiveConf;
+import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
import org.apache.hadoop.hive.metastore.api.Database;
import org.apache.hadoop.hive.shims.ShimLoader;
import org.apache.hadoop.util.StringUtils;
@@ -49,6 +50,8 @@ public class TestRemoteHiveMetaStoreIpAd
int port = MetaStoreUtils.findFreePort();
System.out.println("Starting MetaStore Server on port " + port);
+ System.setProperty(ConfVars.METASTORE_EVENT_LISTENERS.varname,
+ IpAddressListener.class.getName());
MetaStoreUtils.startMetaStore(port,
ShimLoader.getHadoopThriftAuthBridge());
isServerStarted = true;
Modified:
hive/branches/branch-0.14/itests/hive-unit/src/test/java/org/apache/hive/jdbc/authorization/TestHS2AuthzContext.java
URL:
http://svn.apache.org/viewvc/hive/branches/branch-0.14/itests/hive-unit/src/test/java/org/apache/hive/jdbc/authorization/TestHS2AuthzContext.java?rev=1628091&r1=1628090&r2=1628091&view=diff
==============================================================================
---
hive/branches/branch-0.14/itests/hive-unit/src/test/java/org/apache/hive/jdbc/authorization/TestHS2AuthzContext.java
(original)
+++
hive/branches/branch-0.14/itests/hive-unit/src/test/java/org/apache/hive/jdbc/authorization/TestHS2AuthzContext.java
Sun Sep 28 17:44:01 2014
@@ -120,9 +120,10 @@ public class TestHS2AuthzContext {
HiveAuthzContext context = contextCapturer.getValue();
assertEquals("Command ", ctxCmd, context.getCommandString());
- assertTrue("ip address pattern check",
context.getIpAddress().contains("."));
+ assertTrue("ip address pattern check",
context.getIpAddress().matches("[.:a-fA-F0-9]+"));
// ip address size check - check for something better than non zero
assertTrue("ip address size check", context.getIpAddress().length() > 7);
+
}
private Connection getConnection(String userName) throws SQLException {
Modified:
hive/branches/branch-0.14/metastore/src/java/org/apache/hadoop/hive/metastore/TSetIpAddressProcessor.java
URL:
http://svn.apache.org/viewvc/hive/branches/branch-0.14/metastore/src/java/org/apache/hadoop/hive/metastore/TSetIpAddressProcessor.java?rev=1628091&r1=1628090&r2=1628091&view=diff
==============================================================================
---
hive/branches/branch-0.14/metastore/src/java/org/apache/hadoop/hive/metastore/TSetIpAddressProcessor.java
(original)
+++
hive/branches/branch-0.14/metastore/src/java/org/apache/hadoop/hive/metastore/TSetIpAddressProcessor.java
Sun Sep 28 17:44:01 2014
@@ -57,6 +57,6 @@ public class TSetIpAddressProcessor<I ex
}
protected void setIpAddress(final Socket inSocket) {
- HMSHandler.setIpAddress(inSocket.getInetAddress().toString());
+ HMSHandler.setIpAddress(inSocket.getInetAddress().getHostAddress());
}
}
Modified:
hive/branches/branch-0.14/metastore/src/test/org/apache/hadoop/hive/metastore/IpAddressListener.java
URL:
http://svn.apache.org/viewvc/hive/branches/branch-0.14/metastore/src/test/org/apache/hadoop/hive/metastore/IpAddressListener.java?rev=1628091&r1=1628090&r2=1628091&view=diff
==============================================================================
---
hive/branches/branch-0.14/metastore/src/test/org/apache/hadoop/hive/metastore/IpAddressListener.java
(original)
+++
hive/branches/branch-0.14/metastore/src/test/org/apache/hadoop/hive/metastore/IpAddressListener.java
Sun Sep 28 17:44:01 2014
@@ -47,15 +47,10 @@ public class IpAddressListener extends M
super(config);
}
- private String getIpFromInetAddress(String addr) {
- return addr.substring(addr.indexOf('/') + 1);
- }
-
private void checkIpAddress() {
try {
- String localhostIp = InetAddress.getByName(LOCAL_HOST).toString();
- Assert.assertEquals(getIpFromInetAddress(localhostIp),
- getIpFromInetAddress(HMSHandler.getIpAddress()));
+ String localhostIp = InetAddress.getByName(LOCAL_HOST).getHostAddress();
+ Assert.assertEquals(localhostIp, HMSHandler.getIpAddress());
} catch (UnknownHostException e) {
Assert.assertTrue("InetAddress.getLocalHost threw an exception: " +
e.getMessage(), false);
}
Modified:
hive/branches/branch-0.14/service/src/java/org/apache/hive/service/auth/TSetIpAddressProcessor.java
URL:
http://svn.apache.org/viewvc/hive/branches/branch-0.14/service/src/java/org/apache/hive/service/auth/TSetIpAddressProcessor.java?rev=1628091&r1=1628090&r2=1628091&view=diff
==============================================================================
---
hive/branches/branch-0.14/service/src/java/org/apache/hive/service/auth/TSetIpAddressProcessor.java
(original)
+++
hive/branches/branch-0.14/service/src/java/org/apache/hive/service/auth/TSetIpAddressProcessor.java
Sun Sep 28 17:44:01 2014
@@ -75,7 +75,7 @@ public class TSetIpAddressProcessor<I ex
if (tSocket == null) {
LOGGER.warn("Unknown Transport, cannot determine ipAddress");
} else {
-
THREAD_LOCAL_IP_ADDRESS.set(tSocket.getSocket().getInetAddress().toString());
+
THREAD_LOCAL_IP_ADDRESS.set(tSocket.getSocket().getInetAddress().getHostAddress());
}
}
