[1/2] AMBARI-6484. HBase RegionServer -Xmn must be configurable (azwaw via aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 0ab80fdeb - 4099da326
http://git-wip-us.apache.org/repos/asf/ambari/blob/4099da32/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HBASE/configuration/global.xml
--
diff --git
a/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HBASE/configuration/global.xml
b/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HBASE/configuration/global.xml
index b2c57bd..3a54dcb 100644
---
a/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HBASE/configuration/global.xml
+++
b/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HBASE/configuration/global.xml
@@ -49,7 +49,17 @@
property
namehbase_regionserver_heapsize/name
value1024/value
-descriptionLog Directories for HBase./description
+descriptionRegionServers heap size./description
+ /property
+ property
+namehbase_regionserver_xmn_max/name
+value512/value
+descriptionHBase RegionServer maximum value for minimum heap
size./description
+ /property
+ property
+namehbase_regionserver_xmn_ratio/name
+value0.2/value
+descriptionHBase RegionServer minimum heap size is calculated as a
percentage of max heap size./description
/property
property
namehbase_master_heapsize/name
http://git-wip-us.apache.org/repos/asf/ambari/blob/4099da32/ambari-web/app/assets/data/configurations/cluster_level_actual_configs.json
--
diff --git
a/ambari-web/app/assets/data/configurations/cluster_level_actual_configs.json
b/ambari-web/app/assets/data/configurations/cluster_level_actual_configs.json
index b1b845a..f8797e8 100644
---
a/ambari-web/app/assets/data/configurations/cluster_level_actual_configs.json
+++
b/ambari-web/app/assets/data/configurations/cluster_level_actual_configs.json
@@ -218,6 +218,8 @@
webhcat_user : hcat,
regionserver_handlers : 30,
hbase_regionserver_heapsize : 1024m,
+hbase_regionserver_xmn_max: 512,
+hbase_regionserver_xmn_ratio: 0.2,
dfs_include : dfs.include,
dfs_webhdfs_enabled : false,
scheduler_name : org.apache.hadoop.mapred.CapacityTaskScheduler,
http://git-wip-us.apache.org/repos/asf/ambari/blob/4099da32/ambari-web/app/assets/data/configurations/cluster_level_configs.json
--
diff --git
a/ambari-web/app/assets/data/configurations/cluster_level_configs.json
b/ambari-web/app/assets/data/configurations/cluster_level_configs.json
index faca624..55fa834 100644
--- a/ambari-web/app/assets/data/configurations/cluster_level_configs.json
+++ b/ambari-web/app/assets/data/configurations/cluster_level_configs.json
@@ -533,6 +533,8 @@
webhcat_user : hcat,
regionserver_handlers : 30,
hbase_regionserver_heapsize : 1024m,
+hbase_regionserver_xmn_max: 512,
+hbase_regionserver_xmn_ratio: 0.2,
dfs_include : dfs.include,
dfs_webhdfs_enabled : false,
scheduler_name : org.apache.hadoop.mapred.CapacityTaskScheduler,
http://git-wip-us.apache.org/repos/asf/ambari/blob/4099da32/ambari-web/app/assets/data/wizard/stack/hdp/version1.3.0/HBASE.json
--
diff --git
a/ambari-web/app/assets/data/wizard/stack/hdp/version1.3.0/HBASE.json
b/ambari-web/app/assets/data/wizard/stack/hdp/version1.3.0/HBASE.json
index 524d08a..dcbd692 100644
--- a/ambari-web/app/assets/data/wizard/stack/hdp/version1.3.0/HBASE.json
+++ b/ambari-web/app/assets/data/wizard/stack/hdp/version1.3.0/HBASE.json
@@ -376,7 +376,7 @@
{
href :
http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HBASE/configurations/hbase_regionserver_heapsize;,
StackConfigurations : {
-property_description : Log Directories for HBase.,
+property_description : RegionServers heap size.,
property_name : hbase_regionserver_heapsize,
property_value : 1024,
service_name : HBASE,
@@ -386,6 +386,30 @@
}
},
{
+ href :
http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HBASE/configurations/hbase_regionserver_xmn_max;,
+ StackConfigurations : {
+property_description : Maximum value for minimum RegionServers Java
heap size,
+property_name : hbase_regionserver_xmn_max,
+property_value : 512,
+service_name : HBASE,
+stack_name : HDP,
+stack_version : 1.3.0,
+type : global.xml
+ }
+},
+{
+ href :
http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HBASE/configurations/hbase_regionserver_xmn_ratio;,
+ StackConfigurations : {
+property_description : RegionServers -Xmn is calculated as a
percentage of -Xmx,
+property_name :
git commit: AMBARI-6634 Custom Mapred Env panel isn't shown on Customize Services/MapReduce2. (Buzhor Denys via atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk 4099da326 - 883d7b3a1
AMBARI-6634 Custom Mapred Env panel isn't shown on Customize
Services/MapReduce2. (Buzhor Denys via atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/883d7b3a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/883d7b3a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/883d7b3a
Branch: refs/heads/trunk
Commit: 883d7b3a1ea04f2b041e20309ca9bd007bca5b62
Parents: 4099da3
Author: atkach atk...@hortonworks.com
Authored: Mon Jul 28 15:15:24 2014 +0300
Committer: atkach atk...@hortonworks.com
Committed: Mon Jul 28 15:17:30 2014 +0300
--
ambari-web/app/models/stack_service.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/883d7b3a/ambari-web/app/models/stack_service.js
--
diff --git a/ambari-web/app/models/stack_service.js
b/ambari-web/app/models/stack_service.js
index 1d210d3..98f1d59 100644
--- a/ambari-web/app/models/stack_service.js
+++ b/ambari-web/app/models/stack_service.js
@@ -291,7 +291,7 @@ App.StackService.configCategories = function () {
App.ServiceConfigCategory.create({ name: 'Advanced', displayName:
'Advanced'}),
App.ServiceConfigCategory.create({ name: 'Advanced mapred-site',
displayName: 'Custom mapred-site.xml', siteFileName: 'mapred-site.xml',
canAddProperty: true}),
App.ServiceConfigCategory.create({ name: 'Advanced mapreduce-log4j',
displayName: 'Custom log4j.properties', siteFileName: 'mapreduce-log4j.xml',
canAddProperty: false}),
-App.ServiceConfigCategory.create({ name: 'Advanced mapreduce-env',
displayName: 'Custom Mapreduce env', siteFileName: 'mapred-env.xml',
canAddProperty: false})
+App.ServiceConfigCategory.create({ name: 'Advanced mapred-env',
displayName: 'Custom Mapreduce env', siteFileName: 'mapred-env.xml',
canAddProperty: false})
]);
break;
case 'YARN':
@@ -313,7 +313,7 @@ App.StackService.configCategories = function () {
App.ServiceConfigCategory.create({ name: 'General', displayName:
'General'}),
App.ServiceConfigCategory.create({ name: 'Advanced', displayName:
'Advanced'}),
App.ServiceConfigCategory.create({ name: 'AdvancedMapredSite',
displayName: 'Custom mapred-site.xml', siteFileName: 'mapred-site.xml',
canAddProperty: true}),
-App.ServiceConfigCategory.create({ name: 'Advanced mapreduce-env',
displayName: 'Custom Mapred env', siteFileName: 'mapred-env.xml',
canAddProperty: false})
+App.ServiceConfigCategory.create({ name: 'Advanced mapred-env',
displayName: 'Custom Mapred env', siteFileName: 'mapred-env.xml',
canAddProperty: false})
]);
break;
case 'HIVE':
[1/2] AMBARI-6624. Make validation for minimum required number of service components from cardinality field of stacks API (Buzhor Denys via alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 883d7b3a1 - a6873d64c
http://git-wip-us.apache.org/repos/asf/ambari/blob/a6873d64/ambari-web/test/service_components.js
--
diff --git a/ambari-web/test/service_components.js
b/ambari-web/test/service_components.js
index e4e475e..0f43be8 100644
--- a/ambari-web/test/service_components.js
+++ b/ambari-web/test/service_components.js
@@ -78,26 +78,42 @@ module.exports = {
]
},
{
- href :
http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/FALCON;,
+ href :
http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/FALCON;,
StackServices : {
comments : Data management and processing platform,
-config_types : [
- oozie-site,
- global,
- falcon-startup.properties,
- falcon-runtime.properties
-],
service_name : FALCON,
service_version : 0.5.0.2.1,
stack_name : HDP,
stack_version : 2.1,
-user_name : null
+user_name : null,
+config_types : {
+ falcon-env : {
+supports : {
+ final : false
+}
+ },
+ falcon-runtime.properties : {
+supports : {
+ final : false
+}
+ },
+ falcon-startup.properties : {
+supports : {
+ final : false
+}
+ },
+ oozie-site : {
+supports : {
+ final : true
+}
+ }
+}
},
serviceComponents : [
{
- href :
http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/FALCON/serviceComponents/FALCON_CLIENT;,
+ href :
http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/FALCON/components/FALCON_CLIENT;,
StackServiceComponents : {
-cardinality : null,
+cardinality : 1+,
component_category : CLIENT,
component_name : FALCON_CLIENT,
is_client : true,
@@ -109,9 +125,9 @@ module.exports = {
dependencies : [ ]
},
{
- href :
http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/FALCON/serviceComponents/FALCON_SERVER;,
+ href :
http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/FALCON/components/FALCON_SERVER;,
StackServiceComponents : {
-cardinality : null,
+cardinality : 1,
component_category : MASTER,
component_name : FALCON_SERVER,
is_client : false,
@@ -120,30 +136,63 @@ module.exports = {
stack_name : HDP,
stack_version : 2.1
},
- dependencies : [ ]
+ dependencies : [
+{
+ href :
http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/FALCON/components/FALCON_SERVER/dependencies/OOZIE_CLIENT;,
+ Dependencies : {
+component_name : OOZIE_CLIENT,
+dependent_component_name : FALCON_SERVER,
+dependent_service_name : FALCON,
+stack_name : HDP,
+stack_version : 2.1
+ }
+},
+{
+ href :
http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/FALCON/components/FALCON_SERVER/dependencies/OOZIE_SERVER;,
+ Dependencies : {
+component_name : OOZIE_SERVER,
+dependent_component_name : FALCON_SERVER,
+dependent_service_name : FALCON,
+stack_name : HDP,
+stack_version : 2.1
+ }
+}
+ ]
}
]
},
{
- href :
http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/FLUME;,
+ href :
http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/FLUME;,
StackServices : {
comments : Data management and processing platform,
-config_types : [
- flume-conf,
- flume-log4j,
- global
-],
service_name : FLUME,
service_version : 1.4.0.2.1.1.0,
stack_name : HDP,
stack_version : 2.1,
-user_name : null
+user_name : null,
+config_types : {
+ flume-conf : {
+supports : {
+ final : false
+}
+ },
+ flume-env : {
+supports : {
+ final : false
+}
+ },
+ flume-log4j : {
+supports : {
+ final : false
+}
+ }
+}
},
serviceComponents : [
{
- href :
git commit: Adding known contributors that are current
Repository: ambari Updated Branches: refs/heads/trunk a6873d64c - 2f2eeeb36 Adding known contributors that are current Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2f2eeeb3 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2f2eeeb3 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2f2eeeb3 Branch: refs/heads/trunk Commit: 2f2eeeb3622479551617e557b87f060280b25265 Parents: a6873d6 Author: Mahadev Konar maha...@apache.org Authored: Mon Jul 28 08:28:02 2014 -0700 Committer: Mahadev Konar maha...@apache.org Committed: Mon Jul 28 08:28:07 2014 -0700 -- docs/pom.xml | 27 +++ 1 file changed, 27 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/2f2eeeb3/docs/pom.xml -- diff --git a/docs/pom.xml b/docs/pom.xml index 0a42577..9212c2c 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -575,6 +575,33 @@ /organization /developer /developers + contributors + contributor + nameScott Creeley/name + organizationRedHat/organization + /contributor + contributor + nameMichael Harp/name + organizationTeraData/organization + /contributor + contributor + nameJanos Matyas/name + organizationSequenceIQ/organization + /contributor + contributor + nameGreg Hill/name + organizationOpenStack/organization + /contributor + contributor + nameSteve Ratay/name + organizationTeraData/organization + /contributor + contributor + + /contributors + + + organization nameApache Software Foundation/name urlhttp://www.apache.org//url
git commit: Fix: Adding known contributors that are current
Repository: ambari Updated Branches: refs/heads/trunk 2f2eeeb36 - 79ff7cbdb Fix: Adding known contributors that are current Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/79ff7cbd Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/79ff7cbd Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/79ff7cbd Branch: refs/heads/trunk Commit: 79ff7cbdbfd0f3fcf95aeb808f5a873c593063be Parents: 2f2eeeb Author: Mahadev Konar maha...@apache.org Authored: Mon Jul 28 08:28:59 2014 -0700 Committer: Mahadev Konar maha...@apache.org Committed: Mon Jul 28 08:28:59 2014 -0700 -- docs/pom.xml | 2 -- 1 file changed, 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/79ff7cbd/docs/pom.xml -- diff --git a/docs/pom.xml b/docs/pom.xml index 9212c2c..5b3b27e 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -596,8 +596,6 @@ nameSteve Ratay/name organizationTeraData/organization /contributor - contributor - /contributors
svn commit: r1614057 - /ambari/site/team-list.html
Author: mahadev Date: Mon Jul 28 15:32:37 2014 New Revision: 1614057 URL: http://svn.apache.org/r1614057 Log: Fix: Adding contributors Modified: ambari/site/team-list.html Modified: ambari/site/team-list.html URL: http://svn.apache.org/viewvc/ambari/site/team-list.html?rev=1614057r1=1614056r2=1614057view=diff == --- ambari/site/team-list.html (original) +++ ambari/site/team-list.html Mon Jul 28 15:32:37 2014 @@ -565,7 +565,7 @@ div id=bodyColumn class=span10 -div class=sectionh2The Teama name=The_Team/a/h2a name=The_Team/apA successful project requires many people to play many roles. Some members write code or documentation, while others are valuable as testers, submitting patches and suggestions./ppThe team is comprised of Members and Contributors. Members have direct access to the source of a project and actively evolve the code-base. Contributors improve the project through submission of patches and suggestions to the Members. The number of Contributors to the project is unbounded. Get involved today. All contributions to the project are greatly appreciated./pdiv class=sectionh3Membersa name=Members/a/h3a name=Members/apThe following is a list of developers with commit privileges that have directly contributed to the project in one way or another./ptable border=0 class=table table-stripedtr class=athId/ththName/ththEmail/ththOrganization/ththRo les/ththTime Zone/ththActual Time (GMT)/th/trtr class=btda name=ababiichuk/aababiichuk/tdtdAndrii Babiichuk/tdtda class=externalLink href=mailto:ababiic...@apache.org;ababiic...@apache.org/a/tdtdHortonworks/tdtdPMC/tdtd+2/tdtdspan id=developer-0+2/span/td/trtr class=atda name=abaranchuk/aabaranchuk/tdtdArtem Baranchuk/tdtda class=externalLink href=mailto:abaranc...@apache.org;abaranc...@apache.org/a/tdtdHortonworks/tdtdCommitter/tdtd+2/tdtdspan id=developer-1+2/span/td/trtr class=btda name=aonishuk/aaonishuk/tdtdAndrew Onischuk/tdtda class=externalLink href=mailto:aonis...@apache.org;aonis...@apache.org/a/tdtdHortonworks/tdtdCommitter/tdtd+2/tdtdspan id=developer-2+2/span/td/trtr class=atda name=atkach/aatkach/tdtdAndrii Tkach/tdtda class=externalLink href=mailto:atk...@apache.org;atkach@ap ache.org/a/tdtdHortonworks/tdtdPMC/tdtd+2/tdtdspan id=developer-3+2/span/td/trtr class=btda name=akovalenko/aakovalenko/tdtdAleksandr Kovalenko/tdtda class=externalLink href=mailto:akovale...@apache.org;akovale...@apache.org/a/tdtdHortonworks/tdtdPMC/tdtd+2/tdtdspan id=developer-4+2/span/td/trtr class=atda name=alexantonenko/aalexantonenko/tdtdAlex Antonenko/tdtda class=externalLink href=mailto:alexantone...@apache.org;alexantone...@apache.org/a/tdtdHortonworks/tdtdPMC/tdtd+2/tdtdspan id=developer-5+2/span/td/trtr class=btda name=berndf/aberndf/tdtdBernd Fondermann/tdtda class=externalLink href=mailto:ber...@apache.org;ber...@apache.org/a/tdtd-/tdtdPMC/tdtd+1/tdtdspan id=developer-6+1/span/td/trtr class=atda name=billie/abillie/tdtdBillie Rinaldi/tdtda class=externalLink href= mailto:bil...@apache.org;bil...@apache.org/a/tdtdHortonworks/tdtdPMC/tdtd-8/tdtdspan id=developer-7-8/span/td/trtr class=btda name=croberts/acroberts/tdtdChad Roberts/tdtda class=externalLink href=mailto:crobe...@apache.org;crobe...@apache.org/a/tdtdRed Hat/tdtdPMC/tdtd-/tdtdspan id=developer-8-/span/td/trtr class=atda name=ddas/addas/tdtdDevaraj Das/tdtda class=externalLink href=mailto:d...@hortonworks.com;d...@hortonworks.com/a/tdtdHortonworks/tdtdPMC/tdtd-8/tdtdspan id=developer-9-8/span/td/trtr class=btda name=dmitriusan/admitriusan/tdtdDmitry Lysnichenko/tdtda class=externalLink href=mailto:dmitriu...@apache.org;dmitriu...@apache.org/a/tdtdHortonworks/tdtdPMC/tdtd+2/tdtdspan id=developer-10+2/span/td/trtr class=atda name=dsen/adsen/tdtdDmitry Sen/tdtda class=externalLink href=mailto:d...@apache.org;d...@apache.org/a/tdtdHortonworks/tdtdPMC/tdtd+2/tdtdspan id=developer-11+2/span/td/trtr class=btda name=eyang/aeyang/tdtdEric Yang/tdtda class=externalLink href=mailto:ey...@apache.org;ey...@apache.org/a/tdtdIBM/tdtdPMC/tdtd-8/tdtdspan id=developer-12-8/span/td/trtr class=atda name=eboyd/aeboyd/tdtdErin A. Boyd/tdtda class=externalLink href=mailto:eb...@apache.org;eb...@apache.org/a/tdtdRedhat/tdtdCommitter/tdtd-8/tdtdspan id=developer-13-8/span/td/trtr class=btda name=hitesh/ahitesh/tdtdHitesh Shah/tdtda class=externalLink href=mailto:hit...@apache.org;hit...@apache.org/a/tdtdHortonworks/tdtdPMC/tdtd-8/tdtdspan id=developer-14-8/span/td/trtr class=atda name=jagane/ajagane/tdtdJagane Sundar/tdtda class=externalLink href=mailto:jag...@apache.or gjag...@apache.org/a/tdtdWANdisco/tdtdPMC/tdtd-8/tdtdspan id=developer-15-8/span/td/trtr class=btda name=jaimin/ajaimin/tdtdJaimin Jetly/tdtda class=externalLink
git commit: AMBARI-6638 Config categories aren't displayed on 'Configure Services' step of Secrity Wizard. (atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk 79ff7cbdb - e4f80ad8b
AMBARI-6638 Config categories aren't displayed on 'Configure Services' step of
Secrity Wizard. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e4f80ad8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e4f80ad8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e4f80ad8
Branch: refs/heads/trunk
Commit: e4f80ad8b5bbaed8b99bad0631db8ea8d0580d85
Parents: 79ff7cb
Author: atkach atk...@hortonworks.com
Authored: Mon Jul 28 19:44:01 2014 +0300
Committer: atkach atk...@hortonworks.com
Committed: Mon Jul 28 19:44:01 2014 +0300
--
.../app/controllers/main/admin/security/add/step2.js | 2 ++
ambari-web/app/views/common/configs/services_config.js| 10 +++---
2 files changed, 5 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4f80ad8/ambari-web/app/controllers/main/admin/security/add/step2.js
--
diff --git a/ambari-web/app/controllers/main/admin/security/add/step2.js
b/ambari-web/app/controllers/main/admin/security/add/step2.js
index 44fb6c2..4b28a30 100644
--- a/ambari-web/app/controllers/main/admin/security/add/step2.js
+++ b/ambari-web/app/controllers/main/admin/security/add/step2.js
@@ -25,6 +25,8 @@ App.MainAdminSecurityAddStep2Controller =
Em.Controller.extend({
installedServices: [],
selectedService: null,
securityUsers: [],
+ filter: '',
+ filterColumns: [],
/**
* map which depict connection between config and slave component
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4f80ad8/ambari-web/app/views/common/configs/services_config.js
--
diff --git a/ambari-web/app/views/common/configs/services_config.js
b/ambari-web/app/views/common/configs/services_config.js
index ac88a1e..0dc0529 100644
--- a/ambari-web/app/views/common/configs/services_config.js
+++ b/ambari-web/app/views/common/configs/services_config.js
@@ -326,15 +326,11 @@ App.ServiceConfigsByCategoryView =
Ember.View.extend(App.UserPref, {
*/
filteredCategoryConfigs: function () {
$('.popover').remove();
-var filter = this.get('parentView.filter');
-var columns = this.get('parentView.columns');
-if (filter != null) {
- filter = filter.toLowerCase();
-}
-var selectedFilters =
this.get('parentView.columns').filterProperty('selected', true);
+var filter = this.get('parentView.filter').toLowerCase();
+var selectedFilters =
this.get('parentView.columns').filterProperty('selected');
var filteredResult = this.get('categoryConfigs').filter(function (config) {
-
var passesFilters = true;
+
selectedFilters.forEach(function (filter) {
if (!config.get(filter.attributeName)) {
passesFilters = false;
git commit: AMBARI-6636. Error on YARN Service Check after RM HA enabling.(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/trunk e4f80ad8b - 73be90ac0
AMBARI-6636. Error on YARN Service Check after RM HA enabling.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/73be90ac
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/73be90ac
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/73be90ac
Branch: refs/heads/trunk
Commit: 73be90ac0a2a6604768ce43a509994533f6fe0ba
Parents: e4f80ad
Author: Vitaly Brodetskyi vbrodets...@hortonworks.com
Authored: Mon Jul 28 18:22:11 2014 +0300
Committer: Vitaly Brodetskyi vbrodets...@hortonworks.com
Committed: Mon Jul 28 18:22:24 2014 +0300
--
.../files/validateYarnComponentStatus.py| 59 +-
.../services/YARN/package/scripts/params.py | 13 +++-
.../files/validateYarnComponentStatus.py| 63 +++-
.../services/YARN/package/scripts/params.py | 13 +++-
4 files changed, 86 insertions(+), 62 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/73be90ac/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/files/validateYarnComponentStatus.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/files/validateYarnComponentStatus.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/files/validateYarnComponentStatus.py
index dac198a..33ed8b1 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/files/validateYarnComponentStatus.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/files/validateYarnComponentStatus.py
@@ -42,28 +42,29 @@ def getResponse(path, address, ssl_enabled):
url = 'http://' + address + path
command_with_flags = [command,httpGssnegotiate,userpswd,insecure,url]
- try:
-proc = subprocess.Popen(command_with_flags, stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
-(stdout, stderr) = proc.communicate()
-response = json.loads(stdout)
-if response == None:
- print 'There is no response for url: ' + str(url)
- exit(1)
-return response
- except Exception as e:
-print 'Error getting response for url:' + str(url), e
-exit(1)
+
+ proc = subprocess.Popen(command_with_flags, stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
+ (stdout, stderr) = proc.communicate()
+ response = json.loads(stdout)
+ if response == None:
+print 'There is no response for url: ' + str(url)
+raise Exception('There is no response for url: ' + str(url))
+ return response
#Verify that REST api is available for given component
-def validateAvailability(component, path, address, ssl_enabled):
+def validateAvailability(component, path, addresses, ssl_enabled):
+ responses = {}
+ for address in addresses.split(','):
+try:
+ responses[address] = getResponse(path, address, ssl_enabled)
+except Exception as e:
+ print 'Error checking availability status of component.', e
+
+ if not responses:
+exit(1)
- try:
-response = getResponse(path, address, ssl_enabled)
-is_valid = validateAvailabilityResponse(component, response)
-if not is_valid:
- exit(1)
- except Exception as e:
-print 'Error checking availability status of component', e
+ is_valid = validateAvailabilityResponse(component, responses.values()[0])
+ if not is_valid:
exit(1)
#Validate component-specific response
@@ -96,15 +97,19 @@ def validateAvailabilityResponse(component, response):
return False
#Verify that component has required resources to work
-def validateAbility(component, path, address, ssl_enabled):
+def validateAbility(component, path, addresses, ssl_enabled):
+ responses = {}
+ for address in addresses.split(','):
+try:
+ responses[address] = getResponse(path, address, ssl_enabled)
+except Exception as e:
+ print 'Error checking ability of component.', e
+
+ if not responses:
+exit(1)
- try:
-response = getResponse(path, address, ssl_enabled)
-is_valid = validateAbilityResponse(component, response)
-if not is_valid:
- exit(1)
- except Exception as e:
-print 'Error checking ability of component', e
+ is_valid = validateAbilityResponse(component, responses.values()[0])
+ if not is_valid:
exit(1)
#Validate component-specific response that it has required resources to work
http://git-wip-us.apache.org/repos/asf/ambari/blob/73be90ac/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/params.py
git commit: AMBARI-5392 Recommend putting Region Server in Maintenance Mode when Decommissioning Region Server. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 73be90ac0 - 41bcd351e
AMBARI-5392 Recommend putting Region Server in Maintenance Mode when
Decommissioning Region Server. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/41bcd351
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/41bcd351
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/41bcd351
Branch: refs/heads/trunk
Commit: 41bcd351ed83766f4b404a10bc8d6bb985d18b8b
Parents: 73be90a
Author: aBabiichuk ababiic...@cybervisiontech.com
Authored: Mon Jul 28 20:16:44 2014 +0300
Committer: aBabiichuk ababiic...@cybervisiontech.com
Committed: Mon Jul 28 20:16:44 2014 +0300
--
ambari-web/app/controllers/main/host.js | 35 +++-
ambari-web/app/controllers/main/host/details.js | 44 +---
ambari-web/app/utils/ajax/ajax.js | 4 ++
.../test/controllers/main/host/details_test.js | 3 --
4 files changed, 76 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/41bcd351/ambari-web/app/controllers/main/host.js
--
diff --git a/ambari-web/app/controllers/main/host.js
b/ambari-web/app/controllers/main/host.js
index cc9b26c..6b9210a 100644
--- a/ambari-web/app/controllers/main/host.js
+++ b/ambari-web/app/controllers/main/host.js
@@ -844,7 +844,7 @@ App.MainHostController = Em.ArrayController.extend({
//For decommession
if (svcName == HBASE) {
// HBASE service, decommission RegionServer in batch requests
-
App.router.get('mainHostDetailsController').doDecommissionRegionServer(hostNames,
svcName, masterName, slaveName);
+ this.warnBeforeDecommission(hostNames);
} else {
var parameters = {
slave_type: slaveName
@@ -880,6 +880,39 @@ App.MainHostController = Em.ArrayController.extend({
}
},
+
+ /**
+ * get info about regionserver passive_state
+ * @method warnBeforeDecommission
+ * @param {String} hostNames
+ * @return {$.ajax}
+ */
+ warnBeforeDecommission: function (hostNames) {
+return App.ajax.send({
+ 'name': 'host_components.hbase_regionserver.active',
+ 'sender': this,
+ 'data': {
+hostNames: hostNames
+ },
+ success: 'warnBeforeDecommissionSuccess'
+});
+ },
+
+ /**
+ * check is hbase regionserver in mm. If so - run decommission
+ * otherwise shows warning
+ * @method warnBeforeDecommission
+ * @param {Object} data
+ * @param {Object} opt
+ * @param {Object} params
+ */
+ warnBeforeDecommissionSuccess: function(data, opt, params) {
+if (Em.get(data, 'items.length')) {
+ App.router.get('mainHostDetailsController').showHbaseActiveWarning();
+} else {
+
App.router.get('mainHostDetailsController').doDecommissionRegionServer(params.hostNames,
HBASE, HBASE_MASTER, HBASE_REGIONSERVER);
+}
+ },
/**
* Bulk restart for selected hostComponents
* @param {Object} operationData
http://git-wip-us.apache.org/repos/asf/ambari/blob/41bcd351/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 cc13471..cab9cb1 100644
--- a/ambari-web/app/controllers/main/host/details.js
+++ b/ambari-web/app/controllers/main/host/details.js
@@ -858,9 +858,8 @@ App.MainHostDetailsController = Em.Controller.extend({
this.doDecommission(hostName, svcName, JOBTRACKER, TASKTRACKER);
break;
case 'HBASE':
-this.doDecommissionRegionServer(hostName, svcName, HBASE_MASTER,
HBASE_REGIONSERVER);
+this.warnBeforeDecommission(hostName);
}
-this.showBackgroundOperationsPopup();
},
/**
@@ -925,9 +924,42 @@ App.MainHostDetailsController = Em.Controller.extend({
},
/**
+ * check is hbase regionserver in mm. If so - run decommission
+ * otherwise shows warning
+ * @method warnBeforeDecommission
+ * @param {string} hostNames - list of host when run from bulk operations or
current host
+ */
+
+ warnBeforeDecommission: function(hostNames) {
+if (this.get('content.hostComponents').findProperty('componentName',
'HBASE_REGIONSERVER').get('passiveState') == OFF) {
+ this.showHbaseActiveWarning();
+} else {
+ this.doDecommissionRegionServer(hostNames, HBASE, HBASE_MASTER,
HBASE_REGIONSERVER);
+}
+ },
+
+ /**
+ * shows warning: put hbase regionserver in passive state
+ * @method showHbaseActiveWarning
+ * @return {App.ModalPopup}
+ */
+ showHbaseActiveWarning: function() {
+return App.ModalPopup.show({
+ header: Em.I18n.t('common.warning'),
+
git commit: AMBARI-6640 Memory leaks during tabs switching on Customize Services page. (Max Shepel via ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 41bcd351e - f3fa480cc
AMBARI-6640 Memory leaks during tabs switching on Customize Services page.
(Max Shepel via ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f3fa480c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f3fa480c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f3fa480c
Branch: refs/heads/trunk
Commit: f3fa480cc11e87105c5a8fff4e3b98f655c7c0b2
Parents: 41bcd35
Author: aBabiichuk ababiic...@cybervisiontech.com
Authored: Mon Jul 28 20:44:51 2014 +0300
Committer: aBabiichuk ababiic...@cybervisiontech.com
Committed: Mon Jul 28 20:44:51 2014 +0300
--
.../templates/common/configs/service_config.hbs | 89 +---
.../common/configs/service_config_category.hbs | 101 +++
.../common/configs/service_config_wizard.hbs| 55 ++
.../common/configs/services_config.hbs | 3 +-
.../app/views/common/configs/services_config.js | 62 +++-
.../common/configs/services_config_test.js | 59 +++
6 files changed, 278 insertions(+), 91 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/f3fa480c/ambari-web/app/templates/common/configs/service_config.hbs
--
diff --git a/ambari-web/app/templates/common/configs/service_config.hbs
b/ambari-web/app/templates/common/configs/service_config.hbs
index 66989a4..6e78fef 100644
--- a/ambari-web/app/templates/common/configs/service_config.hbs
+++ b/ambari-web/app/templates/common/configs/service_config.hbs
@@ -90,94 +90,7 @@
{{view category.customView categoryBinding=category
serviceBinding=selectedService canEditBinding=view.canEdit
serviceConfigsBinding=selectedService.configs}}
{{/if}}
{{else}}
-{{#view App.ServiceConfigsByCategoryView categoryBinding=category
canEditBinding=view.canEdit serviceBinding=selectedService
serviceConfigsBinding=selectedService.configs
supportsHostOverridesBinding=view.supportsHostOverrides}}
-
-div class=accordion-heading {{action onToggleBlock category
target=view}}
-i {{bindAttr class=:pull-left :accordion-toggle
category.isCollapsed:icon-caret-right:icon-caret-down}}/i
-a class=accordion-toggle{{category.displayName}}/a
-/div
-
-div class=accordion-body collapse in {{bindAttr
style=view.isCategoryBodyVisible}}
- div class=accordion-inner service-config-section
-form class=form-horizontal autocomplete=off
-
- {{#each view.filteredCategoryConfigs}}
- div {{bindAttr class=:entry-row
isOverridden:overridden-property isComparison:overridden-property}}
- {{#if showLabel}}
-span {{bindAttr class=errorMessage:error:
:control-group :control-label-span}}
- label class=control-label
-{{formatWordBreak displayName}}
-{{#if App.supports.secureCluster}}
- {{#if isSecureConfig}}
-a href=javascript:void(null);i
class=icon-lock rel=tooltip data-toggle=tooltip title=security
knob/i/a
- {{/if}}
-{{/if}}
-{{#if view.supportsHostOverrides}}
- {{#if isRestartRequired}}
-i class=icon-refresh
restart-required-property rel=tooltip {{bindAttr
title=restartRequiredMessage}}/i
- {{/if}}
-{{/if}}
- /label
-/span
- {{/if}}
- div {{bindAttr class=showLabel:controls}}
-{{! Here serviceConfigBinding should ideally be
serviceConfigPropertyBinding }}
- div {{bindAttr class=errorMessage:error:
warnMessage:warning: :control-group}}
-{{view viewClass serviceConfigBinding=this
categoryConfigsAllBinding=view.categoryConfigsAll }}
-{{#if view.canEdit}}
- {{#if isPropertyOverridable}}
-{{#if view.supportsHostOverrides}}
- {{#if App.isAdmin}}
- a class=action {{action
createOverrideProperty this target=view }} i
class=icon-plus-sign/i{{t common.override}}/a
- {{/if}}
-{{/if}}
-
git commit: AMBARI-6641. Restart command fails on HDP-1.3.2 stack (dlysnichenko)
Repository: ambari Updated Branches: refs/heads/trunk f3fa480cc - bf41b50a9 AMBARI-6641. Restart command fails on HDP-1.3.2 stack (dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bf41b50a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bf41b50a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bf41b50a Branch: refs/heads/trunk Commit: bf41b50a97638733005011bb21aa78cacdf1afa5 Parents: f3fa480 Author: Lisnichenko Dmitro dlysniche...@hortonworks.com Authored: Mon Jul 28 21:19:59 2014 +0300 Committer: Lisnichenko Dmitro dlysniche...@hortonworks.com Committed: Mon Jul 28 21:19:59 2014 +0300 -- .../stacks/HDP/1.3.2/services/HDFS/package/scripts/hdfs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/bf41b50a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/package/scripts/hdfs.py -- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/package/scripts/hdfs.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/package/scripts/hdfs.py index 69009ca..9985e32 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/package/scripts/hdfs.py +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/package/scripts/hdfs.py @@ -45,7 +45,7 @@ def hdfs(name=None): XmlConfig(hadoop-policy.xml, conf_dir=params.hadoop_conf_dir, configurations=params.config['configurations']['hadoop-policy'], - configuration_attributes=params.config['configuration_attributes']['hadoop_policy'], + configuration_attributes=params.config['configuration_attributes']['hadoop-policy'], owner=params.hdfs_user, group=params.user_group )
git commit: AMBARI-6630. Add Service wizard: Retry installation functionality does not work. (jaimin)
Repository: ambari
Updated Branches:
refs/heads/trunk bf5c5bdfc - ee94c2f5b
AMBARI-6630. Add Service wizard: Retry installation functionality does not
work. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ee94c2f5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ee94c2f5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ee94c2f5
Branch: refs/heads/trunk
Commit: ee94c2f5b6afadc0b73a3cd2ef11f2286b36cb84
Parents: bf5c5bd
Author: Jaimin Jetly jai...@hortonworks.com
Authored: Mon Jul 28 12:54:43 2014 -0700
Committer: Jaimin Jetly jai...@hortonworks.com
Committed: Mon Jul 28 12:54:43 2014 -0700
--
.../controllers/main/service/add_controller.js | 125 ++-
ambari-web/app/routes/add_service_routes.js | 5 +-
2 files changed, 38 insertions(+), 92 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/ee94c2f5/ambari-web/app/controllers/main/service/add_controller.js
--
diff --git a/ambari-web/app/controllers/main/service/add_controller.js
b/ambari-web/app/controllers/main/service/add_controller.js
index b83bbc6..6c4728f 100644
--- a/ambari-web/app/controllers/main/service/add_controller.js
+++ b/ambari-web/app/controllers/main/service/add_controller.js
@@ -72,7 +72,7 @@ App.AddServiceController = App.WizardController.extend({
selectedServices: [],
installedServices: []
};
- App.StackService.find().forEach(function(item){
+ App.StackService.find().forEach(function (item) {
var isInstalled = App.Service.find().someProperty('id',
item.get('serviceName'));
item.set('isSelected', isInstalled);
item.set('isInstalled', isInstalled);
@@ -80,15 +80,15 @@ App.AddServiceController = App.WizardController.extend({
services.selectedServices.push(item.get('serviceName'));
services.installedServices.push(item.get('serviceName'));
}
- },this);
- this.setDBProperty('services',services);
+ }, this);
+ this.setDBProperty('services', services);
} else {
- App.StackService.find().forEach(function(item) {
-var isSelected =
services.selectedServices.contains(item.get('serviceName'));
+ App.StackService.find().forEach(function (item) {
+var isSelected =
services.selectedServices.contains(item.get('serviceName'));
var isInstalled =
services.installedServices.contains(item.get('serviceName'));
item.set('isSelected', isSelected);
item.set('isInstalled', isInstalled);
- },this);
+ }, this);
var isServiceWithSlave =
App.StackService.find().filterProperty('isSelected').filterProperty('hasSlave').filterProperty('isInstalled',
false).mapProperty('serviceName').length;
this.set('content.skipSlavesStep', !isServiceWithSlave);
@@ -108,14 +108,14 @@ App.AddServiceController = App.WizardController.extend({
selectedServices: [],
installedServices: []
};
-var selectedServices =
stepController.get('content').filterProperty('isSelected',true).filterProperty('isInstalled',
false).mapProperty('serviceName');
+var selectedServices =
stepController.get('content').filterProperty('isSelected',
true).filterProperty('isInstalled', false).mapProperty('serviceName');
services.selectedServices.pushObjects(selectedServices);
-
services.installedServices.pushObjects(stepController.get('content').filterProperty('isInstalled',true).mapProperty('serviceName'));
-this.setDBProperty('services',services);
+
services.installedServices.pushObjects(stepController.get('content').filterProperty('isInstalled',
true).mapProperty('serviceName'));
+this.setDBProperty('services', services);
console.log('AddServiceController.saveServices: saved data',
stepController.get('content'));
this.set('content.selectedServiceNames', selectedServices);
-this.setDBProperty('selectedServiceNames',selectedServices);
+this.setDBProperty('selectedServiceNames', selectedServices);
var isServiceWithSlave =
stepController.get('content').filterProperty('isSelected').filterProperty('hasSlave').filterProperty('isInstalled',
false).mapProperty('serviceName').length;
this.set('content.skipSlavesStep', !isServiceWithSlave);
if (this.get('content.skipSlavesStep')) {
@@ -133,13 +133,13 @@ App.AddServiceController = App.WizardController.extend({
var installedComponents = App.HostComponent.find();
obj.forEach(function (_component) {
-masterComponentHosts.push({
- display_name: _component.display_name,
- component: _component.component_name,
- hostName: _component.selectedHost,
- serviceId: _component.serviceId,
-
git commit: AMBARI-6631. Provide host-layout recommendations via /recommendations endpoint on stack-version
Repository: ambari Updated Branches: refs/heads/trunk ee94c2f5b - b0b58189c AMBARI-6631. Provide host-layout recommendations via /recommendations endpoint on stack-version Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b0b58189 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b0b58189 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b0b58189 Branch: refs/heads/trunk Commit: b0b58189cc8713642102eadb46e4bfabfaf84c21 Parents: ee94c2f Author: Srimanth Gunturi sgunt...@hortonworks.com Authored: Mon Jul 28 12:10:42 2014 -0700 Committer: Srimanth Gunturi sgunt...@hortonworks.com Committed: Mon Jul 28 13:19:40 2014 -0700 -- ambari-server/conf/unix/ambari.properties | 3 + ambari-server/pom.xml | 4 + .../RecommendationResourceDefinition.java | 44 .../resources/ResourceInstanceFactoryImpl.java | 4 + .../ambari/server/api/services/BaseService.java | 2 +- .../server/api/services/LocalUriInfo.java | 144 +++ .../api/services/RecommendationService.java | 71 ++ .../server/api/services/StacksService.java | 4 +- .../services/parsers/JsonRequestBodyParser.java | 19 +- .../stackadvisor/StackAdvisorException.java | 31 +++ .../stackadvisor/StackAdvisorHelper.java| 241 +++ .../stackadvisor/StackAdvisorRunner.java| 125 ++ .../recommendations/RecommendationRequest.java | 91 +++ .../recommendations/RecommendationResponse.java | 208 .../server/configuration/Configuration.java | 13 + .../ambari/server/controller/AmbariServer.java | 3 + .../AbstractControllerResourceProvider.java | 2 + .../RecommendationResourceProvider.java | 199 +++ .../ambari/server/controller/spi/Resource.java | 2 + .../src/main/resources/key_properties.json | 5 + .../src/main/resources/properties.json | 17 ++ .../src/main/resources/scripts/stack_advisor.py | 148 .../stacks/HDP/2.0.6/services/stack_advisor.py | 202 .../main/resources/stacks/HDP/stack_advisor.py | 37 +++ .../server/api/services/GroupServiceTest.java | 2 +- .../server/api/services/MemberServiceTest.java | 2 +- .../api/services/RecommendationServiceTest.java | 85 +++ 27 files changed, 1699 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/b0b58189/ambari-server/conf/unix/ambari.properties -- diff --git a/ambari-server/conf/unix/ambari.properties b/ambari-server/conf/unix/ambari.properties index b5816af..b77ae32 100644 --- a/ambari-server/conf/unix/ambari.properties +++ b/ambari-server/conf/unix/ambari.properties @@ -29,6 +29,9 @@ webapp.dir=/usr/lib/ambari-server/web bootstrap.dir=/var/run/ambari-server/bootstrap bootstrap.script=/usr/lib/python2.6/site-packages/ambari_server/bootstrap.py bootstrap.setup_agent.script=/usr/lib/python2.6/site-packages/ambari_server/setupAgent.py +recommendations.dir=/var/run/ambari-server/stack-recommendations +stackadvisor.script=/var/lib/ambari-server/resources/scripts/stack_advisor.py + api.authenticate=true server.connection.max.idle.millis=90 server.fqdn.service.url=http://169.254.169.254/latest/meta-data/public-hostname http://git-wip-us.apache.org/repos/asf/ambari/blob/b0b58189/ambari-server/pom.xml -- diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml index 789de18..a6d03ab 100644 --- a/ambari-server/pom.xml +++ b/ambari-server/pom.xml @@ -352,6 +352,9 @@ directory/var/run/ambari-server/bootstrap/directory /mapping mapping + directory/var/run/ambari-server/stack-recommendations/directory +/mapping +mapping directory/var/log/ambari-server/directory /mapping mapping @@ -515,6 +518,7 @@ path/usr/lib/ambari-server/path path/var/run/ambari-server/path path/var/run/ambari-server/bootstrap/path +path/var/run/ambari-server/stack-recommendations/path path/var/log/ambari-server/path path/var/lib/ambari-server/resources/upgrade/path /paths http://git-wip-us.apache.org/repos/asf/ambari/blob/b0b58189/ambari-server/src/main/java/org/apache/ambari/server/api/resources/RecommendationResourceDefinition.java -- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/RecommendationResourceDefinition.java
git commit: AMBARI-6629. Only client component is displayed on summary page for a new service added to stack. (jaimin)
Repository: ambari
Updated Branches:
refs/heads/trunk b0b58189c - 3b9e4d1d1
AMBARI-6629. Only client component is displayed on summary page for a new
service added to stack. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3b9e4d1d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3b9e4d1d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3b9e4d1d
Branch: refs/heads/trunk
Commit: 3b9e4d1d1f2f039899e01f04569958277bbb1109
Parents: b0b5818
Author: Jaimin Jetly jai...@hortonworks.com
Authored: Mon Jul 28 13:19:28 2014 -0700
Committer: Jaimin Jetly jai...@hortonworks.com
Committed: Mon Jul 28 13:21:29 2014 -0700
--
ambari-web/app/models/host_component.js | 63 ++--
.../main/service/info/components_list_view.js | 2 +-
.../app/views/main/service/info/summary.js | 2 +-
3 files changed, 6 insertions(+), 61 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b9e4d1d/ambari-web/app/models/host_component.js
--
diff --git a/ambari-web/app/models/host_component.js
b/ambari-web/app/models/host_component.js
index adcecb2..6cf6b8f 100644
--- a/ambari-web/app/models/host_component.js
+++ b/ambari-web/app/models/host_component.js
@@ -57,34 +57,7 @@ App.HostComponent = DS.Model.extend({
* @returns {bool}
*/
isMaster: function () {
-switch (this.get('componentName')) {
- case 'NAMENODE':
- case 'SECONDARY_NAMENODE':
- case 'SNAMENODE':
- case 'JOURNALNODE':
- case 'JOBTRACKER':
- case 'ZOOKEEPER_SERVER':
- case 'HIVE_SERVER':
- case 'HIVE_METASTORE':
- case 'MYSQL_SERVER':
- case 'HBASE_MASTER':
- case 'NAGIOS_SERVER':
- case 'GANGLIA_SERVER':
- case 'OOZIE_SERVER':
- case 'WEBHCAT_SERVER':
- case 'HUE_SERVER':
- case 'HISTORYSERVER':
- case 'FALCON_SERVER':
- case 'NIMBUS':
- case 'STORM_UI_SERVER':
- case 'DRPC_SERVER':
- case 'STORM_REST_API':
- case 'RESOURCEMANAGER':
- case 'APP_TIMELINE_SERVER':
-return true;
- default:
-return false;
-}
+return App.get('components.masters').contains(this.get('componentName'));
}.property('componentName'),
/**
@@ -92,19 +65,7 @@ App.HostComponent = DS.Model.extend({
* @returns {bool}
*/
isSlave: function(){
-switch (this.get('componentName')) {
- case 'DATANODE':
- case 'TASKTRACKER':
- case 'HBASE_REGIONSERVER':
- case 'GANGLIA_MONITOR':
- case 'NODEMANAGER':
- case 'ZKFC':
- case 'SUPERVISOR':
- case 'FLUME_HANDLER':
-return true;
- default:
-return false;
-}
+return App.get('components.slaves').contains(this.get('componentName'));
}.property('componentName'),
/**
* Only certain components can be deleted.
@@ -114,24 +75,8 @@ App.HostComponent = DS.Model.extend({
* @returns {bool}
*/
isDeletable: function() {
-var canDelete = false;
-switch (this.get('componentName')) {
- case 'DATANODE':
- case 'TASKTRACKER':
- case 'ZOOKEEPER_SERVER':
- case 'HBASE_REGIONSERVER':
- case 'GANGLIA_MONITOR':
- case 'SUPERVISOR':
- case 'NODEMANAGER':
-canDelete = true;
-break;
- default:
-}
-if (!canDelete) {
- canDelete = this.get('isClient');
-}
-return canDelete;
- }.property('componentName', 'isClient'),
+return App.get('components.deletable').contains(this.get('componentName'));
+ }.property('componentName'),
/**
* A host-component is decommissioning when it is in HDFS service's list of
* decomNodes.
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b9e4d1d/ambari-web/app/views/main/service/info/components_list_view.js
--
diff --git a/ambari-web/app/views/main/service/info/components_list_view.js
b/ambari-web/app/views/main/service/info/components_list_view.js
index 5486f8b..6c98f3f 100644
--- a/ambari-web/app/views/main/service/info/components_list_view.js
+++ b/ambari-web/app/views/main/service/info/components_list_view.js
@@ -20,7 +20,7 @@ var App = require('app');
App.SummaryMasterComponentsView = Em.View.extend({
templateName:
require('templates/main/service/info/summary/master_components'),
- masterComp: null,
+ mastersComp: null,
didInsertElement: function() {
App.tooltip($('[rel=healthTooltip]'));
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b9e4d1d/ambari-web/app/views/main/service/info/summary.js
--
diff --git a/ambari-web/app/views/main/service/info/summary.js
git commit: AMBARI-6580. Installer wizard: No configuration sites are created for newly added service. (jaimin)
Repository: ambari
Updated Branches:
refs/heads/trunk 3b9e4d1d1 - a69261890
AMBARI-6580. Installer wizard: No configuration sites are created for newly
added service. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a6926189
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a6926189
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a6926189
Branch: refs/heads/trunk
Commit: a69261890b2460e0ed9bdf80bafcf177477fe618
Parents: 3b9e4d1
Author: Jaimin Jetly jai...@hortonworks.com
Authored: Mon Jul 28 13:53:41 2014 -0700
Committer: Jaimin Jetly jai...@hortonworks.com
Committed: Mon Jul 28 13:53:41 2014 -0700
--
.../app/controllers/wizard/step8_controller.js | 165 ---
1 file changed, 35 insertions(+), 130 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/a6926189/ambari-web/app/controllers/wizard/step8_controller.js
--
diff --git a/ambari-web/app/controllers/wizard/step8_controller.js
b/ambari-web/app/controllers/wizard/step8_controller.js
index 0597ebb..e0bf25d 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -630,7 +630,7 @@ App.WizardStep8Controller = Em.Controller.extend({
display_name: service.get('displayNameOnSelectServicePage'),
service_components: Em.A([])
});
- service.get('serviceComponents').forEach(function(component) {
+ service.get('serviceComponents').forEach(function (component) {
// show clients for services that have only clients components
if ((component.get('isClient') || component.get('isClientBehavior'))
!service.get('isClientOnlyService')) return;
// skip components that was hide on assign master page
@@ -642,7 +642,7 @@ App.WizardStep8Controller = Em.Controller.extend({
displayName = Em.I18n.t('common.clients')
} else {
// remove service name from component display name
- displayName = component.get('displayName').replace(new RegExp('^' +
service.get('serviceName') + '\\s','i'), '');
+ displayName = component.get('displayName').replace(new RegExp('^' +
service.get('serviceName') + '\\s', 'i'), '');
}
serviceObj.get('service_components').pushObject(Em.Object.create({
component_name: component.get('isClient') ?
Em.I18n.t('common.client').toUpperCase() : component.get('componentName'),
@@ -690,7 +690,7 @@ App.WizardStep8Controller = Em.Controller.extend({
return componentValue;
},
- getMasterComponentValue: function(componentName) {
+ getMasterComponentValue: function (componentName) {
var masterComponents = this.get('content.masterComponentHosts');
var hostsCount = masterComponents.filterProperty('component',
componentName).length;
return stringUtils.pluralize(hostsCount,
@@ -712,16 +712,16 @@ App.WizardStep8Controller = Em.Controller.extend({
}
else {
if (hiveDb.value === 'Existing MySQL Database') {
-db = serviceConfigPreoprties .findProperty('name',
'hive_existing_mysql_database');
+db = serviceConfigPreoprties.findProperty('name',
'hive_existing_mysql_database');
return db.value + ' (' + hiveDb.value + ')';
}
else {
if (hiveDb.value ===
Em.I18n.t('services.service.config.hive.oozie.postgresql')) {
- db = serviceConfigPreoprties .findProperty('name',
'hive_existing_postgresql_database');
+ db = serviceConfigPreoprties.findProperty('name',
'hive_existing_postgresql_database');
return db.value + ' (' + hiveDb.value + ')';
}
else { // existing oracle database
- db = serviceConfigPreoprties .findProperty('name',
'hive_existing_oracle_database');
+ db = serviceConfigPreoprties.findProperty('name',
'hive_existing_oracle_database');
return db.value + ' (' + hiveDb.value + ')';
}
}
@@ -828,11 +828,11 @@ App.WizardStep8Controller = Em.Controller.extend({
var configs = this.get('configs').slice(0);
var configsMap = [];
-fileNamesToUpdate.forEach(function(fileName){
+fileNamesToUpdate.forEach(function (fileName) {
if (!fileName || /^(core)/.test(fileName)) return;
var tagName = 'version' + (new Date).getTime();
var configsToSave = configs.filterProperty('filename', fileName);
- configsToSave.forEach(function(item) {
+ configsToSave.forEach(function (item) {
item.value = App.config.trimProperty(item, false);
});
configsMap.push(configurationController.createSiteObj(fileName.replace(.xml,
), tagName, configsToSave));
@@ -1051,7 +1051,7 @@ App.WizardStep8Controller =
git commit: AMBARI-6642. FE: Ambari installer wizard should use /recommendations API to determine component layout
Repository: ambari
Updated Branches:
refs/heads/trunk a69261890 - 9986f6c15
AMBARI-6642. FE: Ambari installer wizard should use /recommendations API to
determine component layout
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9986f6c1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9986f6c1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9986f6c1
Branch: refs/heads/trunk
Commit: 9986f6c158d1caddd8cb0d0a8d7fc06634a7bcbc
Parents: a692618
Author: Srimanth Gunturi sgunt...@hortonworks.com
Authored: Mon Jul 28 13:26:53 2014 -0700
Committer: Srimanth Gunturi sgunt...@hortonworks.com
Committed: Mon Jul 28 14:50:44 2014 -0700
--
.../data/stacks/HDP-2.1/recommendations.json| 149 ++
ambari-web/app/controllers/installer.js | 7 +
.../app/controllers/wizard/step5_controller.js | 280 +--
.../app/controllers/wizard/step6_controller.js | 46 +--
.../app/models/stack_service_component.js | 29 --
ambari-web/app/routes/add_service_routes.js | 3 +
ambari-web/app/routes/installer.js | 1 +
ambari-web/app/utils/ajax/ajax.js | 14 +
8 files changed, 337 insertions(+), 192 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/9986f6c1/ambari-web/app/assets/data/stacks/HDP-2.1/recommendations.json
--
diff --git a/ambari-web/app/assets/data/stacks/HDP-2.1/recommendations.json
b/ambari-web/app/assets/data/stacks/HDP-2.1/recommendations.json
new file mode 100644
index 000..1b851bf
--- /dev/null
+++ b/ambari-web/app/assets/data/stacks/HDP-2.1/recommendations.json
@@ -0,0 +1,149 @@
+{
+ resources : [
+{
+ Versions: {
+stack_name: HDP,
+stack_version: 2.1.1
+ },
+ hosts: [dev1.hortonworks.com, dev2.hortonworks.com,
dev3.hortonworks.com],
+ services: [FALCON, FLUME, GANGLIA, HBASE, HCATALOG, HDFS,
HIVE, MAPREDUCE2, NAGIOS, OOZIE, PIG, SQOOP, STORM, TEZ,
WEBCHAT, YARN, ZOOKEEPER],
+ recommendations: {
+blueprint: {
+ configurations: {
+global: {
+ properties: {
+hbase_user: hbase,
+clientPort: 2181,
+hadoop_heapsize: 1024
+ }
+},
+core-site: { },
+hdfs-site: { },
+yarn-site: { },
+hbase-site: { }
+ },
+ host_groups: [
+{
+ name: host-group-1,
+ components: [
+{
+ name: NAMENODE
+},
+{
+ name: NAGIOS_SERVER
+},
+{
+ name: GANGLIA_SERVER
+},
+{
+ name: HBASE_MASTER
+},
+{
+ name: ZOOKEEPER_SERVER
+},
+{
+ name: DRPC_SERVER
+},
+{
+ name: NIMBUS
+},
+{
+ name: STORM_REST_API
+},
+{
+ name: STORM_UI_SERVER
+}
+ ]
+},
+{
+ name: host-group-2,
+ components: [
+{
+ name: SECONDARY_NAMENODE
+},
+{
+ name: HISTORYSERVER
+},
+{
+ name: APP_TIMELINE_SERVER
+},
+{
+ name: RESOURCEMANAGER
+},
+{
+ name: HIVE_METASTORE
+},
+{
+ name: HIVE_SERVER
+},
+{
+ name: WEBHCAT_SERVER
+},
+{
+ name: OOZIE_SERVER
+},
+{
+ name: ZOOKEEPER_SERVER
+},
+{
+ name: FALCON_SERVER
+}
+ ]
+},
+{
+ name: host-group-3,
+ components: [
+{
+ name: ZOOKEEPER_SERVER
+},
+{
+ name: DATANODE
+},
+{
+ name: NODEMANAGER
+},
+{
+ name: HBASE_REGIONSERVER
+},
+{
+ name: SUPERVISOR
+},
+{
+ name: CLIENT
+}
+ ]
+}
+ ]
+},
+blueprint_cluster_binding: {
+ host_groups: [
+{
+ name: host-group-1,
+ hosts: [
+{
+ fqdn: hwa-cls2-m.viacode.com
+}
+ ]
+},
+{
+ name: host-group-2,
+ hosts: [
+{
+ fqdn: hwa-cls2-s1.viacode.com
+}
+ ]
+},
+{
+ name: host-group-3,
+ hosts: [
+{
+ fqdn:
