Browse Source

AMBARI-4447. Hive and WebHcat won't start with 2.0.6.GlusterFS stack. (Erin and Jaimin)

Jaimin Jetly 11 years ago
parent
commit
9bf73024d1

+ 5 - 0
ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/core-site.xml

@@ -32,6 +32,11 @@
   page size (4096 on Intel x86), and it determines how much data is
   page size (4096 on Intel x86), and it determines how much data is
   buffered during read and write operations.</description>
   buffered during read and write operations.</description>
   </property>
   </property>
+ <property>
+    <name>hadoop_heapsize</name>
+    <value>1024</value>
+    <description>Hadoop maximum Java heap size</description>
+  </property>
 
 
   <property>
   <property>
     <name>io.serializations</name>
     <name>io.serializations</name>

+ 35 - 0
ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/global.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+<!--
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+
+<configuration>
+  <property>
+    <name>hadoop_pid_dir_prefix</name>
+    <value>/var/run/hadoop</value>
+    <description>Hadoop PID Dir Prefix</description>
+  </property>
+ <property>
+    <name>hadoop_heapsize</name>
+    <value>1024</value>
+    <description>Hadoop maximum Java heap size</description>
+  </property>
+  
+</configuration>

+ 1 - 0
ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/metainfo.xml

@@ -27,5 +27,6 @@
     </components>
     </components>
     <configuration-dependencies>
     <configuration-dependencies>
       <config-type>core-site</config-type>
       <config-type>core-site</config-type>
+      <config-type>global</config-type>
     </configuration-dependencies>
     </configuration-dependencies>
 </metainfo>
 </metainfo>

+ 1 - 1
ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HBASE/configuration/hbase-site.xml

@@ -22,7 +22,7 @@
 <configuration>
 <configuration>
   <property>
   <property>
     <name>hbase.rootdir</name>
     <name>hbase.rootdir</name>
-    <value>hdfs://localhost:8020/apps/hbase/data</value>
+    <value>glusterfs:///hbase</value>
     <description>The directory shared by region servers and into
     <description>The directory shared by region servers and into
     which HBase persists.  The URL should be 'fully-qualified'
     which HBase persists.  The URL should be 'fully-qualified'
     to include the filesystem scheme.  For example, to specify the
     to include the filesystem scheme.  For example, to specify the

+ 4 - 4
ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/WEBHCAT/configuration/webhcat-site.xml

@@ -56,7 +56,7 @@ limitations under the License.
 
 
   <property>
   <property>
     <name>templeton.pig.archive</name>
     <name>templeton.pig.archive</name>
-    <value>hdfs:///apps/webhcat/pig.tar.gz</value>
+    <value>glusterfs:///apps/webhcat/pig.tar.gz</value>
     <description>The path to the Pig archive.</description>
     <description>The path to the Pig archive.</description>
   </property>
   </property>
 
 
@@ -74,7 +74,7 @@ limitations under the License.
 
 
   <property>
   <property>
     <name>templeton.hive.archive</name>
     <name>templeton.hive.archive</name>
-    <value>hdfs:///apps/webhcat/hive.tar.gz</value>
+    <value>glusterfs:///apps/webhcat/hive.tar.gz</value>
     <description>The path to the Hive archive.</description>
     <description>The path to the Hive archive.</description>
   </property>
   </property>
 
 
@@ -113,8 +113,8 @@ limitations under the License.
 
 
  <property>
  <property>
     <name>templeton.streaming.jar</name>
     <name>templeton.streaming.jar</name>
-    <value>hdfs:///apps/webhcat/hadoop-streaming.jar</value>
-    <description>The hdfs path to the Hadoop streaming jar file.</description>
+    <value>glusterfs:///apps/webhcat/hadoop-streaming.jar</value>
+    <description>The glusterfs path to the Hadoop streaming jar file.</description>
   </property> 
   </property> 
 
 
   <property>
   <property>

+ 13 - 0
ambari-web/app/data/HDP2/global_properties.js

@@ -610,6 +610,19 @@ module.exports =
             "serviceName": "GLUSTERFS",
             "serviceName": "GLUSTERFS",
             "category": "General"
             "category": "General"
           },
           },
+          {
+            "id": "puppet var",
+            "name": "hadoop_heapsize",
+            "displayName": "Hadoop maximum Java heap size",
+            "description": "Maximum Java heap size for daemons such as Balancer (Java option -Xmx)",
+            "defaultValue": "1024",
+            "displayType": "int",
+            "unit": "MB",
+            "isVisible": true,
+            "domain": "global",
+            "serviceName": "GLUSTERFS",
+            "category": "General"
+          },
 
 
   /**********************************************HIVE***************************************/
   /**********************************************HIVE***************************************/
     {
     {

+ 12 - 0
ambari-web/app/data/global_properties.js

@@ -332,6 +332,18 @@ module.exports =
             "serviceName": "GLUSTERFS",
             "serviceName": "GLUSTERFS",
             "category": "General"
             "category": "General"
           },
           },
+          {
+            "id": "puppet var",
+            "name": "hadoop_heapsize",
+            "displayName": "Hadoop maximum Java heap size",
+            "description": "Maximum Java heap size for daemons such as Balancer (Java option -Xmx)",
+            "defaultValue": "1024",
+            "displayType": "int",
+            "unit": "MB",
+	          "isVisible": true,
+	          "serviceName": "GLUSTERFS",
+            "index": 1
+          },
   /**********************************************MAPREDUCE***************************************/
   /**********************************************MAPREDUCE***************************************/
     {
     {
       "id": "puppet var",
       "id": "puppet var",