ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jai...@apache.org
Subject git commit: AMBARI-4447. Hive and WebHcat won't start with 2.0.6.GlusterFS stack. (Erin and Jaimin)
Date Mon, 03 Feb 2014 23:45:56 GMT
Updated Branches:
  refs/heads/branch-1.4.4 6b22c2737 -> 23cc2bc30


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


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/23cc2bc3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/23cc2bc3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/23cc2bc3

Branch: refs/heads/branch-1.4.4
Commit: 23cc2bc302280aaf769a6ec0d8fbb608e4e2299d
Parents: 6b22c27
Author: Jaimin Jetly <jaimin@hortonworks.com>
Authored: Mon Feb 3 15:44:34 2014 -0800
Committer: Jaimin Jetly <jaimin@hortonworks.com>
Committed: Mon Feb 3 15:44:34 2014 -0800

----------------------------------------------------------------------
 .../GLUSTERFS/configuration/core-site.xml       |  5 +++
 .../services/GLUSTERFS/configuration/global.xml | 35 ++++++++++++++++++++
 .../services/GLUSTERFS/metainfo.xml             |  1 +
 .../services/HBASE/configuration/hbase-site.xml |  2 +-
 .../WEBHCAT/configuration/webhcat-site.xml      |  8 ++---
 ambari-web/app/data/HDP2/global_properties.js   | 13 ++++++++
 ambari-web/app/data/global_properties.js        | 12 +++++++
 7 files changed, 71 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/23cc2bc3/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/core-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/core-site.xml
b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/core-site.xml
index 8c1c103..051ce27 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/core-site.xml
+++ b/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
   buffered during read and write operations.</description>
   </property>
+ <property>
+    <name>hadoop_heapsize</name>
+    <value>1024</value>
+    <description>Hadoop maximum Java heap size</description>
+  </property>
 
   <property>
     <name>io.serializations</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/23cc2bc3/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/global.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/global.xml
b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/global.xml
new file mode 100644
index 0000000..99d493c
--- /dev/null
+++ b/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>

http://git-wip-us.apache.org/repos/asf/ambari/blob/23cc2bc3/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/metainfo.xml
b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/metainfo.xml
index a8f6a43..4ac5125 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/metainfo.xml
@@ -27,5 +27,6 @@
     </components>
     <configuration-dependencies>
       <config-type>core-site</config-type>
+      <config-type>global</config-type>
     </configuration-dependencies>
 </metainfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/23cc2bc3/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HBASE/configuration/hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HBASE/configuration/hbase-site.xml
b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HBASE/configuration/hbase-site.xml
index bf4af7d..303a74c 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HBASE/configuration/hbase-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HBASE/configuration/hbase-site.xml
@@ -22,7 +22,7 @@
 <configuration>
   <property>
     <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
     which HBase persists.  The URL should be 'fully-qualified'
     to include the filesystem scheme.  For example, to specify the

http://git-wip-us.apache.org/repos/asf/ambari/blob/23cc2bc3/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/WEBHCAT/configuration/webhcat-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/WEBHCAT/configuration/webhcat-site.xml
b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/WEBHCAT/configuration/webhcat-site.xml
index 39b901e..8c5eb63 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/WEBHCAT/configuration/webhcat-site.xml
+++ b/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>
     <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>
   </property>
 
@@ -74,7 +74,7 @@ limitations under the License.
 
   <property>
     <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>
   </property>
 
@@ -113,8 +113,8 @@ limitations under the License.
 
  <property>
     <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>

http://git-wip-us.apache.org/repos/asf/ambari/blob/23cc2bc3/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 33f3c2a..3c3778b 100644
--- a/ambari-web/app/data/HDP2/global_properties.js
+++ b/ambari-web/app/data/HDP2/global_properties.js
@@ -582,6 +582,19 @@ module.exports =
             "serviceName": "GLUSTERFS",
             "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***************************************/
     {

http://git-wip-us.apache.org/repos/asf/ambari/blob/23cc2bc3/ambari-web/app/data/global_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/global_properties.js b/ambari-web/app/data/global_properties.js
index 4bd3c42..a31d8d8 100644
--- a/ambari-web/app/data/global_properties.js
+++ b/ambari-web/app/data/global_properties.js
@@ -332,6 +332,18 @@ module.exports =
             "serviceName": "GLUSTERFS",
             "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***************************************/
     {
       "id": "puppet var",


Mime
View raw message