Parcourir la source

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

Jaimin Jetly il y a 12 ans
Parent
commit
01659c2242

+ 0 - 5
ambari-server/src/main/resources/stacks/HDP/1.3.0/services/HBASE/configuration/global.xml

@@ -110,11 +110,6 @@
     <name>hbase_hdfs_root_dir</name>
     <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>

+ 0 - 5
ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/configuration/global.xml

@@ -110,11 +110,6 @@
     <name>hbase_hdfs_root_dir</name>
     <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>

+ 0 - 5
ambari-server/src/main/resources/stacks/HDP/2.0.5/services/HBASE/configuration/global.xml

@@ -110,11 +110,6 @@
     <name>hbase_hdfs_root_dir</name>
     <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>

+ 0 - 5
ambari-server/src/main/resources/stacks/HDPLocal/1.3.0/services/HBASE/configuration/global.xml

@@ -110,11 +110,6 @@
     <name>hbase_hdfs_root_dir</name>
     <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>

+ 0 - 5
ambari-server/src/main/resources/stacks/HDPLocal/1.3.2/services/HBASE/configuration/global.xml

@@ -110,11 +110,6 @@
     <name>hbase_hdfs_root_dir</name>
     <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>

+ 0 - 5
ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/HBASE/configuration/global.xml

@@ -110,11 +110,6 @@
     <name>hbase_hdfs_root_dir</name>
     <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>

+ 6 - 7
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"
     },

+ 6 - 7
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"
     },

+ 7 - 0
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.