You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2013/09/27 00:12:21 UTC
git commit: AMBARI-3354: checkpoint related property should be
defined in hdfs-site.xml instead of core-site.xml. (jaimin)
Updated Branches:
refs/heads/trunk e26590bc7 -> 91e36bfc7
AMBARI-3354: checkpoint related property should be defined in hdfs-site.xml instead of core-site.xml. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/91e36bfc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/91e36bfc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/91e36bfc
Branch: refs/heads/trunk
Commit: 91e36bfc78982748dc00d534d86c3373d3e8bcc8
Parents: e26590b
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Thu Sep 26 15:11:55 2013 -0700
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Thu Sep 26 15:12:07 2013 -0700
----------------------------------------------------------------------
.../services/HDFS/configuration/core-site.xml | 26 ------------------
.../services/HDFS/configuration/hdfs-site.xml | 27 +++++++++++++++++++
.../services/HDFS/configuration/core-site.xml | 28 --------------------
.../services/HDFS/configuration/hdfs-site.xml | 28 ++++++++++++++++++++
.../services/HDFS/configuration/core-site.xml | 27 -------------------
.../services/HDFS/configuration/hdfs-site.xml | 28 ++++++++++++++++++++
.../services/HDFS/configuration/core-site.xml | 28 --------------------
.../services/HDFS/configuration/hdfs-site.xml | 28 ++++++++++++++++++++
ambari-web/app/data/HDP2/config_mapping.js | 11 ++------
ambari-web/app/data/HDP2/global_properties.js | 2 +-
ambari-web/app/data/config_mapping.js | 7 -----
11 files changed, 114 insertions(+), 126 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/91e36bfc/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/HDFS/configuration/core-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/HDFS/configuration/core-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/HDFS/configuration/core-site.xml
index d9ca5e8..117d828 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/HDFS/configuration/core-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/HDFS/configuration/core-site.xml
@@ -64,33 +64,7 @@
</description>
</property>
- <property>
- <name>dfs.namenode.checkpoint.dir</name>
- <value></value>
- <description>Determines where on the local filesystem the DFS secondary
- name node should store the temporary images to merge.
- If this is a comma-delimited list of directories then the image is
- replicated in all of the directories for redundancy.
- </description>
- </property>
- <property>
- <name>dfs.namenode.checkpoint.edits.dir</name>
- <value>${dfs.namenode.checkpoint.dir}</value>
- <description>Determines where on the local filesystem the DFS secondary
- name node should store the temporary edits to merge.
- If this is a comma-delimited list of directoires then teh edits is
- replicated in all of the directoires for redundancy.
- Default value is same as dfs.namenode.checkpoint.dir
- </description>
- </property>
-
- <property>
- <name>dfs.namenode.checkpoint.period</name>
- <value>21600</value>
- <description>The number of seconds between two periodic checkpoints.
- </description>
- </property>
<!-- ipc properties: copied from kryptonite configuration -->
<property>
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/91e36bfc/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/HDFS/configuration/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/HDFS/configuration/hdfs-site.xml
index deb0e8c..b4121c4 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/HDFS/configuration/hdfs-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/HDFS/configuration/hdfs-site.xml
@@ -87,6 +87,33 @@
permitted.</description>
</property>
-->
+ <property>
+ <name>dfs.namenode.checkpoint.dir</name>
+ <value></value>
+ <description>Determines where on the local filesystem the DFS secondary
+ name node should store the temporary images to merge.
+ If this is a comma-delimited list of directories then the image is
+ replicated in all of the directories for redundancy.
+ </description>
+ </property>
+
+ <property>
+ <name>dfs.namenode.checkpoint.edits.dir</name>
+ <value>${dfs.namenode.checkpoint.dir}</value>
+ <description>Determines where on the local filesystem the DFS secondary
+ name node should store the temporary edits to merge.
+ If this is a comma-delimited list of directoires then teh edits is
+ replicated in all of the directoires for redundancy.
+ Default value is same as dfs.namenode.checkpoint.dir
+ </description>
+ </property>
+
+ <property>
+ <name>dfs.namenode.checkpoint.period</name>
+ <value></value>
+ <description>The number of seconds between two periodic checkpoints.
+ </description>
+ </property>
<property>
<name>dfs.replication.max</name>
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/91e36bfc/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/core-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/core-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/core-site.xml
index d9ca5e8..7848da3 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/core-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/core-site.xml
@@ -64,34 +64,6 @@
</description>
</property>
- <property>
- <name>dfs.namenode.checkpoint.dir</name>
- <value></value>
- <description>Determines where on the local filesystem the DFS secondary
- name node should store the temporary images to merge.
- If this is a comma-delimited list of directories then the image is
- replicated in all of the directories for redundancy.
- </description>
- </property>
-
- <property>
- <name>dfs.namenode.checkpoint.edits.dir</name>
- <value>${dfs.namenode.checkpoint.dir}</value>
- <description>Determines where on the local filesystem the DFS secondary
- name node should store the temporary edits to merge.
- If this is a comma-delimited list of directoires then teh edits is
- replicated in all of the directoires for redundancy.
- Default value is same as dfs.namenode.checkpoint.dir
- </description>
- </property>
-
- <property>
- <name>dfs.namenode.checkpoint.period</name>
- <value>21600</value>
- <description>The number of seconds between two periodic checkpoints.
- </description>
- </property>
-
<!-- ipc properties: copied from kryptonite configuration -->
<property>
<name>ipc.client.idlethreshold</name>
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/91e36bfc/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/hdfs-site.xml
index deb0e8c..69d59ef 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/hdfs-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/hdfs-site.xml
@@ -89,6 +89,34 @@
-->
<property>
+ <name>dfs.namenode.checkpoint.dir</name>
+ <value></value>
+ <description>Determines where on the local filesystem the DFS secondary
+ name node should store the temporary images to merge.
+ If this is a comma-delimited list of directories then the image is
+ replicated in all of the directories for redundancy.
+ </description>
+ </property>
+
+ <property>
+ <name>dfs.namenode.checkpoint.edits.dir</name>
+ <value>${dfs.namenode.checkpoint.dir}</value>
+ <description>Determines where on the local filesystem the DFS secondary
+ name node should store the temporary edits to merge.
+ If this is a comma-delimited list of directoires then teh edits is
+ replicated in all of the directoires for redundancy.
+ Default value is same as dfs.namenode.checkpoint.dir
+ </description>
+ </property>
+
+ <property>
+ <name>dfs.namenode.checkpoint.period</name>
+ <value></value>
+ <description>The number of seconds between two periodic checkpoints.
+ </description>
+ </property>
+
+ <property>
<name>dfs.replication.max</name>
<value>50</value>
<description>Maximal block replication.
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/91e36bfc/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/HDFS/configuration/core-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/HDFS/configuration/core-site.xml b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/HDFS/configuration/core-site.xml
index 7e6514d..c2f0411 100644
--- a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/HDFS/configuration/core-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/HDFS/configuration/core-site.xml
@@ -64,33 +64,6 @@
</description>
</property>
- <property>
- <name>dfs.namenode.checkpoint.dir</name>
- <value></value>
- <description>Determines where on the local filesystem the DFS secondary
- name node should store the temporary images to merge.
- If this is a comma-delimited list of directories then the image is
- replicated in all of the directories for redundancy.
- </description>
- </property>
-
- <property>
- <name>dfs.namenode.checkpoint.edits.dir</name>
- <value>${dfs.namenode.checkpoint.dir}</value>
- <description>Determines where on the local filesystem the DFS secondary
- name node should store the temporary edits to merge.
- If this is a comma-delimited list of directoires then teh edits is
- replicated in all of the directoires for redundancy.
- Default value is same as dfs.namenode.checkpoint.dir
- </description>
- </property>
-
- <property>
- <name>fs.checkpoint.period</name>
- <value>21600</value>
- <description>The number of seconds between two periodic checkpoints.
- </description>
- </property>
<!-- ipc properties: copied from kryptonite configuration -->
<property>
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/91e36bfc/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/HDFS/configuration/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/HDFS/configuration/hdfs-site.xml
index 71c176d..252e84c 100644
--- a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/HDFS/configuration/hdfs-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/HDFS/configuration/hdfs-site.xml
@@ -89,6 +89,34 @@
-->
<property>
+ <name>dfs.namenode.checkpoint.dir</name>
+ <value></value>
+ <description>Determines where on the local filesystem the DFS secondary
+ name node should store the temporary images to merge.
+ If this is a comma-delimited list of directories then the image is
+ replicated in all of the directories for redundancy.
+ </description>
+ </property>
+
+ <property>
+ <name>dfs.namenode.checkpoint.edits.dir</name>
+ <value>${dfs.namenode.checkpoint.dir}</value>
+ <description>Determines where on the local filesystem the DFS secondary
+ name node should store the temporary edits to merge.
+ If this is a comma-delimited list of directoires then teh edits is
+ replicated in all of the directoires for redundancy.
+ Default value is same as dfs.namenode.checkpoint.dir
+ </description>
+ </property>
+
+ <property>
+ <name>dfs.namenode.checkpoint.period</name>
+ <value></value>
+ <description>The number of seconds between two periodic checkpoints.
+ </description>
+ </property>
+
+ <property>
<name>dfs.replication.max</name>
<value>50</value>
<description>Maximal block replication.
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/91e36bfc/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/services/HDFS/configuration/core-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/services/HDFS/configuration/core-site.xml b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/services/HDFS/configuration/core-site.xml
index d9ca5e8..7848da3 100644
--- a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/services/HDFS/configuration/core-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/services/HDFS/configuration/core-site.xml
@@ -64,34 +64,6 @@
</description>
</property>
- <property>
- <name>dfs.namenode.checkpoint.dir</name>
- <value></value>
- <description>Determines where on the local filesystem the DFS secondary
- name node should store the temporary images to merge.
- If this is a comma-delimited list of directories then the image is
- replicated in all of the directories for redundancy.
- </description>
- </property>
-
- <property>
- <name>dfs.namenode.checkpoint.edits.dir</name>
- <value>${dfs.namenode.checkpoint.dir}</value>
- <description>Determines where on the local filesystem the DFS secondary
- name node should store the temporary edits to merge.
- If this is a comma-delimited list of directoires then teh edits is
- replicated in all of the directoires for redundancy.
- Default value is same as dfs.namenode.checkpoint.dir
- </description>
- </property>
-
- <property>
- <name>dfs.namenode.checkpoint.period</name>
- <value>21600</value>
- <description>The number of seconds between two periodic checkpoints.
- </description>
- </property>
-
<!-- ipc properties: copied from kryptonite configuration -->
<property>
<name>ipc.client.idlethreshold</name>
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/91e36bfc/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/services/HDFS/configuration/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/services/HDFS/configuration/hdfs-site.xml
index deb0e8c..69d59ef 100644
--- a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/services/HDFS/configuration/hdfs-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/services/HDFS/configuration/hdfs-site.xml
@@ -89,6 +89,34 @@
-->
<property>
+ <name>dfs.namenode.checkpoint.dir</name>
+ <value></value>
+ <description>Determines where on the local filesystem the DFS secondary
+ name node should store the temporary images to merge.
+ If this is a comma-delimited list of directories then the image is
+ replicated in all of the directories for redundancy.
+ </description>
+ </property>
+
+ <property>
+ <name>dfs.namenode.checkpoint.edits.dir</name>
+ <value>${dfs.namenode.checkpoint.dir}</value>
+ <description>Determines where on the local filesystem the DFS secondary
+ name node should store the temporary edits to merge.
+ If this is a comma-delimited list of directoires then teh edits is
+ replicated in all of the directoires for redundancy.
+ Default value is same as dfs.namenode.checkpoint.dir
+ </description>
+ </property>
+
+ <property>
+ <name>dfs.namenode.checkpoint.period</name>
+ <value></value>
+ <description>The number of seconds between two periodic checkpoints.
+ </description>
+ </property>
+
+ <property>
<name>dfs.replication.max</name>
<value>50</value>
<description>Maximal block replication.
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/91e36bfc/ambari-web/app/data/HDP2/config_mapping.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/config_mapping.js b/ambari-web/app/data/HDP2/config_mapping.js
index 9738fce..f33db51 100644
--- a/ambari-web/app/data/HDP2/config_mapping.js
+++ b/ambari-web/app/data/HDP2/config_mapping.js
@@ -30,14 +30,14 @@ var configs = [
"templateName": ["dfs_namenode_checkpoint_dir"],
"foreignKey": null,
"value": "<templateName[0]>",
- "filename": "core-site.xml"
+ "filename": "hdfs-site.xml"
},
{
"name": "dfs.namenode.checkpoint.period",
"templateName": ["dfs_namenode_checkpoint_period"],
"foreignKey": null,
"value": "<templateName[0]>",
- "filename": "core-site.xml"
+ "filename": "hdfs-site.xml"
},
{
"name": "fs.checkpoint.size",
@@ -47,13 +47,6 @@ var configs = [
"filename": "core-site.xml"
},
{
- "name": "fs.checkpoint.edits.dir",
- "templateName": ["dfs_namenode_checkpoint_dir"],
- "foreignKey": null,
- "value": "<templateName[0]>",
- "filename": "core-site.xml"
- },
- {
"name": "hadoop.proxyuser.<foreignKey[0]>.groups",
"templateName": ["proxyuser_group"],
"foreignKey": ["hive_user"],
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/91e36bfc/ambari-web/app/data/HDP2/global_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/global_properties.js b/ambari-web/app/data/HDP2/global_properties.js
index fd4bab8..dbbb35e 100644
--- a/ambari-web/app/data/HDP2/global_properties.js
+++ b/ambari-web/app/data/HDP2/global_properties.js
@@ -272,7 +272,7 @@ module.exports =
"unit": "seconds",
"isVisible": true,
"domain": "global",
- "filename": "core-site.xml",
+ "filename": "hdfs-site.xml",
"serviceName": "HDFS",
"index": 3
},
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/91e36bfc/ambari-web/app/data/config_mapping.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/config_mapping.js b/ambari-web/app/data/config_mapping.js
index 23fa85d..9603dfb 100644
--- a/ambari-web/app/data/config_mapping.js
+++ b/ambari-web/app/data/config_mapping.js
@@ -46,13 +46,6 @@ var configs = [
"filename": "core-site.xml"
},
{
- "name": "fs.checkpoint.edits.dir",
- "templateName": ["fs_checkpoint_dir"],
- "foreignKey": null,
- "value": "<templateName[0]>",
- "filename": "core-site.xml"
- },
- {
"name": "hadoop.proxyuser.<foreignKey[0]>.groups",
"templateName": ["proxyuser_group"],
"foreignKey": ["hive_user"],