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:39 UTC
[1/5] git commit: AMBARI-8038 Capacity scheduler change always show
blue highlight after compare. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 79d1642c7 -> d23b086d1
AMBARI-8038 Capacity scheduler change always show blue highlight after compare. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c9df1e9b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c9df1e9b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c9df1e9b
Branch: refs/heads/branch-1.7.0
Commit: c9df1e9b7607ba1ecdc1eaee7e24ddc84d16333f
Parents: fa13f7d
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Thu Oct 30 17:07:41 2014 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Fri Oct 31 18:06:38 2014 +0200
----------------------------------------------------------------------
ambari-web/app/utils/config.js | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/c9df1e9b/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index ecaa9ae..0c9fa72 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -1205,7 +1205,7 @@ App.config = Em.Object.create({
return configData;
},
- complexConfigs: [
+ complexConfigsTemplate: [
{
"id": "site property",
"name": "capacity-scheduler",
@@ -1237,7 +1237,8 @@ App.config = Em.Object.create({
var fileConfigs = configs.filterProperty('filename', filename);
var value = '';
var defaultValue = '';
- var complexConfig = this.get('complexConfigs').findProperty('filename', filename);
+ var template = this.get('complexConfigsTemplate').findProperty('filename', filename);
+ var complexConfig = $.extend({}, template);
if (complexConfig) {
fileConfigs.forEach(function (_config) {
value += _config.name + '=' + _config.value + '\n';
@@ -1264,7 +1265,7 @@ App.config = Em.Object.create({
* @return {*}
*/
textareaIntoFileConfigs: function (configs, filename) {
- var complexConfigName = this.get('complexConfigs').findProperty('filename', filename).name;
+ var complexConfigName = this.get('complexConfigsTemplate').findProperty('filename', filename).name;
var configsTextarea = configs.findProperty('name', complexConfigName);
if (configsTextarea) {
var properties = configsTextarea.get('value').split('\n');
[2/5] git commit: AMBARI-8013 Remove Web UI support for Slider
property slider.zookeeper.quorum. (ababiichuk)
Posted by ab...@apache.org.
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);
[4/5] git commit: AMBARI-8061 Add host with Clients component is not
including Hive Client. (ababiichuk)
Posted by ab...@apache.org.
AMBARI-8061 Add host with Clients component is not including Hive Client. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/dcee3cb5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dcee3cb5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dcee3cb5
Branch: refs/heads/branch-1.7.0
Commit: dcee3cb5b354733c42e74f12da41bd7158ee72ee
Parents: cf01e55
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Fri Oct 31 16:23:59 2014 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Fri Oct 31 18:06:39 2014 +0200
----------------------------------------------------------------------
.../app/controllers/main/host/add_controller.js | 40 ++++++++++-----
.../main/host/add_controller_test.js | 52 ++++++++++++++++++++
2 files changed, 79 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/dcee3cb5/ambari-web/app/controllers/main/host/add_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/host/add_controller.js b/ambari-web/app/controllers/main/host/add_controller.js
index 2876b0b..d290604 100644
--- a/ambari-web/app/controllers/main/host/add_controller.js
+++ b/ambari-web/app/controllers/main/host/add_controller.js
@@ -159,26 +159,40 @@ App.AddHostController = App.WizardController.extend({
* Generate clients list for selected services and save it to model
*/
saveClients: function () {
- var clients = [];
var serviceComponents = App.StackServiceComponent.find();
- var hosts = this.get('content.hosts');
-
- this.get('content.services').filterProperty('isSelected').forEach(function (_service) {
- var client = serviceComponents.filterProperty('serviceName', _service.get('serviceName')).findProperty('isClient');
- if (client) {
- clients.push({
- component_name: client.get('componentName'),
- display_name: client.get('displayName'),
- isInstalled: false
- });
- }
- }, this);
+ var services = this.get('content.services').filterProperty('isSelected');
+ var clients = this.getClientsToInstall(services, serviceComponents);
this.setDBProperty('clientInfo', clients);
this.set('content.clients', clients);
console.log("AddHostController.saveClients: saved list ", clients);
},
/**
+ * get list of clients which will be installed on host
+ * @param services {Array} of service objects
+ * @param components {Array} of component objects
+ * @returns {Array} returns array of clients
+ * @method getClientsToInstall;
+ */
+ getClientsToInstall: function(services, components) {
+ var clients = [];
+ services.forEach(function (_service) {
+ var serviceClients = components.filter(function(component) {
+ return (component.get('serviceName') == _service.get('serviceName') && component.get('isClient'));
+ });
+ if (serviceClients.length) {
+ serviceClients.forEach(function(client) {
+ clients.push({
+ component_name: client.get('componentName'),
+ display_name: client.get('displayName'),
+ isInstalled: false
+ });
+ });
+ }
+ }, this);
+ return clients;
+ },
+ /**
* Apply config groups from step4 Configurations
*/
applyConfigGroup: function () {
http://git-wip-us.apache.org/repos/asf/ambari/blob/dcee3cb5/ambari-web/test/controllers/main/host/add_controller_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/main/host/add_controller_test.js b/ambari-web/test/controllers/main/host/add_controller_test.js
index f1ce854..284070f 100644
--- a/ambari-web/test/controllers/main/host/add_controller_test.js
+++ b/ambari-web/test/controllers/main/host/add_controller_test.js
@@ -329,4 +329,56 @@ describe('App.AddHostController', function () {
expect(App.ajax.send.called).to.be.true;
});
});
+
+ describe('#getClientsToInstall', function () {
+ var services = [
+ Em.Object.create({
+ serviceName: 'service1'
+ }),
+ Em.Object.create({
+ serviceName: 'service2'
+ })
+ ];
+ var components = [
+ Em.Object.create({
+ componentName: 'comp1',
+ displayName: 'comp1',
+ serviceName: 'service1',
+ isClient: true
+ }),
+ Em.Object.create({
+ componentName: 'comp2',
+ displayName: 'comp2',
+ serviceName: 'service1',
+ isClient: true
+ }),
+ Em.Object.create({
+ componentName: 'comp3',
+ displayName: 'comp3',
+ serviceName: 'service2',
+ isClient: false
+ }),
+ Em.Object.create({
+ componentName: 'comp4',
+ displayName: 'comp4',
+ serviceName: 'service3',
+ isClient: true
+ })
+ ];
+ var clients = [
+ {
+ component_name: 'comp1',
+ display_name: 'comp1',
+ isInstalled: false
+ },
+ {
+ component_name: 'comp2',
+ display_name: 'comp2',
+ isInstalled: false
+ }
+ ];
+ it("generatel list of clients to install", function () {
+ expect(controller.getClientsToInstall(services, components)).to.eql(clients);
+ })
+ })
});
[3/5] git commit: AMBARI-8039 Configs: versions get hidden on
browsing. (ababiichuk)
Posted by ab...@apache.org.
AMBARI-8039 Configs: versions get hidden on browsing. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cf01e559
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cf01e559
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cf01e559
Branch: refs/heads/branch-1.7.0
Commit: cf01e559115a9d4efb4d7c849506a36f82e9c5a6
Parents: c9df1e9
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Thu Oct 30 17:08:02 2014 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Fri Oct 31 18:06:39 2014 +0200
----------------------------------------------------------------------
ambari-web/app/styles/application.less | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/cf01e559/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index 6538c48..8d2bd6f 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -4998,6 +4998,7 @@ ul.inline li {
.flow-element {
height: 58px;
width: 15.2%;
+ max-width: 146px;
.version-box {
position: relative;
height: 90%;
[5/5] git commit: AMBARI-8067 Select HDP 2.2 by default on Select
Stack page. (ababiichuk)
Posted by ab...@apache.org.
AMBARI-8067 Select HDP 2.2 by default on Select Stack page. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d23b086d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d23b086d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d23b086d
Branch: refs/heads/branch-1.7.0
Commit: d23b086d1eb300d890947bbbfb5bb78bf1f520a0
Parents: dcee3cb
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Fri Oct 31 16:24:49 2014 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Fri Oct 31 18:06:40 2014 +0200
----------------------------------------------------------------------
ambari-web/app/config.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d23b086d/ambari-web/app/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/config.js b/ambari-web/app/config.js
index 563e547..2f49230 100644
--- a/ambari-web/app/config.js
+++ b/ambari-web/app/config.js
@@ -27,7 +27,7 @@ App.alwaysGoToInstaller = false;
App.testEnableSecurity = true; // By default enable security is tested; turning it false tests disable security
App.testNameNodeHA = true;
App.apiPrefix = '/api/v1';
-App.defaultStackVersion = 'HDP-2.1';
+App.defaultStackVersion = 'HDP-2.2';
App.defaultJavaHome = '/usr/jdk/jdk1.6.0_31';
App.timeout = 180000; // default AJAX timeout
App.maxRetries = 3; // max number of retries for certain AJAX calls