You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ma...@apache.org on 2013/08/09 21:43:38 UTC
git commit: AMBARI-2860. hdfs-site.xml should be generated in
/etc/hbase/conf with additional properties. (Dmitry Sen via mahadev)
Updated Branches:
refs/heads/trunk cdb67e8ff -> 2328e7254
AMBARI-2860. hdfs-site.xml should be generated in /etc/hbase/conf with additional properties. (Dmitry Sen via mahadev)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/2328e725
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/2328e725
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/2328e725
Branch: refs/heads/trunk
Commit: 2328e72545e43c5b7f8574e5c03066379d8cb6a1
Parents: cdb67e8
Author: Mahadev Konar <ma...@apache.org>
Authored: Fri Aug 9 12:40:53 2013 -0700
Committer: Mahadev Konar <ma...@apache.org>
Committed: Fri Aug 9 12:40:53 2013 -0700
----------------------------------------------------------------------
.../puppet/modules/hdp-hbase/manifests/init.pp | 16 +++++++++
.../services/HBASE/configuration/hbase-site.xml | 15 ---------
.../services/HDFS/configuration/hdfs-site.xml | 34 ++++++++++++++++++--
.../services/HBASE/configuration/hbase-site.xml | 14 --------
.../services/HDFS/configuration/hdfs-site.xml | 32 ++++++++++++++++++
.../configurations/cluster_level_configs.json | 6 ++--
ambari-web/app/data/HDP2/config_mapping.js | 2 +-
7 files changed, 84 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/2328e725/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/init.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/init.pp b/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/init.pp
index ff5f3a4..66d3a4f 100644
--- a/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/init.pp
+++ b/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/init.pp
@@ -49,6 +49,22 @@ class hdp-hbase(
}
}
+ if has_key($configuration, 'hdfs-site') {
+ configgenerator::configfile{'hdfs-site':
+ modulespath => $hdp-hbase::params::conf_dir,
+ filename => 'hdfs-site.xml',
+ module => 'hdp-hbase',
+ configuration => $configuration['hdfs-site'],
+ owner => $hbase_user,
+ group => $hdp::params::user_group
+ }
+ } else { # Manually overriding ownership of file installed by hadoop package
+ file { "${hdp-hbase::params::conf_dir}/hdfs-site.xml":
+ owner => $hbase_user,
+ group => $hdp::params::user_group
+ }
+ }
+
if has_key($configuration, 'hbase-policy') {
configgenerator::configfile{'hbase-policy':
modulespath => $hdp-hbase::params::conf_dir,
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/2328e725/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/HBASE/configuration/hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/HBASE/configuration/hbase-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/HBASE/configuration/hbase-site.xml
index ecd9e50..4244bbc 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/HBASE/configuration/hbase-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/HBASE/configuration/hbase-site.xml
@@ -328,21 +328,6 @@
</property>
<property>
- <name>dfs.client.read.shortcircuit</name>
- <value></value>
- <description>Enable/Disable short circuit read for your client.
- Hadoop servers should be configured to allow short circuit read
- for the hbase user for this to take effect
- </description>
- </property>
-
- <property>
- <name>dfs.client.read.shortcircuit.skip.checksum</name>
- <value></value>
- <description>Enable/disbale skipping the checksum check</description>
- </property>
-
- <property>
<name>hbase.zookeeper.useMulti</name>
<value>true</value>
<description>Instructs HBase to make use of ZooKeeper's multi-update functionality.
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/2328e725/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 b7d6f0e..d5d0106 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
@@ -468,7 +468,37 @@ don't exist, they will be created with this permission.</description>
<value>/grid/0/hdfs/journal</value>
<description>The path where the JournalNode daemon will store its local state. </description>
</property>
-
-
+
+ <!-- HDFS Short-Circuit Local Reads -->
+
+ <property>
+ <name>dfs.client.read.shortcircuit</name>
+ <value>true</value>
+ <description>
+ This configuration parameter turns on short-circuit local reads.
+ </description>
+ </property>
+
+ <property>
+ <name>dfs.client.read.shortcircuit.skip.checksum</name>
+ <value></value>
+ <description>Enable/disbale skipping the checksum check</description>
+ </property>
+
+ <property>
+ <name>dfs.domain.socket.path</name>
+ <value>/var/lib/hadoop-hdfs/dn_socket</value>
+ </property>
+
+ <property>
+ <name>dfs.client.read.shortcircuit.streams.cache.size</name>
+ <value>4096</value>
+ <description>
+ The DFSClient maintains a cache of recently opened file descriptors. This
+ parameter controls the size of that cache. Setting this higher will use
+ more file descriptors, but potentially provide better performance on
+ workloads involving lots of seeks.
+ </description>
+ </property>
</configuration>
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/2328e725/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/HBASE/configuration/hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/HBASE/configuration/hbase-site.xml b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/HBASE/configuration/hbase-site.xml
index ecd9e50..9a8d738 100644
--- a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/HBASE/configuration/hbase-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/HBASE/configuration/hbase-site.xml
@@ -327,22 +327,8 @@
</description>
</property>
- <property>
- <name>dfs.client.read.shortcircuit</name>
- <value></value>
- <description>Enable/Disable short circuit read for your client.
- Hadoop servers should be configured to allow short circuit read
- for the hbase user for this to take effect
- </description>
- </property>
<property>
- <name>dfs.client.read.shortcircuit.skip.checksum</name>
- <value></value>
- <description>Enable/disbale skipping the checksum check</description>
- </property>
-
- <property>
<name>hbase.zookeeper.useMulti</name>
<value>true</value>
<description>Instructs HBase to make use of ZooKeeper's multi-update functionality.
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/2328e725/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 db08e2a..820a164 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
@@ -456,4 +456,36 @@ don't exist, they will be created with this permission.</description>
<description>Datanode is stale after not getting a heartbeat in this interval in ms</description>
</property>
+ <!-- HDFS Short-Circuit Local Reads -->
+
+ <property>
+ <name>dfs.client.read.shortcircuit</name>
+ <value>true</value>
+ <description>
+ This configuration parameter turns on short-circuit local reads.
+ </description>
+ </property>
+
+ <property>
+ <name>dfs.client.read.shortcircuit.skip.checksum</name>
+ <value></value>
+ <description>Enable/disbale skipping the checksum check</description>
+ </property>
+
+ <property>
+ <name>dfs.domain.socket.path</name>
+ <value>/var/lib/hadoop-hdfs/dn_socket</value>
+ </property>
+
+ <property>
+ <name>dfs.client.read.shortcircuit.streams.cache.size</name>
+ <value>4096</value>
+ <description>
+ The DFSClient maintains a cache of recently opened file descriptors. This
+ parameter controls the size of that cache. Setting this higher will use
+ more file descriptors, but potentially provide better performance on
+ workloads involving lots of seeks.
+ </description>
+ </property>
+
</configuration>
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/2328e725/ambari-web/app/assets/data/configurations/cluster_level_configs.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/configurations/cluster_level_configs.json b/ambari-web/app/assets/data/configurations/cluster_level_configs.json
index d56dc4b..b68bcc7 100644
--- a/ambari-web/app/assets/data/configurations/cluster_level_configs.json
+++ b/ambari-web/app/assets/data/configurations/cluster_level_configs.json
@@ -296,6 +296,8 @@
"dfs.hosts" : "/etc/hadoop/dfs.include",
"dfs.block.local-path-access.user" : "hbase",
"dfs.namenode.kerberos.principal" : "nn/_HOST@EXAMPLE.COM"
+ "dfs.client.read.shortcircuit.skip.checksum" : "false",
+ "dfs.client.read.shortcircuit" : "true",
}
},
{
@@ -353,13 +355,11 @@
"hfile.block.cache.size" : "0.25",
"hbase.hregion.max.filesize" : "1073741824",
"hbase.master.lease.thread.wakefrequency" : "3000",
- "dfs.client.read.shortcircuit.skip.checksum" : "false",
"hbase.hregion.memstore.block.multiplier" : "2",
"hbase.master.kerberos.principal" : "hm/_HOST@EXAMPLE.COM",
"hbase.zookeeper.property.clientPort" : "2181",
"zookeeper.session.timeout" : "60000",
"hbase.master.keytab.file" : "/etc/security/keytabs/hm.service.keytab",
- "dfs.client.read.shortcircuit" : "true",
"hbase.zookeeper.quorum" : "dev.hortonworks.com"
}
},
@@ -550,4 +550,4 @@
}
}
]
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/2328e725/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 d3e7863..8c303b9 100644
--- a/ambari-web/app/data/HDP2/config_mapping.js
+++ b/ambari-web/app/data/HDP2/config_mapping.js
@@ -624,7 +624,7 @@ var configs = [
"templateName": ["hdfs_enable_shortcircuit_read"],
"foreignKey": null,
"value": "<templateName[0]>",
- "filename": "hbase-site.xml"
+ "filename": "hdfs-site.xml"
},
{
"name": "hbase.security.authentication",