Explorar o código

AMBARI-4026. hbase.rootdir property should be defined in server side stack definition. (jaimin)

Jaimin Jetly %!s(int64=11) %!d(string=hai) anos
pai
achega
6e9126297a

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

@@ -22,7 +22,7 @@
 <configuration>
 <configuration>
   <property>
   <property>
     <name>hbase.rootdir</name>
     <name>hbase.rootdir</name>
-    <value></value>
+    <value>hdfs://localhost:8020/apps/hbase/data</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

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

@@ -22,7 +22,7 @@
 <configuration>
 <configuration>
   <property>
   <property>
     <name>hbase.rootdir</name>
     <name>hbase.rootdir</name>
-    <value></value>
+    <value>hdfs://localhost:8020/apps/hbase/data</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

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

@@ -22,7 +22,7 @@
 <configuration>
 <configuration>
   <property>
   <property>
     <name>hbase.rootdir</name>
     <name>hbase.rootdir</name>
-    <value></value>
+    <value>hdfs://localhost:8020/apps/hbase/data</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

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

@@ -22,7 +22,7 @@
 <configuration>
 <configuration>
   <property>
   <property>
     <name>hbase.rootdir</name>
     <name>hbase.rootdir</name>
-    <value></value>
+    <value>hdfs://localhost:8020/apps/hbase/data</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

+ 0 - 10
ambari-web/app/data/HDP2/config_mapping.js

@@ -69,16 +69,6 @@ var configs = [
   },
   },
 
 
 /**********************************************hbase-site***************************************/
 /**********************************************hbase-site***************************************/
-  {
-    "name": "hbase.rootdir",
-    "templateName": ["namenode_host", "hbase_hdfs_root_dir"],
-    "foreignKey": null,
-    "value": "hdfs://<templateName[0]>:8020<templateName[1]>",
-    "precondition": function () {
-      return (App.HDFSService.find('HDFS') && App.HDFSService.find('HDFS').get('snameNode'));
-    },
-    "filename": "hbase-site.xml"
-  },
   {
   {
     "name": "hbase.zookeeper.quorum",
     "name": "hbase.zookeeper.quorum",
     "templateName": ["zookeeperserver_hosts"],
     "templateName": ["zookeeperserver_hosts"],

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

@@ -481,18 +481,6 @@ module.exports =
       "serviceName": "HBASE",
       "serviceName": "HBASE",
       "category": "Advanced"
       "category": "Advanced"
     },
     },
-    {
-      "id": "puppet var",
-      "name": "hbase_hdfs_root_dir",
-      "displayName": "Hbase relative path to HDFS",
-      "description": "Hbase relative directory to HDFS",
-      "defaultValue": "/apps/hbase/data",
-      "isRequired": true,
-      "displayType": "advanced",
-      "isVisible": false,
-      "serviceName": "HBASE",
-      "category": "Advanced"
-    },
   /**********************************************HIVE***************************************/
   /**********************************************HIVE***************************************/
     {
     {
       "id": "puppet var",
       "id": "puppet var",

+ 0 - 7
ambari-web/app/data/config_mapping.js

@@ -68,13 +68,6 @@ var configs = [
   },
   },
 
 
 /**********************************************hbase-site***************************************/
 /**********************************************hbase-site***************************************/
-  {
-    "name": "hbase.rootdir",
-    "templateName": ["namenode_host", "hbase_hdfs_root_dir"],
-    "foreignKey": null,
-    "value": "hdfs://<templateName[0]>:8020<templateName[1]>",
-    "filename": "hbase-site.xml"
-  },
   {
   {
     "name": "hbase.zookeeper.quorum",
     "name": "hbase.zookeeper.quorum",
     "templateName": ["zookeeperserver_hosts"],
     "templateName": ["zookeeperserver_hosts"],

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

@@ -525,18 +525,6 @@ module.exports =
       "serviceName": "HBASE",
       "serviceName": "HBASE",
       "category": "Advanced"
       "category": "Advanced"
     },
     },
-    {
-      "id": "puppet var",
-      "name": "hbase_hdfs_root_dir",
-      "displayName": "Hbase relative path to HDFS",
-      "description": "Hbase relative directory to HDFS",
-      "defaultValue": "/apps/hbase/data",
-      "isRequired": true,
-      "displayType": "advanced",
-      "isVisible": false,
-      "serviceName": "HBASE",
-      "category": "Advanced"
-    },
   /**********************************************HIVE***************************************/
   /**********************************************HIVE***************************************/
     {
     {
       "id": "puppet var",
       "id": "puppet var",

+ 4 - 0
ambari-web/app/models/service_config.js

@@ -269,6 +269,10 @@ App.ServiceConfigProperty = Ember.Object.extend({
         var nnHost = masterComponentHostsInDB.filterProperty('component', 'NAMENODE').mapProperty('hostName');
         var nnHost = masterComponentHostsInDB.filterProperty('component', 'NAMENODE').mapProperty('hostName');
         this.setDefaultValue(":\/\/(\\w*)(?=:)",'://' + nnHost);
         this.setDefaultValue(":\/\/(\\w*)(?=:)",'://' + nnHost);
         break;
         break;
+      case 'hbase.rootdir':
+        var nnHost = masterComponentHostsInDB.filterProperty('component', 'NAMENODE').mapProperty('hostName');
+        this.setDefaultValue(":\/\/(\\w*)(?=:)",'://' + nnHost);
+        break;
       case 'snamenode_host':
       case 'snamenode_host':
         // Secondary NameNode does not exist when NameNode HA is enabled
         // Secondary NameNode does not exist when NameNode HA is enabled
         var snn = masterComponentHostsInDB.findProperty('component', 'SECONDARY_NAMENODE');
         var snn = masterComponentHostsInDB.findProperty('component', 'SECONDARY_NAMENODE');