Skip to content

HIVE-21456: Thrift over Http for Hive Metastore #3105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yongzhi merged 9 commits into from
Apr 20, 2022
Merged

HIVE-21456: Thrift over Http for Hive Metastore #3105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6d417df
[WIP]HIVE-21456: Thrift over Http for Hive Metastore
Mar 14, 2022
b725c00
Addresses review comments. Also fixes build failure
Mar 22, 2022
dfb91fc
fixes test failures
Mar 23, 2022
56aed79
Refactors creation of Binary and HTTP clients in seprate methods in H…
Mar 31, 2022
b3ba0ad
Addresses review comments
Apr 1, 2022
f49243d
Fixes validation of maxIdleTimeout in metastore http server
Apr 6, 2022
326900c
Disabled HTTP TRACE in embedded jetty server in HMS
Apr 6, 2022
4594e3b
Addresses review comments
Apr 11, 2022
e2d11b7
Addresses nits. Adds some more comments
Apr 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions itests/hive-unit/src/main/java/org/hadoop/hive/jdbc/SSLTestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,12 @@ public static void setMetastoreSslConf(HiveConf conf) {
KEY_STORE_TRUST_STORE_PASSWORD);
}

public static void setMetastoreHttpsConf(HiveConf conf) {
setMetastoreSslConf(conf);
MetastoreConf.setVar(conf, MetastoreConf.ConfVars.THRIFT_TRANSPORT_MODE, "http");
MetastoreConf.setVar(conf, MetastoreConf.ConfVars.METASTORE_CLIENT_THRIFT_TRANSPORT_MODE, "http");
}

public static void clearSslConfOverlay(Map<String, String> confOverlay) {
confOverlay.put(HiveConf.ConfVars.HIVE_SERVER2_USE_SSL.varname, "false");
}
Expand Down
24 changes: 23 additions & 1 deletion itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestSSL.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
import org.slf4j.LoggerFactory;


@org.junit.Ignore("HIVE-22620")
public class TestSSL {

private static final Logger LOG = LoggerFactory.getLogger(TestSSL.class);
Expand All @@ -65,6 +64,7 @@ public class TestSSL {
private static final String JAVA_TRUST_STORE_PROP = "javax.net.ssl.trustStore";
private static final String JAVA_TRUST_STORE_PASS_PROP = "javax.net.ssl.trustStorePassword";
private static final String JAVA_TRUST_STORE_TYPE_PROP = "javax.net.ssl.trustStoreType";
private static final String KEY_MANAGER_FACTORY_ALGORITHM = "SunX509";

private MiniHS2 miniHS2 = null;
private static HiveConf conf = new HiveConf();
Expand Down Expand Up @@ -290,6 +290,7 @@ public void testSSLConnectionWithURL() throws Exception {
* Test SSL client connection to SSL server
* @throws Exception
*/
@Ignore
@Test
public void testSSLConnectionWithProperty() throws Exception {
SSLTestUtils.setSslConfOverlay(confOverlay);
Expand Down Expand Up @@ -390,6 +391,7 @@ public void testSSLFetchHttp() throws Exception {
* Opening a new connection with this wrong certificate should fail
* @throws Exception
*/
@Ignore
@Test
public void testConnectionWrongCertCN() throws Exception {
// This call sets the default ssl params including the correct keystore in the server config
Expand Down Expand Up @@ -437,15 +439,34 @@ public void testConnectionWrongCertCN() throws Exception {
* Test HMS server with SSL
* @throws Exception
*/
@Ignore
@Test
public void testMetastoreWithSSL() throws Exception {
testSSLHMS(true);
}

/**
* Test HMS server with Thrift over Http + SSL
* @throws Exception
*/
@Test
public void testMetastoreWithHttps() throws Exception {
SSLTestUtils.setMetastoreHttpsConf(conf);
MetastoreConf.setVar(conf, MetastoreConf.ConfVars.SSL_TRUSTMANAGERFACTORY_ALGORITHM,
KEY_MANAGER_FACTORY_ALGORITHM);
MetastoreConf.setVar(conf, MetastoreConf.ConfVars.SSL_TRUSTSTORE_TYPE, KEY_STORE_TRUST_STORE_TYPE);
// false flag in testSSLHMS will set key store type for metastore
MetastoreConf.setVar(conf, MetastoreConf.ConfVars.SSL_KEYMANAGERFACTORY_ALGORITHM,
KEY_MANAGER_FACTORY_ALGORITHM);

testSSLHMS(false);
}

/**
* Test HMS server with SSL with input keystore type
* @throws Exception
*/
@Ignore
@Test
public void testMetastoreWithSSLKeyStoreType() throws Exception {
testSSLHMS(false);
Expand Down Expand Up @@ -511,6 +532,7 @@ public void testMetastoreConnectionWrongCertCN() throws Exception {
* Test SSL client connection to SSL server
* @throws Exception
*/
@Ignore
@Test
public void testSSLConnectionWithKeystoreType() throws Exception {
SSLTestUtils.setSslConfOverlay(confOverlay);
Expand Down
Loading