ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexantone...@apache.org
Subject ambari git commit: Revert "AMBARI-9908 add quicklinks and host config substitution for accumulo (billie)"
Date Mon, 16 Mar 2015 16:53:27 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 8bba8c7e2 -> 7ff455102


Revert "AMBARI-9908 add quicklinks and host config substitution for accumulo (billie)"

This reverts commit 5796e12de7240dd47411eaa2f25be620b5dab2db.


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

Branch: refs/heads/trunk
Commit: 7ff455102bac70e6e85a8776f4d26615192e1f59
Parents: 8bba8c7
Author: Alex Antonenko <hiveww@gmail.com>
Authored: Mon Mar 16 18:52:41 2015 +0200
Committer: Alex Antonenko <hiveww@gmail.com>
Committed: Mon Mar 16 18:52:41 2015 +0200

----------------------------------------------------------------------
 ambari-web/app/controllers/main/host/details.js          |  3 ---
 .../main/service/reassign/step4_controller.js            |  3 ---
 ambari-web/app/mappers/service_metrics_mapper.js         |  3 +--
 ambari-web/app/models/quick_links.js                     | 11 -----------
 ambari-web/app/models/service_config.js                  |  5 -----
 ambari-web/app/views/common/quick_view_link_view.js      |  3 ---
 6 files changed, 1 insertion(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/7ff45510/ambari-web/app/controllers/main/host/details.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/host/details.js b/ambari-web/app/controllers/main/host/details.js
index e526b71..cb5c5b2 100644
--- a/ambari-web/app/controllers/main/host/details.js
+++ b/ambari-web/app/controllers/main/host/details.js
@@ -949,9 +949,6 @@ App.MainHostDetailsController = Em.Controller.extend({
     if (configs['hbase-site']) {
       configs['hbase-site']['hbase.zookeeper.quorum'] = zks.join(',');
     }
-    if (configs['accumulo-site']) {
-      configs['accumulo-site']['instance.zookeeper.host'] = zksWithPort;
-    }
     if (configs['webhcat-site']) {
       configs['webhcat-site']['templeton.zookeeper.hosts'] = zksWithPort;
     }

http://git-wip-us.apache.org/repos/asf/ambari/blob/7ff45510/ambari-web/app/controllers/main/service/reassign/step4_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/reassign/step4_controller.js b/ambari-web/app/controllers/main/service/reassign/step4_controller.js
index a8ea7ef..4a37f88 100644
--- a/ambari-web/app/controllers/main/service/reassign/step4_controller.js
+++ b/ambari-web/app/controllers/main/service/reassign/step4_controller.js
@@ -661,9 +661,6 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro
     if (!App.get('isHaEnabled') && App.Service.find('HBASE').get('isLoaded')) {
       configs['hbase-site']['hbase.rootdir'] = configs['hbase-site']['hbase.rootdir'].replace(/\/\/[^\/]*/,
'//' + targetHostName + ':8020');
     }
-    if (!App.get('isHaEnabled') && App.Service.find('ACCUMULO').get('isLoaded'))
{
-      configs['accumulo-site']['instance.volumes'] = configs['accumulo-site']['instance.volumes'].replace(/\/\/[^\/]*/,
'//' + targetHostName + ':8020');
-    }
   },
 
   /**

http://git-wip-us.apache.org/repos/asf/ambari/blob/7ff45510/ambari-web/app/mappers/service_metrics_mapper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mappers/service_metrics_mapper.js b/ambari-web/app/mappers/service_metrics_mapper.js
index ade8cd7..3303369 100644
--- a/ambari-web/app/mappers/service_metrics_mapper.js
+++ b/ambari-web/app/mappers/service_metrics_mapper.js
@@ -359,8 +359,7 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({
       STORM: [31],
       FALCON: [32],
       RANGER: [33],
-      SPARK: [34],
-      ACCUMULO: [35]
+      SPARK: [34]
     };
     if (quickLinks[item.ServiceInfo.service_name])
       finalJson.quick_links = quickLinks[item.ServiceInfo.service_name];

http://git-wip-us.apache.org/repos/asf/ambari/blob/7ff45510/ambari-web/app/models/quick_links.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/quick_links.js b/ambari-web/app/models/quick_links.js
index 0961eb0..57f912a 100644
--- a/ambari-web/app/models/quick_links.js
+++ b/ambari-web/app/models/quick_links.js
@@ -311,16 +311,5 @@ App.QuickLinks.FIXTURES = [
     site: 'spark-defaults',
     regex: '^(\\d+)$',
     default_http_port: 18080
-  },
-  {
-    id:35,
-    label:'Accumulo Monitor UI',
-    url:'%@://%@:%@/',
-    service_id: 'ACCUMULO',
-    template:'%@://%@:%@/',
-    http_config: 'monitor.port.client',
-    site: 'accumulo-site',
-    regex: '^(\\d+)$',
-    default_http_port: 50095
   }
 ];

http://git-wip-us.apache.org/repos/asf/ambari/blob/7ff45510/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 f269262..73abf51 100644
--- a/ambari-web/app/models/service_config.js
+++ b/ambari-web/app/models/service_config.js
@@ -316,10 +316,6 @@ App.ServiceConfigProperty = Em.Object.extend({
         var nnHost = masterComponentHostsInDB.filterProperty('component', 'NAMENODE').mapProperty('hostName');
         this.setDefaultValue(hostWithPrefix,'://' + nnHost);
         break;
-      case 'instance.volumes':
-        var nnHost = masterComponentHostsInDB.filterProperty('component', 'NAMENODE').mapProperty('hostName');
-        this.setDefaultValue(hostWithPrefix,'://' + nnHost);
-        break;
       case 'snamenode_host':
         // Secondary NameNode does not exist when NameNode HA is enabled
         var snn = masterComponentHostsInDB.findProperty('component', 'SECONDARY_NAMENODE');
@@ -560,7 +556,6 @@ App.ServiceConfigProperty = Em.Object.extend({
       case 'templeton.zookeeper.hosts':
       case 'hadoop.registry.zk.quorum':
       case 'hive.cluster.delegation.token.store.zookeeper.connectString':
-      case 'instance.zookeeper.host': // for accumulo
         var zkHosts = masterComponentHostsInDB.filterProperty('component', 'ZOOKEEPER_SERVER').mapProperty('hostName');
         var zkHostPort = zkHosts;
         var regex = "\\w*:(\\d+)";   //regex to fetch the port

http://git-wip-us.apache.org/repos/asf/ambari/blob/7ff45510/ambari-web/app/views/common/quick_view_link_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/quick_view_link_view.js b/ambari-web/app/views/common/quick_view_link_view.js
index a76cf36..f9ba942 100644
--- a/ambari-web/app/views/common/quick_view_link_view.js
+++ b/ambari-web/app/views/common/quick_view_link_view.js
@@ -268,9 +268,6 @@ App.QuickViewLinks = Em.View.extend({
       case "STORM":
         hosts[0] = this.findComponentHost(response.items, "STORM_UI_SERVER");
         break;
-      case "ACCUMULO":
-        hosts[0] = this.findComponentHost(response.items, "ACCUMULO_MONITOR");
-        break;
       default:
         var service = App.StackService.find().findProperty('serviceName', serviceName);
         if (service && service.get('hasMaster')) {


Mime
View raw message