incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jai...@apache.org
Subject git commit: AMBARI-3176: hbase.tmp.dir setting should not be configured under /grid/0/var/log. (jaimin)
Date Tue, 10 Sep 2013 22:18:12 GMT
Updated Branches:
  refs/heads/trunk b105d51bd -> 01659c224


AMBARI-3176: hbase.tmp.dir setting should not be configured under /grid/0/var/log. (jaimin)


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

Branch: refs/heads/trunk
Commit: 01659c22427cfe389678092f011984edeb3562de
Parents: b105d51
Author: Jaimin Jetly <jaimin@hortonworks.com>
Authored: Tue Sep 10 15:17:12 2013 -0700
Committer: Jaimin Jetly <jaimin@hortonworks.com>
Committed: Tue Sep 10 15:17:25 2013 -0700

----------------------------------------------------------------------
 .../HDP/1.3.0/services/HBASE/configuration/global.xml  |  5 -----
 .../HDP/1.3.2/services/HBASE/configuration/global.xml  |  5 -----
 .../HDP/2.0.5/services/HBASE/configuration/global.xml  |  5 -----
 .../1.3.0/services/HBASE/configuration/global.xml      |  5 -----
 .../1.3.2/services/HBASE/configuration/global.xml      |  5 -----
 .../2.0.5/services/HBASE/configuration/global.xml      |  5 -----
 ambari-web/app/data/HDP2/global_properties.js          | 13 ++++++-------
 ambari-web/app/data/global_properties.js               | 13 ++++++-------
 ambari-web/app/models/service_config.js                |  7 +++++++
 9 files changed, 19 insertions(+), 44 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/01659c22/ambari-server/src/main/resources/stacks/HDP/1.3.0/services/HBASE/configuration/global.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.0/services/HBASE/configuration/global.xml
b/ambari-server/src/main/resources/stacks/HDP/1.3.0/services/HBASE/configuration/global.xml
index 82996b0..bc8a7d3 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.0/services/HBASE/configuration/global.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.0/services/HBASE/configuration/global.xml
@@ -111,11 +111,6 @@
     <value>/apps/hbase/data</value>
     <description>HBase Relative Path to HDFS.</description>
   </property>
-    <property>
-    <name>hbase_tmp_dir</name>
-    <value>/var/log/hbase</value>
-    <description>Hbase temp directory</description>
-  </property>
    <property>
     <name>hbase_conf_dir</name>
     <value>/etc/hbase</value>

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/01659c22/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/configuration/global.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/configuration/global.xml
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/configuration/global.xml
index 82996b0..bc8a7d3 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/configuration/global.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/configuration/global.xml
@@ -111,11 +111,6 @@
     <value>/apps/hbase/data</value>
     <description>HBase Relative Path to HDFS.</description>
   </property>
-    <property>
-    <name>hbase_tmp_dir</name>
-    <value>/var/log/hbase</value>
-    <description>Hbase temp directory</description>
-  </property>
    <property>
     <name>hbase_conf_dir</name>
     <value>/etc/hbase</value>

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/01659c22/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/HBASE/configuration/global.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/HBASE/configuration/global.xml
b/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/HBASE/configuration/global.xml
index 82996b0..bc8a7d3 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/HBASE/configuration/global.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/HBASE/configuration/global.xml
@@ -111,11 +111,6 @@
     <value>/apps/hbase/data</value>
     <description>HBase Relative Path to HDFS.</description>
   </property>
-    <property>
-    <name>hbase_tmp_dir</name>
-    <value>/var/log/hbase</value>
-    <description>Hbase temp directory</description>
-  </property>
    <property>
     <name>hbase_conf_dir</name>
     <value>/etc/hbase</value>

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/01659c22/ambari-server/src/main/resources/stacks/HDPLocal/1.3.0/services/HBASE/configuration/global.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPLocal/1.3.0/services/HBASE/configuration/global.xml
b/ambari-server/src/main/resources/stacks/HDPLocal/1.3.0/services/HBASE/configuration/global.xml
index 82996b0..bc8a7d3 100644
--- a/ambari-server/src/main/resources/stacks/HDPLocal/1.3.0/services/HBASE/configuration/global.xml
+++ b/ambari-server/src/main/resources/stacks/HDPLocal/1.3.0/services/HBASE/configuration/global.xml
@@ -111,11 +111,6 @@
     <value>/apps/hbase/data</value>
     <description>HBase Relative Path to HDFS.</description>
   </property>
