FAQ
Repository: hive
Updated Branches:
   refs/heads/branch-1 648f19307 -> b625586f6


HIVE-13493 - Fix TransactionBatchImpl.getCurrentTxnId() and mis logging fixes (Eugene Koifman, reviewed by Wei Zheng)


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

Branch: refs/heads/branch-1
Commit: b625586f66b0a2d7114e32eebf4b6f697e59ebc5
Parents: 648f193
Author: Eugene Koifman <ekoifman@hortonworks.com>
Authored: Wed Apr 27 16:07:21 2016 -0700
Committer: Eugene Koifman <ekoifman@hortonworks.com>
Committed: Wed Apr 27 16:07:21 2016 -0700

----------------------------------------------------------------------
  .../src/java/org/apache/hive/hcatalog/streaming/HiveEndPoint.java | 3 ++-
  .../test/org/apache/hive/hcatalog/streaming/TestStreaming.java | 2 ++
  .../apache/hadoop/hive/metastore/txn/CompactionTxnHandler.java | 3 ++-
  .../src/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java | 2 ++
  4 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/b625586f/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/HiveEndPoint.java
----------------------------------------------------------------------
diff --git a/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/HiveEndPoint.java b/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/HiveEndPoint.java
index 2e81bf8..41d2834 100644
--- a/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/HiveEndPoint.java
+++ b/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/HiveEndPoint.java
@@ -622,7 +622,7 @@ public class HiveEndPoint {

      private void beginNextTransactionImpl() throws TransactionError {
        state = TxnState.INACTIVE;//clear state from previous txn
- if ( currentTxnIndex >= txnIds.size() )
+ if ( currentTxnIndex + 1 >= txnIds.size() )
          throw new InvalidTrasactionState("No more transactions available in" +
                  " current batch for end point : " + endPt);
        ++currentTxnIndex;
@@ -874,6 +874,7 @@ public class HiveEndPoint {
                currentTxnIndex < txnIds.size(); currentTxnIndex++) {
              msClient.rollbackTxn(txnIds.get(currentTxnIndex));
            }
+ currentTxnIndex--;//since the loop left it == txnId.size()
          }
          else {
            if (getCurrentTxnId() > 0) {

http://git-wip-us.apache.org/repos/asf/hive/blob/b625586f/hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/TestStreaming.java
----------------------------------------------------------------------
diff --git a/hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/TestStreaming.java b/hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/TestStreaming.java
index bde78e4..f4ee208 100644
--- a/hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/TestStreaming.java
+++ b/hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/TestStreaming.java
@@ -1714,6 +1714,8 @@ public class TestStreaming {
      }
      catch(StreamingIOFailure ex) {
        expectedEx = ex;
+ txnBatch.getCurrentTransactionState();
+ txnBatch.getCurrentTxnId();//test it doesn't throw ArrayIndexOutOfBounds...
      }
      Assert.assertTrue("Wrong exception: " + (expectedEx != null ? expectedEx.getMessage() : "?"),
        expectedEx != null && expectedEx.getMessage().contains("Simulated fault occurred"));

http://git-wip-us.apache.org/repos/asf/hive/blob/b625586f/metastore/src/java/org/apache/hadoop/hive/metastore/txn/CompactionTxnHandler.java
----------------------------------------------------------------------
diff --git a/metastore/src/java/org/apache/hadoop/hive/metastore/txn/CompactionTxnHandler.java b/metastore/src/java/org/apache/hadoop/hive/metastore/txn/CompactionTxnHandler.java
index cdff357..8bb8154 100644
--- a/metastore/src/java/org/apache/hadoop/hive/metastore/txn/CompactionTxnHandler.java
+++ b/metastore/src/java/org/apache/hadoop/hive/metastore/txn/CompactionTxnHandler.java
@@ -31,6 +31,7 @@ import java.sql.ResultSet;
  import java.sql.SQLException;
  import java.sql.Statement;
  import java.util.ArrayList;
+import java.util.Collections;
  import java.util.HashSet;
  import java.util.List;
  import java.util.Set;
@@ -452,7 +453,7 @@ class CompactionTxnHandler extends TxnHandler {
          if(txnids.size() <= 0) {
            return;
          }
-
+ Collections.sort(txnids);//easier to read logs
          List<String> queries = new ArrayList<String>();
          StringBuilder prefix = new StringBuilder();
          StringBuilder suffix = new StringBuilder();

http://git-wip-us.apache.org/repos/asf/hive/blob/b625586f/metastore/src/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java
----------------------------------------------------------------------
diff --git a/metastore/src/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java b/metastore/src/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java
index a64e7c8..ffd450a 100644
--- a/metastore/src/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java
+++ b/metastore/src/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java
@@ -2383,6 +2383,7 @@ abstract class TxnHandler implements TxnStore, TxnStore.MutexAPI {
          deletedLocks += stmt.executeUpdate(query);
        }
        if(deletedLocks > 0) {
+ Collections.sort(extLockIDs);////easier to read logs
          LOG.info("Deleted " + deletedLocks + " ext locks from HIVE_LOCKS due to timeout (vs. " +
              extLockIDs.size() + " found. List: " + extLockIDs + ") maxHeartbeatTime=" + maxHeartbeatTime);
        }
@@ -2482,6 +2483,7 @@ abstract class TxnHandler implements TxnStore, TxnStore.MutexAPI {
              dbConn.commit();
              numTxnsAborted += batchToAbort.size();
              //todo: add TXNS.COMMENT filed and set it to 'aborted by system due to timeout'
+ Collections.sort(batchToAbort);//easier to read logs
              LOG.info("Aborted the following transactions due to timeout: " + batchToAbort.toString());
            }
            else {

Search Discussions

Discussion Posts

Previous

Related Discussions

Discussion Navigation
viewthread | post
posts ‹ prev | 2 of 2 | next ›
Discussion Overview
groupcommits @
categorieshive, hadoop
postedApr 27, '16 at 10:45p
activeApr 27, '16 at 11:19p
posts2
users1
websitehive.apache.org

1 user in discussion

Ekoifman: 2 posts

People

Translate

site design / logo © 2021 Grokbase