Repository: hive Updated Branches: refs/heads/master 6337a8fee -> e0c27c63e
HIVE-16109 : TestDbTxnManager generates a huge hive.log (Vihang Karajgaonkar via Sergey Shelukhin) Signed-off-by: Ashutosh Chauhan <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/e0c27c63 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/e0c27c63 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/e0c27c63 Branch: refs/heads/master Commit: e0c27c63e75c838dd5dd842d658b7f883129b9a0 Parents: 6337a8f Author: Vihang Karajgaonkar <[email protected]> Authored: Sat Mar 4 12:56:02 2017 -0800 Committer: Ashutosh Chauhan <[email protected]> Committed: Sat Mar 4 12:56:02 2017 -0800 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java | 6 +++--- .../org/apache/hadoop/hive/ql/lockmgr/TestDbTxnManager.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/e0c27c63/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 01acba5..d378d06 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 @@ -2597,10 +2597,10 @@ abstract class TxnHandler implements TxnStore, TxnStore.MutexAPI { // Turn the tree set into an array so we can move back and forth easily // in it. LockInfo[] locks = lockSet.toArray(new LockInfo[lockSet.size()]); - if(LOG.isDebugEnabled()) { - LOG.debug("Locks to check(full): "); + if(LOG.isTraceEnabled()) { + LOG.trace("Locks to check(full): "); for(LockInfo info : locks) { - LOG.debug(" " + info); + LOG.trace(" " + info); } } http://git-wip-us.apache.org/repos/asf/hive/blob/e0c27c63/ql/src/test/org/apache/hadoop/hive/ql/lockmgr/TestDbTxnManager.java ---------------------------------------------------------------------- diff --git a/ql/src/test/org/apache/hadoop/hive/ql/lockmgr/TestDbTxnManager.java b/ql/src/test/org/apache/hadoop/hive/ql/lockmgr/TestDbTxnManager.java index 6c53538..9bfc7d1 100644 --- a/ql/src/test/org/apache/hadoop/hive/ql/lockmgr/TestDbTxnManager.java +++ b/ql/src/test/org/apache/hadoop/hive/ql/lockmgr/TestDbTxnManager.java @@ -57,7 +57,7 @@ import static junit.framework.Assert.assertEquals; * See additional tests in {@link org.apache.hadoop.hive.ql.lockmgr.TestDbTxnManager2} */ public class TestDbTxnManager { - + private static final int TEST_TIMED_OUT_TXN_ABORT_BATCH_SIZE = 1000; private final HiveConf conf = new HiveConf(); private HiveTxnManager txnMgr; private AcidHouseKeeperService houseKeeperService = null; @@ -257,10 +257,10 @@ public class TestDbTxnManager { testLockExpiration(txnMgr, 5, true); //create a lot of locks - for(int i = 0; i < TxnStore.TIMED_OUT_TXN_ABORT_BATCH_SIZE + 17; i++) { + for(int i = 0; i < TEST_TIMED_OUT_TXN_ABORT_BATCH_SIZE + 17; i++) { ((DbTxnManager)txnMgr).acquireLocks(qp, ctx, "PeterI" + i, true); // No heartbeat } - testLockExpiration(txnMgr, TxnStore.TIMED_OUT_TXN_ABORT_BATCH_SIZE + 17, true); + testLockExpiration(txnMgr, TEST_TIMED_OUT_TXN_ABORT_BATCH_SIZE + 17, true); // Create a lock, but send the heartbeat with a long delay. The lock will get expired. ((DbTxnManager)txnMgr).acquireLocksWithHeartbeatDelay(qp, ctx, "bob",
