Return-Path: 
 <commits-return-6252-apmail-ambari-commits-archive=ambari.apache.org@ambari.apache.org>
X-Original-To: apmail-ambari-commits-archive@www.apache.org
Delivered-To: apmail-ambari-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 2FA621033D
	for <apmail-ambari-commits-archive@www.apache.org>;
 Thu, 30 Jan 2014 23:44:40 +0000 (UTC)
Received: (qmail 53531 invoked by uid 500); 30 Jan 2014 23:44:37 -0000
Delivered-To: apmail-ambari-commits-archive@ambari.apache.org
Received: (qmail 53424 invoked by uid 500); 30 Jan 2014 23:44:35 -0000
Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@ambari.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@ambari.apache.org>
List-Post: <mailto:commits@ambari.apache.org>
List-Id: <commits.ambari.apache.org>
Reply-To: ambari-dev@ambari.apache.org
Delivered-To: mailing list commits@ambari.apache.org
Received: (qmail 53275 invoked by uid 99); 30 Jan 2014 23:44:33 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Jan 2014 23:44:33 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 2427B916B23; Thu, 30 Jan 2014 23:44:33 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: mahadev@apache.org
To: commits@ambari.apache.org
Date: Thu, 30 Jan 2014 23:44:37 -0000
Message-Id: <8ce9a7d434f040348e3f0cf8a9dca0dc@git.apache.org>
In-Reply-To: <88d7e017a08a4185ba519133745847f9@git.apache.org>
References: <88d7e017a08a4185ba519133745847f9@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [5/7] AMBARI-4479. Sync configs for core hadoop services for
 GlusterFS stack (Erin Boyd via mahadev)

http://git-wip-us.apache.org/repos/asf/ambari/blob/a013ff27/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/core-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/core-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/core-site.xml
index 7848da3..e244fc7 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/core-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/core-site.xml
@@ -50,7 +50,7 @@
   <property>
     <name>fs.defaultFS</name>
     <!-- cluster variant -->
-    <value></value>
+    <value>hdfs://localhost:8020</value>
     <description>The name of the default file system.  Either the
   literal string "local" or a host:port for NDFS.</description>
     <final>true</final>

http://git-wip-us.apache.org/repos/asf/ambari/blob/a013ff27/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/global.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/global.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/global.xml
index 59b68ac..49d66bb 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/global.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/global.xml
@@ -83,7 +83,7 @@
   </property>
   <property>
     <name>namenode_opt_maxnewsize</name>
-    <value>640</value>
+    <value>200</value>
     <description>NameNode maximum new generation size</description>
   </property>
   <property>

http://git-wip-us.apache.org/repos/asf/ambari/blob/a013ff27/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/hdfs-site.xml
index 79e0151..1a35848 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/hdfs-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/hdfs-site.xml
@@ -27,7 +27,7 @@
   <property>
     <name>dfs.namenode.name.dir</name>
     <!-- cluster variant -->
-    <value></value>
+    <value>/hadoop/hdfs/namenode</value>
     <description>Determines where on the local filesystem the DFS name node
       should store the name table.  If this is a comma-delimited list
       of directories then the name table is replicated in all of the
@@ -45,20 +45,20 @@
   <property>
     <name>dfs.webhdfs.enabled</name>
     <value>true</value>
-    <description>to enable webhdfs</description>
+    <description>Whether to enable WebHDFS feature</description>
     <final>true</final>
   </property>
 
   <property>
     <name>dfs.datanode.failed.volumes.tolerated</name>
     <value>0</value>
-    <description>#of failed disks dn would tolerate</description>
+    <description> Number of failed disks a DataNode would tolerate before it stops offering service</description>
     <final>true</final>
   </property>
 
   <property>
     <name>dfs.datanode.data.dir</name>
-    <value></value>
+    <value>/hadoop/hdfs/data</value>
     <description>Determines where on the local filesystem an DFS data node
   should store its blocks.  If this is a comma-delimited
   list of directories, then data will be stored in all named