-    <property>
-    <name>hbase_tmp_dir</name>
-    <value>/var/log/hbase</value>
-    <description>Hbase temp directory</description>
-  </property>
    <property>
     <name>hbase_conf_dir</name>
     <value>/etc/hbase</value>

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/01659c22/ambari-server/src/main/resources/stacks/HDPLocal/1.3.2/services/HBASE/configuration/global.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPLocal/1.3.2/services/HBASE/configuration/global.xml
b/ambari-server/src/main/resources/stacks/HDPLocal/1.3.2/services/HBASE/configuration/global.xml
index 82996b0..bc8a7d3 100644
--- a/ambari-server/src/main/resources/stacks/HDPLocal/1.3.2/services/HBASE/configuration/global.xml
+++ b/ambari-server/src/main/resources/stacks/HDPLocal/1.3.2/services/HBASE/configuration/global.xml
@@ -111,11 +111,6 @@
     <value>/apps/hbase/data</value>
     <description>HBase Relative Path to HDFS.</description>
   </property>
-    <property>
-    <name>hbase_tmp_dir</name>
-    <value>/var/log/hbase</value>
-    <description>Hbase temp directory</description>
-  </property>
    <property>
     <name>hbase_conf_dir</name>
     <value>/etc/hbase</value>

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/01659c22/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/HBASE/configuration/global.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/HBASE/configuration/global.xml
b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/HBASE/configuration/global.xml
index 82996b0..bc8a7d3 100644
--- a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/HBASE/configuration/global.xml
+++ b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/HBASE/configuration/global.xml
@@ -111,11 +111,6 @@
     <value>/apps/hbase/data</value>
     <description>HBase Relative Path to HDFS.</description>
   </property>
-    <property>
-    <name>hbase_tmp_dir</name>
-    <value>/var/log/hbase</value>
-    <description>Hbase temp directory</description>
-  </property>
    <property>
     <name>hbase_conf_dir</name>
     <value>/etc/hbase</value>

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/01659c22/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 36f2a61..71fff58 100644
--- a/ambari-web/app/data/HDP2/global_properties.js
+++ b/ambari-web/app/data/HDP2/global_properties.js
@@ -972,13 +972,12 @@ module.exports =
     {
       "id": "puppet var",
       "name": "hbase_tmp_dir",
-      "displayName": "Hbase temp directory",
-      "description": "",
-      "defaultValue": "/var/log/hbase",
-      "isRequired": false,
-      "displayType": "advanced",
-      "isVisible": false,
-      "domain": "global",
+      "displayName": "HBase local directory",
+      "description": "Temporary directory on the local filesystem",
+      "defaultDirectory": "/hadoop/hbase",
+      "defaultValue": "",
+      "displayType": "directory",
+      "isVisible": true,
       "serviceName": "HBASE",
       "category": "Advanced"
     },

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/01659c22/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 2b9047d..5b3e3fc 100644
--- a/ambari-web/app/data/global_properties.js
+++ b/ambari-web/app/data/global_properties.js
@@ -1152,13 +1152,12 @@ module.exports =
     {
       "id": "puppet var",
       "name": "hbase_tmp_dir",
-      "displayName": "Hbase temp directory",
-      "description": "",
-      "defaultValue": "/var/log/hbase",
-      "isRequired": false,
-      "displayType": "advanced",
-      "isVisible": false,
-      "domain": "global",
+      "displayName": "HBase local directory",
+      "description": "Temporary directory on the local filesystem",
+      "defaultDirectory": "/hadoop/hbase",
+      "defaultValue": "",
+      "displayType": "directory",
+      "isVisible": true,
       "serviceName": "HBASE",
       "category": "Advanced"
     },

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/01659c22/ambari-web/app/models/service_config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/service_config.js b/ambari-web/app/models/service_config.js
index 8314d91..99541d4 100644
--- a/ambari-web/app/models/service_config.js
+++ b/ambari-web/app/models/service_config.js
@@ -298,6 +298,7 @@ App.ServiceConfigProperty = Ember.Object.extend({
       case 'dfs_namenode_checkpoint_dir':
       case 'zk_data_dir':
       case 'oozie_data_dir':
+      case 'hbase_tmp_dir':
         this.unionAllMountPoints(isOnlyFirstOneNeeded, localDB);
         break;
     }
@@ -372,6 +373,12 @@ App.ServiceConfigProperty = Ember.Object.extend({
           setOfHostNames.push(component.hostName);
         }, this);
         break;
+      case 'hbase_tmp_dir':
+        var temp = slaveComponentHostsInDB.findProperty('componentName', 'HBASE_REGIONSERVER');
+        temp.hosts.forEach(function (host) {
+          setOfHostNames.push(host.hostName);
+        }, this);
+        break;
     }
 
     // In Add Host Wizard, if we did not select this slave component for any host, then we
don't process any further.


Mime
View raw message