[22/50] [abbrv] hadoop git commit: YARN-5718. TimelineClient (and other places in YARN) shouldn't over-write HDFS client retry settings which could cause unexpected behavior. Contributed by Junping Du
YARN-5718. TimelineClient (and other places in YARN) shouldn't over-write HDFS client retry settings which could cause unexpected behavior. Contributed by Junping Du. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b733a6f8 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b733a6f8 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b733a6f8 Branch: refs/heads/HDFS-7240 Commit: b733a6f86262522e535cebc972baecbe6a6eab50 Parents: b154d3e Author: Xuan Authored: Tue Oct 18 11:04:49 2016 -0700 Committer: Xuan Committed: Tue Oct 18 11:06:47 2016 -0700 -- .../hadoop/yarn/conf/YarnConfiguration.java | 17 + .../api/impl/FileSystemTimelineWriter.java | 7 --- .../nodelabels/FileSystemNodeLabelsStore.java | 7 +-- .../src/main/resources/yarn-default.xml | 20 .../recovery/FileSystemRMStateStore.java| 5 - .../recovery/TestFSRMStateStore.java| 4 6 files changed, 2 insertions(+), 58 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b733a6f8/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java index 3bd0dcc..1a30c32 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java @@ -695,10 +695,6 @@ public class YarnConfiguration extends Configuration { /** URI for FileSystemRMStateStore */ public static final String FS_RM_STATE_STORE_URI = RM_PREFIX + "fs.state-store.uri"; - public static final String FS_RM_STATE_STORE_RETRY_POLICY_SPEC = RM_PREFIX - + "fs.state-store.retry-policy-spec"; - public static final String DEFAULT_FS_RM_STATE_STORE_RETRY_POLICY_SPEC = - "2000, 500"; public static final String FS_RM_STATE_STORE_NUM_RETRIES = RM_PREFIX + "fs.state-store.num-retries"; @@ -1974,13 +1970,6 @@ public class YarnConfiguration extends Configuration { TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_UNKNOWN_ACTIVE_SECONDS_DEFAULT = 24 * 60 * 60; - public static final String - TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_RETRY_POLICY_SPEC = - TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_PREFIX + "retry-policy-spec"; - public static final String - DEFAULT_TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_RETRY_POLICY_SPEC = - "2000, 500"; - public static final String TIMELINE_SERVICE_LEVELDB_CACHE_READ_CACHE_SIZE = TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_PREFIX + "leveldb-cache-read-cache-size"; @@ -2600,11 +2589,7 @@ public class YarnConfiguration extends Configuration { /** URI for NodeLabelManager */ public static final String FS_NODE_LABELS_STORE_ROOT_DIR = NODE_LABELS_PREFIX + "fs-store.root-dir"; - public static final String FS_NODE_LABELS_STORE_RETRY_POLICY_SPEC = - NODE_LABELS_PREFIX + "fs-store.retry-policy-spec"; - public static final String DEFAULT_FS_NODE_LABELS_STORE_RETRY_POLICY_SPEC = - "2000, 500"; - + /** * Flag to indicate if the node labels feature enabled, by default it's * disabled http://git-wip-us.apache.org/repos/asf/hadoop/blob/b733a6f8/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/FileSystemTimelineWriter.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/FileSystemTimelineWriter.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/FileSystemTimelineWriter.java index 55d6bd2..b1284e1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/FileSystemTimelineWriter.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/FileSystemTimelineWriter.java @@ -106,13 +106,6 @@ public class FileSystemTimelineWriter extends TimelineWriter{ super(authUgi, client, resURI); Configuration fsConf = new Configuration(conf); -fsConf.setBoolean("dfs.client.retry.policy.enabled", true); -String retryPolicy = -fsConf.get(YarnConfiguration. -TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_RETRY_POLICY_SPEC, - YarnConfigu
[44/50] [abbrv] hadoop git commit: YARN-5718. TimelineClient (and other places in YARN) shouldn't over-write HDFS client retry settings which could cause unexpected behavior. Contributed by Junping Du
YARN-5718. TimelineClient (and other places in YARN) shouldn't over-write HDFS client retry settings which could cause unexpected behavior. Contributed by Junping Du. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b733a6f8 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b733a6f8 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b733a6f8 Branch: refs/heads/HADOOP-13070 Commit: b733a6f86262522e535cebc972baecbe6a6eab50 Parents: b154d3e Author: Xuan Authored: Tue Oct 18 11:04:49 2016 -0700 Committer: Xuan Committed: Tue Oct 18 11:06:47 2016 -0700 -- .../hadoop/yarn/conf/YarnConfiguration.java | 17 + .../api/impl/FileSystemTimelineWriter.java | 7 --- .../nodelabels/FileSystemNodeLabelsStore.java | 7 +-- .../src/main/resources/yarn-default.xml | 20 .../recovery/FileSystemRMStateStore.java| 5 - .../recovery/TestFSRMStateStore.java| 4 6 files changed, 2 insertions(+), 58 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b733a6f8/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java index 3bd0dcc..1a30c32 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java @@ -695,10 +695,6 @@ public class YarnConfiguration extends Configuration { /** URI for FileSystemRMStateStore */ public static final String FS_RM_STATE_STORE_URI = RM_PREFIX + "fs.state-store.uri"; - public static final String FS_RM_STATE_STORE_RETRY_POLICY_SPEC = RM_PREFIX - + "fs.state-store.retry-policy-spec"; - public static final String DEFAULT_FS_RM_STATE_STORE_RETRY_POLICY_SPEC = - "2000, 500"; public static final String FS_RM_STATE_STORE_NUM_RETRIES = RM_PREFIX + "fs.state-store.num-retries"; @@ -1974,13 +1970,6 @@ public class YarnConfiguration extends Configuration { TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_UNKNOWN_ACTIVE_SECONDS_DEFAULT = 24 * 60 * 60; - public static final String - TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_RETRY_POLICY_SPEC = - TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_PREFIX + "retry-policy-spec"; - public static final String - DEFAULT_TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_RETRY_POLICY_SPEC = - "2000, 500"; - public static final String TIMELINE_SERVICE_LEVELDB_CACHE_READ_CACHE_SIZE = TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_PREFIX + "leveldb-cache-read-cache-size"; @@ -2600,11 +2589,7 @@ public class YarnConfiguration extends Configuration { /** URI for NodeLabelManager */ public static final String FS_NODE_LABELS_STORE_ROOT_DIR = NODE_LABELS_PREFIX + "fs-store.root-dir"; - public static final String FS_NODE_LABELS_STORE_RETRY_POLICY_SPEC = - NODE_LABELS_PREFIX + "fs-store.retry-policy-spec"; - public static final String DEFAULT_FS_NODE_LABELS_STORE_RETRY_POLICY_SPEC = - "2000, 500"; - + /** * Flag to indicate if the node labels feature enabled, by default it's * disabled http://git-wip-us.apache.org/repos/asf/hadoop/blob/b733a6f8/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/FileSystemTimelineWriter.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/FileSystemTimelineWriter.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/FileSystemTimelineWriter.java index 55d6bd2..b1284e1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/FileSystemTimelineWriter.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/FileSystemTimelineWriter.java @@ -106,13 +106,6 @@ public class FileSystemTimelineWriter extends TimelineWriter{ super(authUgi, client, resURI); Configuration fsConf = new Configuration(conf); -fsConf.setBoolean("dfs.client.retry.policy.enabled", true); -String retryPolicy = -fsConf.get(YarnConfiguration. -TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_RETRY_POLICY_SPEC, - YarnConf
hadoop git commit: YARN-5718. TimelineClient (and other places in YARN) shouldn't over-write HDFS client retry settings which could cause unexpected behavior. Contributed by Junping Du.
Repository: hadoop Updated Branches: refs/heads/trunk b154d3edc -> b733a6f86 YARN-5718. TimelineClient (and other places in YARN) shouldn't over-write HDFS client retry settings which could cause unexpected behavior. Contributed by Junping Du. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b733a6f8 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b733a6f8 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b733a6f8 Branch: refs/heads/trunk Commit: b733a6f86262522e535cebc972baecbe6a6eab50 Parents: b154d3e Author: Xuan Authored: Tue Oct 18 11:04:49 2016 -0700 Committer: Xuan Committed: Tue Oct 18 11:06:47 2016 -0700 -- .../hadoop/yarn/conf/YarnConfiguration.java | 17 + .../api/impl/FileSystemTimelineWriter.java | 7 --- .../nodelabels/FileSystemNodeLabelsStore.java | 7 +-- .../src/main/resources/yarn-default.xml | 20 .../recovery/FileSystemRMStateStore.java| 5 - .../recovery/TestFSRMStateStore.java| 4 6 files changed, 2 insertions(+), 58 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b733a6f8/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java index 3bd0dcc..1a30c32 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java @@ -695,10 +695,6 @@ public class YarnConfiguration extends Configuration { /** URI for FileSystemRMStateStore */ public static final String FS_RM_STATE_STORE_URI = RM_PREFIX + "fs.state-store.uri"; - public static final String FS_RM_STATE_STORE_RETRY_POLICY_SPEC = RM_PREFIX - + "fs.state-store.retry-policy-spec"; - public static final String DEFAULT_FS_RM_STATE_STORE_RETRY_POLICY_SPEC = - "2000, 500"; public static final String FS_RM_STATE_STORE_NUM_RETRIES = RM_PREFIX + "fs.state-store.num-retries"; @@ -1974,13 +1970,6 @@ public class YarnConfiguration extends Configuration { TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_UNKNOWN_ACTIVE_SECONDS_DEFAULT = 24 * 60 * 60; - public static final String - TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_RETRY_POLICY_SPEC = - TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_PREFIX + "retry-policy-spec"; - public static final String - DEFAULT_TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_RETRY_POLICY_SPEC = - "2000, 500"; - public static final String TIMELINE_SERVICE_LEVELDB_CACHE_READ_CACHE_SIZE = TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_PREFIX + "leveldb-cache-read-cache-size"; @@ -2600,11 +2589,7 @@ public class YarnConfiguration extends Configuration { /** URI for NodeLabelManager */ public static final String FS_NODE_LABELS_STORE_ROOT_DIR = NODE_LABELS_PREFIX + "fs-store.root-dir"; - public static final String FS_NODE_LABELS_STORE_RETRY_POLICY_SPEC = - NODE_LABELS_PREFIX + "fs-store.retry-policy-spec"; - public static final String DEFAULT_FS_NODE_LABELS_STORE_RETRY_POLICY_SPEC = - "2000, 500"; - + /** * Flag to indicate if the node labels feature enabled, by default it's * disabled http://git-wip-us.apache.org/repos/asf/hadoop/blob/b733a6f8/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/FileSystemTimelineWriter.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/FileSystemTimelineWriter.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/FileSystemTimelineWriter.java index 55d6bd2..b1284e1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/FileSystemTimelineWriter.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/FileSystemTimelineWriter.java @@ -106,13 +106,6 @@ public class FileSystemTimelineWriter extends TimelineWriter{ super(authUgi, client, resURI); Configuration fsConf = new Configuration(conf); -fsConf.setBoolean("dfs.client.retry.policy.enabled", true); -String retryPolicy = -fsConf.get(YarnConfiguration. -TI