@@ -70,7 +70,7 @@
 
   <property>
     <name>dfs.hosts.exclude</name>
-    <value></value>
+    <value>/etc/hadoop/conf/dfs.exclude</value>
     <description>Names a file that contains a list of hosts that are
     not permitted to connect to the namenode.  The full pathname of the
     file must be specified.  If the value is empty, no hosts are
@@ -80,7 +80,7 @@
 <!--
   <property>
     <name>dfs.hosts</name>
-    <value></value>
+    <value>/etc/hadoop/conf/dfs.include</value>
     <description>Names a file that contains a list of hosts that are
     permitted to connect to the namenode. The full pathname of the file
     must be specified.  If the value is empty, all hosts are
@@ -90,7 +90,7 @@
 
   <property>
     <name>dfs.namenode.checkpoint.dir</name>
-    <value></value>
+    <value>/hadoop/hdfs/namesecondary</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
@@ -109,14 +109,23 @@
     </description>
   </property>
 
+
   <property>
     <name>dfs.namenode.checkpoint.period</name>
-    <value></value>
+    <value>21600</value>
     <description>The number of seconds between two periodic checkpoints.
     </description>
   </property>
 
   <property>
+    <name>fs.checkpoint.size</name>
+    <value>67108864</value>
+    <description>The size of the current edit log (in bytes) that triggers
+      a periodic checkpoint even if the maximum checkpoint delay is not reached
+    </description>
+  </property>
+
+  <property>
     <name>dfs.replication.max</name>
     <value>50</value>
     <description>Maximal block replication.
@@ -174,11 +183,17 @@
   <property>
     <name>dfs.datanode.address</name>
     <value>0.0.0.0:50010</value>
+    <description>
+      The datanode server address and port for data transfer.
+    </description>
   </property>
 
   <property>
     <name>dfs.datanode.http.address</name>
     <value>0.0.0.0:50075</value>
+    <description>
+      The datanode http server address and port.
+    </description>
   </property>
 
   <property>
@@ -189,7 +204,7 @@
 
   <property>
     <name>dfs.namenode.http-address</name>
-    <value></value>
+    <value>localhost:50070</value>
 <description>The name of the default file system.  Either the
 literal string "local" or a host:port for NDFS.</description>
 <final>true</final>
@@ -310,7 +325,7 @@ Kerberos principal name for the NameNode
   <property>
     <!-- cluster variant -->
     <name>dfs.namenode.secondary.http-address</name>
-    <value></value>
+    <value>localhost:50090</value>
     <description>Address of secondary namenode web server</description>
   </property>
 
@@ -367,7 +382,7 @@ Kerberos principal name for the NameNode
 
   <property>
     <name>dfs.namenode.https-address</name>
-    <value></value>
+    <value>localhost:50470</value>
   <description>The https address where namenode binds</description>
 
   </property>
@@ -472,4 +487,11 @@ don't exist, they will be created with this permission.</description>
     </description>
   </property>
 
+  <property>
+    <name>dfs.namenode.name.dir.restore</name>
+    <value>true</value>
+    <description>Set to true to enable NameNode to attempt recovering a previously failed dfs.namenode.name.dir.
+      When enabled, a recovery of any failed directory is attempted during checkpoint.</description>
+  </property>
+
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/a013ff27/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/metainfo.xml
index 564c2f4..2ca6c10 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/metainfo.xml
@@ -18,7 +18,7 @@
 <metainfo>
     <user>root</user>
     <comment>Apache Hadoop Distributed File System</comment>
-    <version>2.1.0.2.0.6.0</version>
+    <version>2.2.0.2.0.6.0</version>
 
     <components>
         <component>
@@ -51,5 +51,10 @@
           <category>SLAVE</category>
         </component>
     </components>
-    
+    <configuration-dependencies>
+      <config-type>core-site</config-type>
+      <config-type>global</config-type>
+      <config-type>hdfs-site</config-type>
+      <config-type>hadoop-policy</config-type>
+    </configuration-dependencies>
 </metainfo>