You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2014/10/31 17:08:40 UTC
[2/5] git commit: AMBARI-8013 Remove Web UI support for Slider
property slider.zookeeper.quorum. (ababiichuk)
AMBARI-8013 Remove Web UI support for Slider property slider.zookeeper.quorum. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fa13f7d8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fa13f7d8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fa13f7d8
Branch: refs/heads/branch-1.7.0
Commit: fa13f7d87cc333709fcac6113d3ce112af98565d
Parents: 79d1642
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Thu Oct 30 17:07:21 2014 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Fri Oct 31 18:06:38 2014 +0200
----------------------------------------------------------------------
.../src/test/python/stacks/2.2/configs/default.json | 1 -
ambari-web/app/controllers/main/host/details.js | 6 ------
ambari-web/app/messages.js | 6 +++---
ambari-web/app/models/service_config.js | 1 -
.../test/controllers/main/host/details_test.js | 16 ----------------
5 files changed, 3 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/fa13f7d8/ambari-server/src/test/python/stacks/2.2/configs/default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.2/configs/default.json b/ambari-server/src/test/python/stacks/2.2/configs/default.json
index 2862970..28a17ae 100644
--- a/ambari-server/src/test/python/stacks/2.2/configs/default.json
+++ b/ambari-server/src/test/python/stacks/2.2/configs/default.json
@@ -30,7 +30,6 @@
"public_hostname": "c6401.ambari.apache.org",
"configurations": {
"slider-client": {
- "slider.zookeeper.quorum": "c6401.ambari.apache.org:2181",
"slider.yarn.queue": "default"
},
"core-site": {
http://git-wip-us.apache.org/repos/asf/ambari/blob/fa13f7d8/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 0e0e515..d717fa9 100644
--- a/ambari-web/app/controllers/main/host/details.js
+++ b/ambari-web/app/controllers/main/host/details.js
@@ -655,9 +655,6 @@ App.MainHostDetailsController = Em.Controller.extend({
if (services.someProperty('serviceName', 'STORM')) {
urlParams.push('(type=storm-site&tag=' + data.Clusters.desired_configs['storm-site'].tag + ')');
}
- if (services.someProperty('serviceName', 'SLIDER')) {
- urlParams.push('(type=slider-client&tag=' + data.Clusters.desired_configs['slider-client'].tag + ')');
- }
if ((services.someProperty('serviceName', 'YARN') && App.get('isHadoop22Stack')) || App.get('isRMHaEnabled')) {
urlParams.push('(type=yarn-site&tag=' + data.Clusters.desired_configs['yarn-site'].tag + ')');
}
@@ -717,9 +714,6 @@ App.MainHostDetailsController = Em.Controller.extend({
if (configs['storm-site']) {
configs['storm-site']['storm.zookeeper.servers'] = JSON.stringify(zks).replace(/"/g, "'");
}
- if (configs['slider-client']) {
- configs['slider-client']['slider.zookeeper.quorum'] = zksWithPort;
- }
if (App.get('isRMHaEnabled')) {
configs['yarn-site']['yarn.resourcemanager.zk-address'] = zks.join(',');
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/fa13f7d8/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index a30fe64..e234ebe 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1730,14 +1730,14 @@ Em.I18n.translations = {
'host.host.componentFilter.client':'Client Components',
'hosts.host.deleteComponent.popup.msg1':'Are you sure you want to delete {0}?',
'hosts.host.deleteComponent.popup.msg2':'<b>Important:</b> After this <i>{0}</i> is deleted, go to <i>Services -> Nagios</i> to restart the Nagios service. This is required for the alerts and notifications to work properly.',
- 'hosts.host.deleteComponent.popup.deleteZooKeeperServer':'Deleting <i>ZooKeeper Server</i> may reconfigure such properties:<ul><li>ha.zookeeper.quorum</li><li>hbase.zookeeper.quorum</li><li>templeton.zookeeper.hosts</li><li>yarn.resourcemanager.zk-address</li><li>hive.zookeeper.quorum</li><li>slider.zookeeper.quorum</li><li>hive.cluster.delegation.token.store.zookeeper.connectString</li></ul>',
+ 'hosts.host.deleteComponent.popup.deleteZooKeeperServer':'Deleting <i>ZooKeeper Server</i> may reconfigure such properties:<ul><li>ha.zookeeper.quorum</li><li>hbase.zookeeper.quorum</li><li>templeton.zookeeper.hosts</li><li>yarn.resourcemanager.zk-address</li><li>hive.zookeeper.quorum</li><li>hive.cluster.delegation.token.store.zookeeper.connectString</li></ul>',
'hosts.host.deleteComponent.popup.warning':'<b>WARNING!</b> Delete the last <i>{0}</i> component in the cluster?</br>Deleting the last component in the cluster could result in permanent loss of service data.',
'hosts.host.deleteComponent.popup.confirm':'Confirm Delete',
'hosts.host.installComponent.popup.confirm':'Confirm Install',
'hosts.host.installComponent.msg':'Are you sure you want to install {0}?',
'hosts.host.addComponent.msg':'Are you sure you want to add {0}?',
- 'hosts.host.addComponent.addZooKeeper':'Adding ZooKeeper Server may reconfigure such properties:<ul><li>ha.zookeeper.quorum</li><li>hbase.zookeeper.quorum</li><li>templeton.zookeeper.hosts</li><li>yarn.resourcemanager.zk-address</li><li>hive.zookeeper.quorum</li><li>slider.zookeeper.quorum</li><li>hive.cluster.delegation.token.store.zookeeper.connectString</li></ul>',
- 'hosts.host.addComponent.deleteHostWithZooKeeper':'Deleting host with ZooKeeper Server may reconfigure such properties:<ul><li>ha.zookeeper.quorum</li><li>hbase.zookeeper.quorum</li><li>templeton.zookeeper.hosts</li><li>yarn.resourcemanager.zk-address</li><li>hive.zookeeper.quorum</li><li>slider.zookeeper.quorum</li><li>hive.cluster.delegation.token.store.zookeeper.connectString</li></ul>',
+ 'hosts.host.addComponent.addZooKeeper':'Adding ZooKeeper Server may reconfigure such properties:<ul><li>ha.zookeeper.quorum</li><li>hbase.zookeeper.quorum</li><li>templeton.zookeeper.hosts</li><li>yarn.resourcemanager.zk-address</li><li>hive.zookeeper.quorum</li><li>hive.cluster.delegation.token.store.zookeeper.connectString</li></ul>',
+ 'hosts.host.addComponent.deleteHostWithZooKeeper':'Deleting host with ZooKeeper Server may reconfigure such properties:<ul><li>ha.zookeeper.quorum</li><li>hbase.zookeeper.quorum</li><li>templeton.zookeeper.hosts</li><li>yarn.resourcemanager.zk-address</li><li>hive.zookeeper.quorum</li><li>hive.cluster.delegation.token.store.zookeeper.connectString</li></ul>',
'host.host.addComponent.popup.dependedComponents.body': '{0} requires {1} to be installed along with it on the same host. Please add them first and then try adding {0}',
'host.host.addComponent.popup.dependedComponents.header': 'Component dependencies',
'hosts.host.zooKeeper.configs.save.note': 'This configuration is created by ambari while installing/deleting zookeeper component on a host',
http://git-wip-us.apache.org/repos/asf/ambari/blob/fa13f7d8/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 2ac7ad1..cb0e8f0 100644
--- a/ambari-web/app/models/service_config.js
+++ b/ambari-web/app/models/service_config.js
@@ -497,7 +497,6 @@ App.ServiceConfigProperty = Ember.Object.extend({
case 'zookeeper.connect':
case 'hive.zookeeper.quorum':
case 'templeton.zookeeper.hosts':
- case 'slider.zookeeper.quorum':
case 'hadoop.registry.zk.quorum':
case 'hive.cluster.delegation.token.store.zookeeper.connectString':
var zkHosts = masterComponentHostsInDB.filterProperty('component', 'ZOOKEEPER_SERVER').mapProperty('hostName');
http://git-wip-us.apache.org/repos/asf/ambari/blob/fa13f7d8/ambari-web/test/controllers/main/host/details_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/main/host/details_test.js b/ambari-web/test/controllers/main/host/details_test.js
index 927ef34..2260566 100644
--- a/ambari-web/test/controllers/main/host/details_test.js
+++ b/ambari-web/test/controllers/main/host/details_test.js
@@ -677,15 +677,6 @@ describe('App.MainHostDetailsController', function () {
expect(controller.constructConfigUrlParams(data)).to.eql(['(type=storm-site&tag=1)']);
App.Service.find().clear();
});
- it('SLIDER is installed', function () {
- App.store.load(App.Service, {
- id: 'SLIDER',
- service_name: 'SLIDER'
- });
- var data = {Clusters: {desired_configs: {'slider-client': {tag: 1}}}};
- expect(controller.constructConfigUrlParams(data)).to.eql(['(type=slider-client&tag=1)']);
- App.Service.find().clear();
- });
it('YARN for 2.2 stack is installed', function () {
App.set('currentStackVersion', 'HDP-2.2.0');
App.store.load(App.Service, {
@@ -849,13 +840,6 @@ describe('App.MainHostDetailsController', function () {
"storm.zookeeper.servers": "['host1','host2']"
}});
});
- it('slider-client is present', function () {
- var configs = {'slider-client': {}};
- expect(controller.setZKConfigs(configs, 'host1:2181', [])).to.be.true;
- expect(configs).to.eql({"slider-client": {
- "slider.zookeeper.quorum": "host1:2181"
- }});
- });
it('isRMHaEnabled true', function () {
var configs = {'yarn-site': {}};
sinon.stub(App, 'get').withArgs('isRMHaEnabled').returns(true);