Repository: hive Updated Branches: refs/heads/master 3c70302a2 -> e8b87bfb0
HIVE-20761: Select for update on notification_sequence table has retry interval and retries count too small (Sankar Hariappan, reviewed by Thejas M Nair) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/e8b87bfb Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/e8b87bfb Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/e8b87bfb Branch: refs/heads/master Commit: e8b87bfb0f494f3bbe12a6a0f90829e81a8deee0 Parents: 3c70302 Author: Sankar Hariappan <sank...@apache.org> Authored: Thu Oct 18 10:06:03 2018 +0530 Committer: Sankar Hariappan <sank...@apache.org> Committed: Thu Oct 18 10:06:03 2018 +0530 ---------------------------------------------------------------------- common/src/java/org/apache/hadoop/hive/conf/HiveConf.java | 6 +++--- .../org/apache/hadoop/hive/metastore/conf/MetastoreConf.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/e8b87bfb/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 a458ac0..b600518 100644 --- a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java +++ b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java @@ -1116,15 +1116,15 @@ public class HiveConf extends Configuration { * @deprecated Use MetastoreConf.NOTIFICATION_SEQUENCE_LOCK_MAX_RETRIES */ @Deprecated - NOTIFICATION_SEQUENCE_LOCK_MAX_RETRIES("hive.notification.sequence.lock.max.retries", 5, + NOTIFICATION_SEQUENCE_LOCK_MAX_RETRIES("hive.notification.sequence.lock.max.retries", 10, "Number of retries required to acquire a lock when getting the next notification sequential ID for entries " + "in the NOTIFICATION_LOG table."), /** * @deprecated Use MetastoreConf.NOTIFICATION_SEQUENCE_LOCK_RETRY_SLEEP_INTERVAL */ @Deprecated - NOTIFICATION_SEQUENCE_LOCK_RETRY_SLEEP_INTERVAL("hive.notification.sequence.lock.retry.sleep.interval", 500L, - new TimeValidator(TimeUnit.MILLISECONDS), + NOTIFICATION_SEQUENCE_LOCK_RETRY_SLEEP_INTERVAL("hive.notification.sequence.lock.retry.sleep.interval", 10L, + new TimeValidator(TimeUnit.SECONDS), "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/e8b87bfb/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java index 7b01678..f180a15 100644 --- a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java +++ b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java @@ -658,12 +658,12 @@ public class MetastoreConf { "javax.jdo.option.NonTransactionalRead", true, "Reads outside of transactions"), NOTIFICATION_SEQUENCE_LOCK_MAX_RETRIES("metastore.notification.sequence.lock.max.retries", - "hive.notification.sequence.lock.max.retries", 5, + "hive.notification.sequence.lock.max.retries", 10, "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( "metastore.notification.sequence.lock.retry.sleep.interval", - "hive.notification.sequence.lock.retry.sleep.interval", 500, TimeUnit.MILLISECONDS, + "hive.notification.sequence.lock.retry.sleep.interval", 10, TimeUnit.SECONDS, "Sleep interval between retries to acquire a notification lock as described part of property " + NOTIFICATION_SEQUENCE_LOCK_MAX_RETRIES.name()), ORM_RETRIEVE_MAPNULLS_AS_EMPTY_STRINGS("metastore.orm.retrieveMapNullsAsEmptyStrings",
