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 2015/05/05 17:49:00 UTC
ambari git commit: AMBARI-10912: Incorrect property name set in
hdfs-site.xml for NFS dump directory. (Brandon via Jaimin)
Repository: ambari
Updated Branches:
refs/heads/trunk 7492c33dd -> fb3bad867
AMBARI-10912: Incorrect property name set in hdfs-site.xml for NFS dump directory. (Brandon via Jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fb3bad86
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fb3bad86
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fb3bad86
Branch: refs/heads/trunk
Commit: fb3bad86767f430ce2606ed33e517ecc6ff87295
Parents: 7492c33
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Tue May 5 08:48:32 2015 -0700
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Tue May 5 08:48:32 2015 -0700
----------------------------------------------------------------------
.../stacks/HDP/2.3/services/HDFS/configuration/hdfs-site.xml | 2 +-
.../src/test/python/stacks/2.3/configs/hbase_default.json | 2 +-
ambari-server/src/test/python/stacks/2.3/configs/hbase_secure.json | 2 +-
ambari-web/app/data/HDP2/site_properties.js | 2 +-
ambari-web/test/utils/config_test.js | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/fb3bad86/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hdfs-site.xml
index 1a2855f..5f2db0c 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hdfs-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hdfs-site.xml
@@ -23,7 +23,7 @@
<configuration supports_final="true">
<property>
- <name>nfs.dump.dir</name>
+ <name>nfs.file.dump.dir</name>
<value>/tmp/.hdfs-nfs</value>
<description>
This directory is used to temporarily save out-of-order writes before
http://git-wip-us.apache.org/repos/asf/ambari/blob/fb3bad86/ambari-server/src/test/python/stacks/2.3/configs/hbase_default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.3/configs/hbase_default.json b/ambari-server/src/test/python/stacks/2.3/configs/hbase_default.json
index ebf126b..b1209d0 100644
--- a/ambari-server/src/test/python/stacks/2.3/configs/hbase_default.json
+++ b/ambari-server/src/test/python/stacks/2.3/configs/hbase_default.json
@@ -138,7 +138,7 @@
"hdfs-site": {
"dfs.namenode.checkpoint.period": "21600",
"dfs.namenode.avoid.write.stale.datanode": "true",
- "nfs.dump.dir": "/tmp/.hdfs-nfs",
+ "nfs.file.dump.dir": "/tmp/.hdfs-nfs",
"dfs.namenode.startup.delay.block.deletion.sec": "3600",
"dfs.namenode.checkpoint.txns": "1000000",
"dfs.block.access.token.enable": "true",
http://git-wip-us.apache.org/repos/asf/ambari/blob/fb3bad86/ambari-server/src/test/python/stacks/2.3/configs/hbase_secure.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.3/configs/hbase_secure.json b/ambari-server/src/test/python/stacks/2.3/configs/hbase_secure.json
index c67d6c4..99d5c78 100644
--- a/ambari-server/src/test/python/stacks/2.3/configs/hbase_secure.json
+++ b/ambari-server/src/test/python/stacks/2.3/configs/hbase_secure.json
@@ -255,7 +255,7 @@
"dfs.namenode.checkpoint.period": "21600",
"dfs.namenode.avoid.write.stale.datanode": "true",
"dfs.permissions.superusergroup": "hdfs",
- "nfs.dump.dir": "/tmp/.hdfs-nfs",
+ "nfs.file.dump.dir": "/tmp/.hdfs-nfs",
"dfs.namenode.startup.delay.block.deletion.sec": "3600",
"dfs.namenode.kerberos.internal.spnego.principal": "HTTP/_HOST@EXAMPLE.COM",
"dfs.datanode.kerberos.principal": "dn/_HOST@EXAMPLE.COM",
http://git-wip-us.apache.org/repos/asf/ambari/blob/fb3bad86/ambari-web/app/data/HDP2/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js
index a35104e..ae6051f 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -112,7 +112,7 @@ var hdp2properties = [
},
{
"id": "site property",
- "name": "nfs.dump.dir",
+ "name": "nfs.file.dump.dir",
"displayName": "NFSGateway dump directory",
"defaultDirectory": "/tmp/.hdfs-nfs",
"displayType": "directory",
http://git-wip-us.apache.org/repos/asf/ambari/blob/fb3bad86/ambari-web/test/utils/config_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/utils/config_test.js b/ambari-web/test/utils/config_test.js
index d529560..a961743 100644
--- a/ambari-web/test/utils/config_test.js
+++ b/ambari-web/test/utils/config_test.js
@@ -432,7 +432,7 @@ describe('App.config', function () {
});
describe('#preDefinedSiteProperties-stack-attribute', function() {
- var HDP23Only = ['nfs.dump.dir', 'nfs.exports.allowed.hosts', 'nimbus.seeds'];
+ var HDP23Only = ['nfs.file.dump.dir', 'nfs.exports.allowed.hosts', 'nimbus.seeds'];
it('should ignore properties that not belongs to stack HDP - 2.2', function() {
setups.setupStackVersion(this, 'HDP-2.2');
expect(App.config.get('preDefinedSiteProperties').mapProperty('name')).to.not.include.members(HDP23Only);