You are viewing a plain text version of this content. The canonical link for it is here.
Posted to gitbox@hive.apache.org by GitBox <gi...@apache.org> on 2021/07/23 08:14:00 UTC
[GitHub] [hive] ArkoSharma opened a new pull request #2519: HIVE-25374: Fix test TestReplicationOnHDFSEncryptedZones
ArkoSharma opened a new pull request #2519:
URL: https://github.com/apache/hive/pull/2519
<!--
Thanks for sending a pull request! Here are some tips for you:
1. If this is your first time, please read our contributor guidelines: https://cwiki.apache.org/confluence/display/Hive/HowToContribute
2. Ensure that you have created an issue on the Hive project JIRA: https://issues.apache.org/jira/projects/HIVE/summary
3. Ensure you have added or run the appropriate tests for your PR:
4. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP]HIVE-XXXXX: Your PR title ...'.
5. Be sure to keep the PR description updated to reflect all changes.
6. Please write your PR title to summarize what this PR proposes.
7. If possible, provide a concise example to reproduce the issue for a faster review.
-->
### What changes were proposed in this pull request?
<!--
Please clarify what changes you are proposing. The purpose of this section is to outline the changes and how this PR fixes the issue.
If possible, please consider writing useful notes for better and faster reviews in your PR. See the examples below.
1. If you refactor some codes with changing classes, showing the class hierarchy will help reviewers.
2. If you fix some SQL features, you can provide some references of other DBMSes.
3. If there is design documentation, please add the link.
4. If there is a discussion in the mailing list, please add the link.
-->
### Why are the changes needed?
<!--
Please clarify why the changes are needed. For instance,
1. If you propose a new API, clarify the use case for a new API.
2. If you fix a bug, you can clarify why it is a bug.
-->
### Does this PR introduce _any_ user-facing change?
<!--
Note that it means *any* user-facing change including all aspects such as the documentation fix.
If yes, please clarify the previous behavior and the change this PR proposes - provide the console output, description, screenshot and/or a reproducable example to show the behavior difference if possible.
If possible, please also clarify if this is a user-facing change compared to the released Hive versions or within the unreleased branches such as master.
If no, write 'No'.
-->
### How was this patch tested?
<!--
If tests were added, say they were added here. Please make sure to add some test cases that check the changes thoroughly including negative and positive cases if possible.
If it was tested in a way different from regular unit tests, please clarify how you tested step by step, ideally copy and paste-able, so that other reviewers can test and check, and descendants can verify in the future.
If tests were not added, please describe why they were not added and/or why it was difficult to add.
-->
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: gitbox-unsubscribe@hive.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: gitbox-unsubscribe@hive.apache.org
For additional commands, e-mail: gitbox-help@hive.apache.org
[GitHub] [hive] ayushtkn commented on a change in pull request #2519: HIVE-25374: Fix test TestReplicationOnHDFSEncryptedZones
Posted by GitBox <gi...@apache.org>.
ayushtkn commented on a change in pull request #2519:
URL: https://github.com/apache/hive/pull/2519#discussion_r676273599
##########
File path: itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestReplicationOnHDFSEncryptedZones.java
##########
@@ -113,46 +129,96 @@ public void targetAndSourceHaveDifferentEncryptionZoneKeys() throws Throwable {
"'" + HiveConf.ConfVars.HIVE_DISTCP_DOAS_USER.varname + "'='"
+ UserGroupInformation.getCurrentUser().getUserName() +"'");
WarehouseInstance.Tuple tuple =
- primary.run("use " + primaryDbName)
- .run("create table encrypted_table (id int, value string)")
- .run("insert into table encrypted_table values (1,'value1')")
- .run("insert into table encrypted_table values (2,'value2')")
+ primary.run("use " + primaryDbName)
+ .run("create table encrypted_table (id int, value string)")
+ .run("insert into table encrypted_table values (1,'value1')")
+ .run("insert into table encrypted_table values (2,'value2')")
+ .dump(primaryDbName, dumpWithClause);
+
+ replica
+ .run("repl load " + primaryDbName + " into " + replicatedDbName
+ + " with('hive.repl.add.raw.reserved.namespace'='true', "
+ + "'hive.repl.replica.external.table.base.dir'='" + replica.externalTableWarehouseRoot + "', "
+ + "'hive.exec.copyfile.maxsize'='0', 'distcp.options.skipcrccheck'='')")
+ .run("use " + replicatedDbName)
+ .run("repl status " + replicatedDbName)
+ .verifyResult(tuple.lastReplicationId);
+
+ try {
+ replica
+ .run("select value from encrypted_table")
+ .verifyResults(new String[] { "value1", "value2" });
+ Assert.fail("Src EZKey shouldn't be present on target");
+ } catch (IOException e) {
+ Assert.assertTrue(e.getCause().getMessage().contains("KeyVersion name 'test_key@0' does not exist"));
+ }
+
+ //read should pass without raw-byte distcp
+ dumpWithClause = Arrays.asList( "'" + HiveConf.ConfVars.REPL_EXTERNAL_TABLE_BASE_DIR.varname + "'='"
+ + replica.externalTableWarehouseRoot + "'");
+ tuple = primary.run("use " + primaryDbName)
+ .run("create external table encrypted_table2 (id int, value string)")
+ .run("insert into table encrypted_table2 values (1,'value1')")
+ .run("insert into table encrypted_table2 values (2,'value2')")
.dump(primaryDbName, dumpWithClause);
replica
- .run("repl load " + primaryDbName + " into " + replicatedDbName
- + " with('hive.repl.add.raw.reserved.namespace'='true', "
- + "'hive.repl.replica.external.table.base.dir'='" + replica.externalTableWarehouseRoot + "', "
- + "'distcp.options.pugpbx'='', 'distcp.options.skipcrccheck'='')")
- .run("use " + replicatedDbName)
- .run("repl status " + replicatedDbName)
- .verifyResult(tuple.lastReplicationId)
- .run("select value from encrypted_table")
- .verifyFailure(new String[] { "value1", "value2" });
+ .run("repl load " + primaryDbName + " into " + replicatedDbName
+ + " with('hive.repl.replica.external.table.base.dir'='" + replica.externalTableWarehouseRoot + "', "
+ + "'hive.exec.copyfile.maxsize'='0', 'distcp.options.skipcrccheck'='')")
+ .run("use " + replicatedDbName)
+ .run("repl status " + replicatedDbName)
+ .verifyResult(tuple.lastReplicationId)
+ .run("select value from encrypted_table2")
+ .verifyResults(new String[] { "value1", "value2" });
}
@Ignore("this is ignored as minidfs cluster as of writing this test looked like did not copy the "
+ "files correctly")
@Test
public void targetAndSourceHaveSameEncryptionZoneKeys() throws Throwable {
- WarehouseInstance replica = new WarehouseInstance(LOG, miniDFSCluster,
+ String replicaBaseDir = Files.createTempDirectory("replica2").toFile().getAbsolutePath();
Review comment:
The test is still disabled. Need to remove Ignore
##########
File path: itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestReplicationOnHDFSEncryptedZones.java
##########
@@ -113,46 +129,96 @@ public void targetAndSourceHaveDifferentEncryptionZoneKeys() throws Throwable {
"'" + HiveConf.ConfVars.HIVE_DISTCP_DOAS_USER.varname + "'='"
+ UserGroupInformation.getCurrentUser().getUserName() +"'");
WarehouseInstance.Tuple tuple =
- primary.run("use " + primaryDbName)
- .run("create table encrypted_table (id int, value string)")
- .run("insert into table encrypted_table values (1,'value1')")
- .run("insert into table encrypted_table values (2,'value2')")
+ primary.run("use " + primaryDbName)
+ .run("create table encrypted_table (id int, value string)")
+ .run("insert into table encrypted_table values (1,'value1')")
+ .run("insert into table encrypted_table values (2,'value2')")
+ .dump(primaryDbName, dumpWithClause);
+
+ replica
+ .run("repl load " + primaryDbName + " into " + replicatedDbName
+ + " with('hive.repl.add.raw.reserved.namespace'='true', "
+ + "'hive.repl.replica.external.table.base.dir'='" + replica.externalTableWarehouseRoot + "', "
+ + "'hive.exec.copyfile.maxsize'='0', 'distcp.options.skipcrccheck'='')")
+ .run("use " + replicatedDbName)
+ .run("repl status " + replicatedDbName)
+ .verifyResult(tuple.lastReplicationId);
+
+ try {
+ replica
+ .run("select value from encrypted_table")
+ .verifyResults(new String[] { "value1", "value2" });
+ Assert.fail("Src EZKey shouldn't be present on target");
+ } catch (IOException e) {
+ Assert.assertTrue(e.getCause().getMessage().contains("KeyVersion name 'test_key@0' does not exist"));
+ }
+
+ //read should pass without raw-byte distcp
+ dumpWithClause = Arrays.asList( "'" + HiveConf.ConfVars.REPL_EXTERNAL_TABLE_BASE_DIR.varname + "'='"
+ + replica.externalTableWarehouseRoot + "'");
+ tuple = primary.run("use " + primaryDbName)
+ .run("create external table encrypted_table2 (id int, value string)")
+ .run("insert into table encrypted_table2 values (1,'value1')")
+ .run("insert into table encrypted_table2 values (2,'value2')")
.dump(primaryDbName, dumpWithClause);
replica
- .run("repl load " + primaryDbName + " into " + replicatedDbName
- + " with('hive.repl.add.raw.reserved.namespace'='true', "
- + "'hive.repl.replica.external.table.base.dir'='" + replica.externalTableWarehouseRoot + "', "
- + "'distcp.options.pugpbx'='', 'distcp.options.skipcrccheck'='')")
- .run("use " + replicatedDbName)
- .run("repl status " + replicatedDbName)
- .verifyResult(tuple.lastReplicationId)
- .run("select value from encrypted_table")
- .verifyFailure(new String[] { "value1", "value2" });
+ .run("repl load " + primaryDbName + " into " + replicatedDbName
+ + " with('hive.repl.replica.external.table.base.dir'='" + replica.externalTableWarehouseRoot + "', "
+ + "'hive.exec.copyfile.maxsize'='0', 'distcp.options.skipcrccheck'='')")
+ .run("use " + replicatedDbName)
+ .run("repl status " + replicatedDbName)
+ .verifyResult(tuple.lastReplicationId)
+ .run("select value from encrypted_table2")
+ .verifyResults(new String[] { "value1", "value2" });
}
@Ignore("this is ignored as minidfs cluster as of writing this test looked like did not copy the "
+ "files correctly")
@Test
public void targetAndSourceHaveSameEncryptionZoneKeys() throws Throwable {
- WarehouseInstance replica = new WarehouseInstance(LOG, miniDFSCluster,
+ String replicaBaseDir = Files.createTempDirectory("replica2").toFile().getAbsolutePath();
+ Configuration replicaConf = new Configuration();
+ replicaConf.set(MiniDFSCluster.HDFS_MINIDFS_BASEDIR, replicaBaseDir);
+ replicaConf.set("dfs.client.use.datanode.hostname", "true");
+ replicaConf.set("hadoop.proxyuser." + Utils.getUGI().getShortUserName() + ".hosts", "*");
+ replicaConf.set("hadoop.security.key.provider.path", "jceks://file" + jksFile);
+ replicaConf.setBoolean("dfs.namenode.delegation.token.always-use", true);
+
Review comment:
Add the below, else the test fails:
```
System.setProperty("jceks.key.serialFilter",
"java.lang.Enum;java.security.KeyRep;java.security.KeyRep$Type;javax.crypto.spec.SecretKeySpec;org.apache.hadoop.crypto.key.JavaKeyStoreProvider$KeyMetadata;!*");
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: gitbox-unsubscribe@hive.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: gitbox-unsubscribe@hive.apache.org
For additional commands, e-mail: gitbox-help@hive.apache.org
[GitHub] [hive] ArkoSharma commented on a change in pull request #2519: HIVE-25374: Fix test TestReplicationOnHDFSEncryptedZones
Posted by GitBox <gi...@apache.org>.
ArkoSharma commented on a change in pull request #2519:
URL: https://github.com/apache/hive/pull/2519#discussion_r676511419
##########
File path: itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestReplicationOnHDFSEncryptedZones.java
##########
@@ -113,46 +129,96 @@ public void targetAndSourceHaveDifferentEncryptionZoneKeys() throws Throwable {
"'" + HiveConf.ConfVars.HIVE_DISTCP_DOAS_USER.varname + "'='"
+ UserGroupInformation.getCurrentUser().getUserName() +"'");
WarehouseInstance.Tuple tuple =
- primary.run("use " + primaryDbName)
- .run("create table encrypted_table (id int, value string)")
- .run("insert into table encrypted_table values (1,'value1')")
- .run("insert into table encrypted_table values (2,'value2')")
+ primary.run("use " + primaryDbName)
+ .run("create table encrypted_table (id int, value string)")
+ .run("insert into table encrypted_table values (1,'value1')")
+ .run("insert into table encrypted_table values (2,'value2')")
+ .dump(primaryDbName, dumpWithClause);
+
+ replica
+ .run("repl load " + primaryDbName + " into " + replicatedDbName
+ + " with('hive.repl.add.raw.reserved.namespace'='true', "
+ + "'hive.repl.replica.external.table.base.dir'='" + replica.externalTableWarehouseRoot + "', "
+ + "'hive.exec.copyfile.maxsize'='0', 'distcp.options.skipcrccheck'='')")
+ .run("use " + replicatedDbName)
+ .run("repl status " + replicatedDbName)
+ .verifyResult(tuple.lastReplicationId);
+
+ try {
+ replica
+ .run("select value from encrypted_table")
+ .verifyResults(new String[] { "value1", "value2" });
+ Assert.fail("Src EZKey shouldn't be present on target");
+ } catch (IOException e) {
+ Assert.assertTrue(e.getCause().getMessage().contains("KeyVersion name 'test_key@0' does not exist"));
+ }
+
+ //read should pass without raw-byte distcp
+ dumpWithClause = Arrays.asList( "'" + HiveConf.ConfVars.REPL_EXTERNAL_TABLE_BASE_DIR.varname + "'='"
+ + replica.externalTableWarehouseRoot + "'");
+ tuple = primary.run("use " + primaryDbName)
+ .run("create external table encrypted_table2 (id int, value string)")
+ .run("insert into table encrypted_table2 values (1,'value1')")
+ .run("insert into table encrypted_table2 values (2,'value2')")
.dump(primaryDbName, dumpWithClause);
replica
- .run("repl load " + primaryDbName + " into " + replicatedDbName
- + " with('hive.repl.add.raw.reserved.namespace'='true', "
- + "'hive.repl.replica.external.table.base.dir'='" + replica.externalTableWarehouseRoot + "', "
- + "'distcp.options.pugpbx'='', 'distcp.options.skipcrccheck'='')")
- .run("use " + replicatedDbName)
- .run("repl status " + replicatedDbName)
- .verifyResult(tuple.lastReplicationId)
- .run("select value from encrypted_table")
- .verifyFailure(new String[] { "value1", "value2" });
+ .run("repl load " + primaryDbName + " into " + replicatedDbName
+ + " with('hive.repl.replica.external.table.base.dir'='" + replica.externalTableWarehouseRoot + "', "
+ + "'hive.exec.copyfile.maxsize'='0', 'distcp.options.skipcrccheck'='')")
+ .run("use " + replicatedDbName)
+ .run("repl status " + replicatedDbName)
+ .verifyResult(tuple.lastReplicationId)
+ .run("select value from encrypted_table2")
+ .verifyResults(new String[] { "value1", "value2" });
}
@Ignore("this is ignored as minidfs cluster as of writing this test looked like did not copy the "
+ "files correctly")
@Test
public void targetAndSourceHaveSameEncryptionZoneKeys() throws Throwable {
- WarehouseInstance replica = new WarehouseInstance(LOG, miniDFSCluster,
+ String replicaBaseDir = Files.createTempDirectory("replica2").toFile().getAbsolutePath();
+ Configuration replicaConf = new Configuration();
+ replicaConf.set(MiniDFSCluster.HDFS_MINIDFS_BASEDIR, replicaBaseDir);
+ replicaConf.set("dfs.client.use.datanode.hostname", "true");
+ replicaConf.set("hadoop.proxyuser." + Utils.getUGI().getShortUserName() + ".hosts", "*");
+ replicaConf.set("hadoop.security.key.provider.path", "jceks://file" + jksFile);
+ replicaConf.setBoolean("dfs.namenode.delegation.token.always-use", true);
+
Review comment:
Done.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: gitbox-unsubscribe@hive.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: gitbox-unsubscribe@hive.apache.org
For additional commands, e-mail: gitbox-help@hive.apache.org
[GitHub] [hive] aasha merged pull request #2519: HIVE-25374: Fix test TestReplicationOnHDFSEncryptedZones
Posted by GitBox <gi...@apache.org>.
aasha merged pull request #2519:
URL: https://github.com/apache/hive/pull/2519
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: gitbox-unsubscribe@hive.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: gitbox-unsubscribe@hive.apache.org
For additional commands, e-mail: gitbox-help@hive.apache.org