You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2017/10/11 15:15:28 UTC

hive git commit: HIVE-17758 : NOTIFICATION_SEQUENCE_LOCK_RETRY_SLEEP_INTERVAL.defaultLongVal is -1 (Zoltan Haindrich via Ashutosh Chauhan)

Repository: hive
Updated Branches:
  refs/heads/master fe8e6e092 -> dbb2d617c


HIVE-17758 : NOTIFICATION_SEQUENCE_LOCK_RETRY_SLEEP_INTERVAL.defaultLongVal is -1 (Zoltan Haindrich via Ashutosh Chauhan)

Signed-off-by: Ashutosh Chauhan <ha...@apache.org>


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

Branch: refs/heads/master
Commit: dbb2d617cbc2ffc813df0fca13b4eb857121a9ad
Parents: fe8e6e0
Author: Zoltan Haindrich <ki...@rxd.hu>
Authored: Wed Oct 11 08:14:35 2017 -0700
Committer: Ashutosh Chauhan <ha...@apache.org>
Committed: Wed Oct 11 08:14:35 2017 -0700

----------------------------------------------------------------------
 common/src/java/org/apache/hadoop/hive/conf/HiveConf.java    | 2 +-
 .../java/org/apache/hadoop/hive/metastore/ObjectStore.java   | 3 +++
 .../org/apache/hadoop/hive/metastore/TestObjectStore.java    | 8 ++++++++
 3 files changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/dbb2d617/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
----------------------------------------------------------------------
diff --git a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
index ca28198..942629b 100644
--- a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
+++ b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
@@ -786,7 +786,7 @@ public class HiveConf extends Configuration {
     NOTIFICATION_SEQUENCE_LOCK_MAX_RETRIES("hive.notification.sequence.lock.max.retries", 5,
         "Number of retries required to acquire a lock when getting the next notification sequential ID for entries "
             + "in the NOTIFICATION_LOG table."),
-    NOTIFICATION_SEQUENCE_LOCK_RETRY_SLEEP_INTERVAL("hive.notification.sequence.lock.retry.sleep.interval", 500,
+    NOTIFICATION_SEQUENCE_LOCK_RETRY_SLEEP_INTERVAL("hive.notification.sequence.lock.retry.sleep.interval", 500L,
         new TimeValidator(TimeUnit.MILLISECONDS),
         "Sleep interval between retries to acquire a notification lock as described part of property "
             + NOTIFICATION_SEQUENCE_LOCK_MAX_RETRIES.name()),

http://git-wip-us.apache.org/repos/asf/hive/blob/dbb2d617/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java
----------------------------------------------------------------------
diff --git a/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java b/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java
index ed1c9bc..2f27c3c 100644
--- a/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java
+++ b/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java
@@ -8588,6 +8588,9 @@ public class ObjectStore implements RawStore, Configurable {
         }
       }
     }
+    public long getSleepInterval() {
+      return sleepInterval;
+    }
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/hive/blob/dbb2d617/metastore/src/test/org/apache/hadoop/hive/metastore/TestObjectStore.java
----------------------------------------------------------------------
diff --git a/metastore/src/test/org/apache/hadoop/hive/metastore/TestObjectStore.java b/metastore/src/test/org/apache/hadoop/hive/metastore/TestObjectStore.java
index 7882dad..64b2c70 100644
--- a/metastore/src/test/org/apache/hadoop/hive/metastore/TestObjectStore.java
+++ b/metastore/src/test/org/apache/hadoop/hive/metastore/TestObjectStore.java
@@ -21,6 +21,7 @@ package org.apache.hadoop.hive.metastore;
 import com.codahale.metrics.Counter;
 import com.google.common.collect.ImmutableList;
 import org.apache.hadoop.hive.conf.HiveConf;
+import org.apache.hadoop.hive.metastore.ObjectStore.RetryingExecutor;
 import org.apache.hadoop.hive.metastore.api.CurrentNotificationEventId;
 import org.apache.hadoop.hive.metastore.api.Database;
 import org.apache.hadoop.hive.metastore.api.FieldSchema;
@@ -556,4 +557,11 @@ public class TestObjectStore {
       previousId = event.getEventId();
     }
   }
+
+  @Test
+  public void testRetryingExecutorSleep() throws Exception {
+    RetryingExecutor re = new ObjectStore.RetryingExecutor(new HiveConf(), null);
+    assertTrue("invalid sleep value", re.getSleepInterval() >= 0);
+  }
+
 }