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 2020/09/07 11:38:19 UTC
[GitHub] [hive] deniskuzZ opened a new pull request #1474: Revert "HIVE-23725: ValidTxnManager snapshot outdating causing partia…
deniskuzZ opened a new pull request #1474:
URL: https://github.com/apache/hive/pull/1474
…l reads (Peter Varga, reviewed by Jesus Camacho Rodriguez, Denys Kuzmenko)"
This reverts commit e2a02f1b43cba657d4d1c16ead091072be5fe834.
<!--
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.
-->
reverts https://issues.apache.org/jira/browse/HIVE-23725
### 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.
-->
doesn't completely solve the problem described in a JIRA, will be replaced with another solution
### 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'.
-->
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.
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] pvargacl commented on a change in pull request #1474: Revert "HIVE-23725: ValidTxnManager snapshot outdating causing partia…
Posted by GitBox <gi...@apache.org>.
pvargacl commented on a change in pull request #1474:
URL: https://github.com/apache/hive/pull/1474#discussion_r484513473
##########
File path: ql/src/test/org/apache/hadoop/hive/ql/lockmgr/TestDbTxnManager2.java
##########
@@ -2315,6 +2386,139 @@ private void testConcurrentMergeInsertNoDuplicates(String query, boolean sharedW
List res = new ArrayList();
driver.getFetchTask().fetch(res);
Assert.assertEquals("Duplicate records found", 4, res.size());
+ dropTable(new String[]{"target", "source"});
+ }
+
+ /**
+ * ValidTxnManager.isValidTxnListState can invalidate a snapshot if a relevant write transaction was committed
+ * between a query compilation and lock acquisition. When this happens we have to recompile the given query,
+ * otherwise we can miss reading partitions created between. The following three cases test these scenarios.
+ * @throws Exception ex
+ */
+ @Test
+ public void testMergeInsertDynamicPartitioningSequential() throws Exception {
+ dropTable(new String[]{"target", "source"});
+ conf.setBoolVar(HiveConf.ConfVars.TXN_WRITE_X_LOCK, false);
+
+ // Create partition c=1
+ driver.run("create table target (a int, b int) partitioned by (c int) stored as orc TBLPROPERTIES ('transactional'='true')");
+ driver.run("insert into target values (1,1,1), (2,2,1)");
+ //Create partition c=2
+ driver.run("create table source (a int, b int) partitioned by (c int) stored as orc TBLPROPERTIES ('transactional'='true')");
+ driver.run("insert into source values (3,3,2), (4,4,2)");
+
+ // txn 1 inserts data to an old and a new partition
+ driver.run("insert into source values (5,5,2), (6,6,3)");
+
+ // txn 2 inserts into the target table into a new partition ( and a duplicate considering the source table)
+ driver.run("insert into target values (3, 3, 2)");
+
+ // txn3 merge
+ driver.run("merge into target t using source s on t.a = s.a " +
+ "when not matched then insert values (s.a, s.b, s.c)");
+ driver.run("select * from target");
+ List res = new ArrayList();
+ driver.getFetchTask().fetch(res);
+ // The merge should see all three partition and not create duplicates
+ Assert.assertEquals("Duplicate records found", 6, res.size());
+ Assert.assertTrue("Partition 3 was skipped", res.contains("6\t6\t3"));
+ dropTable(new String[]{"target", "source"});
+ }
+
+ @Test
+ public void testMergeInsertDynamicPartitioningSnapshotInvalidatedWithOldCommit() throws Exception {
+ // By creating the driver with the factory, we should have a ReExecDriver
+ IDriver driver3 = DriverFactory.newDriver(conf);
+ Assert.assertTrue("ReExecDriver was expected", driver3 instanceof ReExecDriver);
Review comment:
This Reexec part is not really relevant now, we don't need the reexec driver for this to work properly
----------------------------------------------------------------
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.
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] deniskuzZ commented on a change in pull request #1474: Revert "HIVE-23725: ValidTxnManager snapshot outdating causing partia…
Posted by GitBox <gi...@apache.org>.
deniskuzZ commented on a change in pull request #1474:
URL: https://github.com/apache/hive/pull/1474#discussion_r484768146
##########
File path: standalone-metastore/metastore-common/src/main/thrift/hive_metastore.thrift
##########
@@ -1012,8 +1012,9 @@ struct CommitTxnRequest {
3: optional list<WriteEventInfo> writeEventInfos,
// Information to update the last repl id of table/partition along with commit txn (replication from 2.6 to 3.0)
4: optional ReplLastIdInfo replLastIdInfo,
+ 5: optional bool exclWriteEnabled = true,
Review comment:
we need to keep it consistent with downstream, see `HIVE-23759: refactor field order of CommitTxnRequest`
----------------------------------------------------------------
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.
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] pvargacl commented on a change in pull request #1474: Revert "HIVE-23725: ValidTxnManager snapshot outdating causing partia…
Posted by GitBox <gi...@apache.org>.
pvargacl commented on a change in pull request #1474:
URL: https://github.com/apache/hive/pull/1474#discussion_r484388472
##########
File path: ql/src/test/org/apache/hadoop/hive/ql/lockmgr/TestDbTxnManager2.java
##########
@@ -2324,142 +2315,6 @@ private void testConcurrentMergeInsertNoDuplicates(String query, boolean sharedW
List res = new ArrayList();
driver.getFetchTask().fetch(res);
Assert.assertEquals("Duplicate records found", 4, res.size());
- dropTable(new String[]{"target", "source"});
- }
-
- /**
- * ValidTxnManager.isValidTxnListState can invalidate a snapshot if a relevant write transaction was committed
- * between a query compilation and lock acquisition. When this happens we have to recompile the given query,
- * otherwise we can miss reading partitions created between. The following three cases test these scenarios.
- * @throws Exception ex
- */
- @Test
- public void testMergeInsertDynamicPartitioningSequential() throws Exception {
Review comment:
These tests should be added back in your next change, when we recompile without the reexec driver, to verify the dyn partitioning use-cases
----------------------------------------------------------------
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.
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] kgyrtkirk commented on a change in pull request #1474: Revert "HIVE-23725: ValidTxnManager snapshot outdating causing partia…
Posted by GitBox <gi...@apache.org>.
kgyrtkirk commented on a change in pull request #1474:
URL: https://github.com/apache/hive/pull/1474#discussion_r484381500
##########
File path: ql/src/java/org/apache/hadoop/hive/ql/reexec/ReExecutionDagSubmitPlugin.java
##########
@@ -76,7 +76,7 @@ public void beforeExecute(int executionIndex, boolean explainReOptimization) {
}
@Override
- public boolean shouldReExecute(int executionNum, CommandProcessorException ex) {
+ public boolean shouldReExecute(int executionNum) {
return (executionNum < maxExecutions) && retryPossible;
Review comment:
please change this to `retryPossible` ( and remove maxExecutions field)
----------------------------------------------------------------
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.
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] deniskuzZ commented on a change in pull request #1474: Revert "HIVE-23725: ValidTxnManager snapshot outdating causing partia…
Posted by GitBox <gi...@apache.org>.
deniskuzZ commented on a change in pull request #1474:
URL: https://github.com/apache/hive/pull/1474#discussion_r484389253
##########
File path: ql/src/test/org/apache/hadoop/hive/ql/lockmgr/TestDbTxnManager2.java
##########
@@ -2324,142 +2315,6 @@ private void testConcurrentMergeInsertNoDuplicates(String query, boolean sharedW
List res = new ArrayList();
driver.getFetchTask().fetch(res);
Assert.assertEquals("Duplicate records found", 4, res.size());
- dropTable(new String[]{"target", "source"});
- }
-
- /**
- * ValidTxnManager.isValidTxnListState can invalidate a snapshot if a relevant write transaction was committed
- * between a query compilation and lock acquisition. When this happens we have to recompile the given query,
- * otherwise we can miss reading partitions created between. The following three cases test these scenarios.
- * @throws Exception ex
- */
- @Test
- public void testMergeInsertDynamicPartitioningSequential() throws Exception {
Review comment:
Ack.
----------------------------------------------------------------
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.
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] deniskuzZ commented on a change in pull request #1474: Revert "HIVE-23725: ValidTxnManager snapshot outdating causing partia…
Posted by GitBox <gi...@apache.org>.
deniskuzZ commented on a change in pull request #1474:
URL: https://github.com/apache/hive/pull/1474#discussion_r484392701
##########
File path: ql/src/java/org/apache/hadoop/hive/ql/reexec/ReExecutionDagSubmitPlugin.java
##########
@@ -76,7 +76,7 @@ public void beforeExecute(int executionIndex, boolean explainReOptimization) {
}
@Override
- public boolean shouldReExecute(int executionNum, CommandProcessorException ex) {
+ public boolean shouldReExecute(int executionNum) {
return (executionNum < maxExecutions) && retryPossible;
Review comment:
changed
----------------------------------------------------------------
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.
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] pvargacl commented on a change in pull request #1474: Revert "HIVE-23725: ValidTxnManager snapshot outdating causing partia…
Posted by GitBox <gi...@apache.org>.
pvargacl commented on a change in pull request #1474:
URL: https://github.com/apache/hive/pull/1474#discussion_r484512373
##########
File path: standalone-metastore/metastore-common/src/main/thrift/hive_metastore.thrift
##########
@@ -1012,8 +1012,9 @@ struct CommitTxnRequest {
3: optional list<WriteEventInfo> writeEventInfos,
// Information to update the last repl id of table/partition along with commit txn (replication from 2.6 to 3.0)
4: optional ReplLastIdInfo replLastIdInfo,
+ 5: optional bool exclWriteEnabled = true,
Review comment:
This should be added as the last parameter to not break backward compatibility no?
----------------------------------------------------------------
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.
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] deniskuzZ merged pull request #1474: Revert "HIVE-23725: ValidTxnManager snapshot outdating causing partia…
Posted by GitBox <gi...@apache.org>.
deniskuzZ merged pull request #1474:
URL: https://github.com/apache/hive/pull/1474
----------------------------------------------------------------
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.
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] pvargacl commented on a change in pull request #1474: Revert "HIVE-23725: ValidTxnManager snapshot outdating causing partia…
Posted by GitBox <gi...@apache.org>.
pvargacl commented on a change in pull request #1474:
URL: https://github.com/apache/hive/pull/1474#discussion_r484516378
##########
File path: ql/src/java/org/apache/hadoop/hive/ql/Driver.java
##########
@@ -488,30 +489,40 @@ private void runInternal(String command, boolean alreadyCompiled) throws Command
lockAndRespond();
+ int retryShapshotCnt = 0;
+ int maxRetrySnapshotCnt = HiveConf.getIntVar(driverContext.getConf(),
+ HiveConf.ConfVars.HIVE_TXN_MAX_RETRYSNAPSHOT_COUNT);
+
try {
- if (!driverTxnHandler.isValidTxnListState()) {
- LOG.info("Compiling after acquiring locks");
+ while (!driverTxnHandler.isValidTxnListState() && ++retryShapshotCnt <= maxRetrySnapshotCnt) {
+ LOG.info("Compiling after acquiring locks, attempt #" + retryShapshotCnt);
// Snapshot was outdated when locks were acquired, hence regenerate context,
// txn list and retry
// TODO: Lock acquisition should be moved before analyze, this is a bit hackish.
// Currently, we acquire a snapshot, we compile the query wrt that snapshot,
// and then, we acquire locks. If snapshot is still valid, we continue as usual.
// But if snapshot is not valid, we recompile the query.
if (driverContext.isOutdatedTxn()) {
+ LOG.info("Snapshot is outdated, re-initiating transaction ...");
driverContext.getTxnManager().rollbackTxn();
String userFromUGI = DriverUtils.getUserFromUGI(driverContext);
driverContext.getTxnManager().openTxn(context, userFromUGI, driverContext.getTxnType());
lockAndRespond();
}
+
driverContext.setRetrial(true);
driverContext.getBackupContext().addSubContext(context);
driverContext.getBackupContext().setHiveLocks(context.getHiveLocks());
context = driverContext.getBackupContext();
+
driverContext.getConf().set(ValidTxnList.VALID_TXNS_KEY,
driverContext.getTxnManager().getValidTxns().toString());
+
if (driverContext.getPlan().hasAcidResourcesInQuery()) {
+ compileInternal(context.getCmd(), true);
driverTxnHandler.recordValidWriteIds();
+ driverTxnHandler.setWriteIdForAcidFileSinks();
}
if (!alreadyCompiled) {
Review comment:
I think this code should be removed. If the alreadyCompiled was false, we already compiled it once line 473. This should not matter when we are in the invalid snapshot case, you already recompile the query if it is neccessarry
----------------------------------------------------------------
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.
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] pvargacl commented on pull request #1474: Revert "HIVE-23725: ValidTxnManager snapshot outdating causing partia…
Posted by GitBox <gi...@apache.org>.
pvargacl commented on pull request #1474:
URL: https://github.com/apache/hive/pull/1474#issuecomment-689367884
LGTM +1
----------------------------------------------------------------
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.
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] deniskuzZ commented on a change in pull request #1474: Revert "HIVE-23725: ValidTxnManager snapshot outdating causing partia…
Posted by GitBox <gi...@apache.org>.
deniskuzZ commented on a change in pull request #1474:
URL: https://github.com/apache/hive/pull/1474#discussion_r484767687
##########
File path: ql/src/test/org/apache/hadoop/hive/ql/lockmgr/TestDbTxnManager2.java
##########
@@ -2315,6 +2386,139 @@ private void testConcurrentMergeInsertNoDuplicates(String query, boolean sharedW
List res = new ArrayList();
driver.getFetchTask().fetch(res);
Assert.assertEquals("Duplicate records found", 4, res.size());
+ dropTable(new String[]{"target", "source"});
+ }
+
+ /**
+ * ValidTxnManager.isValidTxnListState can invalidate a snapshot if a relevant write transaction was committed
+ * between a query compilation and lock acquisition. When this happens we have to recompile the given query,
+ * otherwise we can miss reading partitions created between. The following three cases test these scenarios.
+ * @throws Exception ex
+ */
+ @Test
+ public void testMergeInsertDynamicPartitioningSequential() throws Exception {
+ dropTable(new String[]{"target", "source"});
+ conf.setBoolVar(HiveConf.ConfVars.TXN_WRITE_X_LOCK, false);
+
+ // Create partition c=1
+ driver.run("create table target (a int, b int) partitioned by (c int) stored as orc TBLPROPERTIES ('transactional'='true')");
+ driver.run("insert into target values (1,1,1), (2,2,1)");
+ //Create partition c=2
+ driver.run("create table source (a int, b int) partitioned by (c int) stored as orc TBLPROPERTIES ('transactional'='true')");
+ driver.run("insert into source values (3,3,2), (4,4,2)");
+
+ // txn 1 inserts data to an old and a new partition
+ driver.run("insert into source values (5,5,2), (6,6,3)");
+
+ // txn 2 inserts into the target table into a new partition ( and a duplicate considering the source table)
+ driver.run("insert into target values (3, 3, 2)");
+
+ // txn3 merge
+ driver.run("merge into target t using source s on t.a = s.a " +
+ "when not matched then insert values (s.a, s.b, s.c)");
+ driver.run("select * from target");
+ List res = new ArrayList();
+ driver.getFetchTask().fetch(res);
+ // The merge should see all three partition and not create duplicates
+ Assert.assertEquals("Duplicate records found", 6, res.size());
+ Assert.assertTrue("Partition 3 was skipped", res.contains("6\t6\t3"));
+ dropTable(new String[]{"target", "source"});
+ }
+
+ @Test
+ public void testMergeInsertDynamicPartitioningSnapshotInvalidatedWithOldCommit() throws Exception {
+ // By creating the driver with the factory, we should have a ReExecDriver
+ IDriver driver3 = DriverFactory.newDriver(conf);
+ Assert.assertTrue("ReExecDriver was expected", driver3 instanceof ReExecDriver);
Review comment:
changed
##########
File path: ql/src/java/org/apache/hadoop/hive/ql/Driver.java
##########
@@ -488,30 +489,40 @@ private void runInternal(String command, boolean alreadyCompiled) throws Command
lockAndRespond();
+ int retryShapshotCnt = 0;
+ int maxRetrySnapshotCnt = HiveConf.getIntVar(driverContext.getConf(),
+ HiveConf.ConfVars.HIVE_TXN_MAX_RETRYSNAPSHOT_COUNT);
+
try {
- if (!driverTxnHandler.isValidTxnListState()) {
- LOG.info("Compiling after acquiring locks");
+ while (!driverTxnHandler.isValidTxnListState() && ++retryShapshotCnt <= maxRetrySnapshotCnt) {
+ LOG.info("Compiling after acquiring locks, attempt #" + retryShapshotCnt);
// Snapshot was outdated when locks were acquired, hence regenerate context,
// txn list and retry
// TODO: Lock acquisition should be moved before analyze, this is a bit hackish.
// Currently, we acquire a snapshot, we compile the query wrt that snapshot,
// and then, we acquire locks. If snapshot is still valid, we continue as usual.
// But if snapshot is not valid, we recompile the query.
if (driverContext.isOutdatedTxn()) {
+ LOG.info("Snapshot is outdated, re-initiating transaction ...");
driverContext.getTxnManager().rollbackTxn();
String userFromUGI = DriverUtils.getUserFromUGI(driverContext);
driverContext.getTxnManager().openTxn(context, userFromUGI, driverContext.getTxnType());
lockAndRespond();
}
+
driverContext.setRetrial(true);
driverContext.getBackupContext().addSubContext(context);
driverContext.getBackupContext().setHiveLocks(context.getHiveLocks());
context = driverContext.getBackupContext();
+
driverContext.getConf().set(ValidTxnList.VALID_TXNS_KEY,
driverContext.getTxnManager().getValidTxns().toString());
+
if (driverContext.getPlan().hasAcidResourcesInQuery()) {
+ compileInternal(context.getCmd(), true);
driverTxnHandler.recordValidWriteIds();
+ driverTxnHandler.setWriteIdForAcidFileSinks();
}
if (!alreadyCompiled) {
Review comment:
removed
----------------------------------------------------------------
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.
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