git commit: AMBARI-6422. Failing ambari-server tests on trunk (dlysnichenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 4a2498ea3 - 5bb59403f
AMBARI-6422. Failing ambari-server tests on trunk (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5bb59403
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5bb59403
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5bb59403
Branch: refs/heads/trunk
Commit: 5bb59403fea8de54690f6f19a30df5462c99f784
Parents: 4a2498e
Author: Lisnichenko Dmitro dlysniche...@hortonworks.com
Authored: Tue Jul 8 20:22:49 2014 +0300
Committer: Lisnichenko Dmitro dlysniche...@hortonworks.com
Committed: Wed Jul 9 14:43:23 2014 +0300
--
.../java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java | 2 ++
.../apache/ambari/server/api/util/StackExtensionHelperTest.java| 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/5bb59403/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
index 50087e5..d75ef85 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
@@ -71,6 +71,8 @@ public class UpgradeCatalog170 extends AbstractUpgradeCatalog
{
String.class, 255, null, true));
dbAccessor.addColumn(viewparameter, new DBAccessor.DBColumnInfo(masked,
Character.class, 1, null, true));
+dbAccessor.addColumn(users, new DBAccessor.DBColumnInfo(active,
+ Integer.class, 1, 1, false));
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/5bb59403/ambari-server/src/test/java/org/apache/ambari/server/api/util/StackExtensionHelperTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/api/util/StackExtensionHelperTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/api/util/StackExtensionHelperTest.java
index 6456860..79745bb 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/api/util/StackExtensionHelperTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/api/util/StackExtensionHelperTest.java
@@ -77,7 +77,7 @@ public class StackExtensionHelperTest {
assertEquals(MASTER, components.get(0).getCategory());
ListPropertyInfo properties = serviceInfo.getProperties();
// Check some property
-assertEquals(38, properties.size());
+assertEquals(37, properties.size());
boolean found = false;
for (PropertyInfo property : properties) {
if
(property.getName().equals(javax.jdo.option.ConnectionDriverName)) {
git commit: AMBARI-6431. Individual flume graph data not loading correctly. (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 5bb59403f - 306e4d469
AMBARI-6431. Individual flume graph data not loading correctly. (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/306e4d46
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/306e4d46
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/306e4d46
Branch: refs/heads/trunk
Commit: 306e4d4693f35c30f21a56e205cadb3d2534f8ef
Parents: 5bb5940
Author: Aleksandr Kovalenko akovale...@hortonworks.com
Authored: Wed Jul 9 15:34:53 2014 +0300
Committer: Aleksandr Kovalenko akovale...@hortonworks.com
Committed: Wed Jul 9 15:34:53 2014 +0300
--
ambari-web/app/utils/ajax/ajax.js | 9 ++-
.../info/metrics/flume/flume_metric_graph.js| 13 +++-
.../info/metrics/flume/flume_metric_graphs.js | 75
3 files changed, 61 insertions(+), 36 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/306e4d46/ambari-web/app/utils/ajax/ajax.js
--
diff --git a/ambari-web/app/utils/ajax/ajax.js
b/ambari-web/app/utils/ajax/ajax.js
index 9581283..f10abb7 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -1574,8 +1574,13 @@ var urls = {
}
},
'host.host_component.flume.metrics.timeseries': {
-'real':
'/clusters/{clusterName}/hosts/{hostName}/host_components/FLUME_HANDLER?fields=metrics/flume/flume/{flumeComponent}/*/{flumeComponentMetric}[{fromSeconds},{toSeconds},{stepSeconds}]',
-'mock': ''
+'real': '',
+'mock': '',
+format: function (data) {
+ return {
+url: data.url
+ }
+}
},
'host.host_components.filtered': {
'real': '/clusters/{clusterName}/hosts?{fields}',
http://git-wip-us.apache.org/repos/asf/ambari/blob/306e4d46/ambari-web/app/views/main/service/info/metrics/flume/flume_metric_graph.js
--
diff --git
a/ambari-web/app/views/main/service/info/metrics/flume/flume_metric_graph.js
b/ambari-web/app/views/main/service/info/metrics/flume/flume_metric_graph.js
index 56a1c7f..f138f40 100644
--- a/ambari-web/app/views/main/service/info/metrics/flume/flume_metric_graph.js
+++ b/ambari-web/app/views/main/service/info/metrics/flume/flume_metric_graph.js
@@ -33,6 +33,7 @@ App.ChartServiceFlumeMetricGraph =
App.ChartLinearTimeView.extend({
metricType: null,
metricName: null,
hostName: null,
+ metricItems: null,
id: function(){
return service-metrics-flume-metric-graph- + this.get('metricType') +
'-' + this.get('metricName');
@@ -46,9 +47,15 @@ App.ChartServiceFlumeMetricGraph =
App.ChartLinearTimeView.extend({
getDataForAjaxRequest: function() {
var data = this._super();
-data.flumeComponentMetric = this.get('metricName');
-data.flumeComponent = this.get('metricType');
-data.hostName = this.get('hostName');
+
+var urlFields = '';
+this.get('metricItems').forEach(function (metricItem, index) {
+ urlFields += index === 0 ? '' : ',';
+ urlFields += 'metrics/flume/flume/' + this.get('metricType') + '/' +
metricItem + '/' + this.get('metricName') +
+ '[' + data.fromSeconds + ',' + data.toSeconds + ',' +
data.stepSeconds + ']'
+}, this);
+
+data.url = App.get('apiPrefix') + '/clusters/' + App.get('clusterName') +
'/hosts/' + this.get('hostName') + '/host_components/FLUME_HANDLER?fields=' +
urlFields;
return data;
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/306e4d46/ambari-web/app/views/main/service/info/metrics/flume/flume_metric_graphs.js
--
diff --git
a/ambari-web/app/views/main/service/info/metrics/flume/flume_metric_graphs.js
b/ambari-web/app/views/main/service/info/metrics/flume/flume_metric_graphs.js
index bb38638..b677567 100644
---
a/ambari-web/app/views/main/service/info/metrics/flume/flume_metric_graphs.js
+++
b/ambari-web/app/views/main/service/info/metrics/flume/flume_metric_graphs.js
@@ -20,43 +20,18 @@ require('views/main/service/service');
App.MainServiceInfoFlumeGraphsView =
App.MainServiceInfoSummaryMetricGraphsView.extend({
- serviceMetricGraphs: function() {
+ serviceMetricGraphs: [],
+
+ loadMetrics: function () {
var graphRows = [];
var viewData = this.get('viewData');
if (viewData != null) {
var metricType = viewData.metricType;
var hostName = viewData.agent.get('hostName');
- var metricNamesGatherer = {
-success: function(data) {
- var metricNames = {};
- if (data != null data.metrics != null data.metrics.flume !=
null data.metrics.flume.flume != null
git commit: AMBARI-6434 Remove synchronous calls that load user preferences. (atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk 306e4d469 - fbeeaf8b5
AMBARI-6434 Remove synchronous calls that load user preferences. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fbeeaf8b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fbeeaf8b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fbeeaf8b
Branch: refs/heads/trunk
Commit: fbeeaf8b544274b51fa15d7b1eafee35ff39
Parents: 306e4d4
Author: atkach atk...@hortonworks.com
Authored: Wed Jul 9 17:52:25 2014 +0300
Committer: atkach atk...@hortonworks.com
Committed: Wed Jul 9 17:57:56 2014 +0300
--
.../controllers/global/cluster_controller.js| 2 +-
.../controllers/main/admin/access_controller.js | 6 --
ambari-web/app/mixins/common/userPref.js| 8 --
ambari-web/app/models/cluster_states.js | 9 +-
ambari-web/app/router.js| 81 ---
ambari-web/app/routes/installer.js | 65 ++--
ambari-web/app/utils/ajax/ajax.js | 8 +-
ambari-web/app/views/common/table_view.js | 19 +++-
ambari-web/app/views/main/dashboard/widget.js | 45
ambari-web/app/views/main/dashboard/widgets.js | 104 ++-
10 files changed, 175 insertions(+), 172 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/fbeeaf8b/ambari-web/app/controllers/global/cluster_controller.js
--
diff --git a/ambari-web/app/controllers/global/cluster_controller.js
b/ambari-web/app/controllers/global/cluster_controller.js
index b68ddab..2d91d94 100644
--- a/ambari-web/app/controllers/global/cluster_controller.js
+++ b/ambari-web/app/controllers/global/cluster_controller.js
@@ -278,7 +278,7 @@ App.ClusterController = Em.Controller.extend({
if (App.testMode) {
self.updateLoadStatus('clusterStatus');
} else {
- App.clusterStatus.updateFromServer(true).complete(function () {
+ App.clusterStatus.updateFromServer().complete(function () {
self.updateLoadStatus('clusterStatus');
});
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/fbeeaf8b/ambari-web/app/controllers/main/admin/access_controller.js
--
diff --git a/ambari-web/app/controllers/main/admin/access_controller.js
b/ambari-web/app/controllers/main/admin/access_controller.js
index 6e0e2c3..aaab364 100644
--- a/ambari-web/app/controllers/main/admin/access_controller.js
+++ b/ambari-web/app/controllers/main/admin/access_controller.js
@@ -28,12 +28,6 @@ App.MainAdminAccessController =
Em.Controller.extend(App.UserPref, {
showJobs: true,
/**
- * User pref request should be sync
- * @type {bool}
- */
- makeRequestAsync: false,
-
- /**
* User pref key
* @type {string}
*/
http://git-wip-us.apache.org/repos/asf/ambari/blob/fbeeaf8b/ambari-web/app/mixins/common/userPref.js
--
diff --git a/ambari-web/app/mixins/common/userPref.js
b/ambari-web/app/mixins/common/userPref.js
index 5ecef1c..048172c 100644
--- a/ambari-web/app/mixins/common/userPref.js
+++ b/ambari-web/app/mixins/common/userPref.js
@@ -34,12 +34,6 @@ var App = require('app');
App.UserPref = Em.Mixin.create({
/**
- * Should codegetUserPref/code and codepostUserPref/code be async
- * @type {bool}
- */
- makeRequestAsync: true,
-
- /**
* Additional to request data
* @type {object}
*/
@@ -55,7 +49,6 @@ App.UserPref = Em.Mixin.create({
sender: this,
data: {
key: key,
-async: this.get('makeRequestAsync'),
data: this.get('additionalData')
},
success: 'getUserPrefSuccessCallback',
@@ -95,7 +88,6 @@ App.UserPref = Em.Mixin.create({
'sender': this,
'beforeSend': 'postUserPrefBeforeSend',
'data': {
-'async': this.get('makeRequestAsync'),
'keyValuePair': keyValuePair
},
'success': 'postUserPrefSuccessCallback',
http://git-wip-us.apache.org/repos/asf/ambari/blob/fbeeaf8b/ambari-web/app/models/cluster_states.js
--
diff --git a/ambari-web/app/models/cluster_states.js
b/ambari-web/app/models/cluster_states.js
index 4eab62a..f9685e8 100644
--- a/ambari-web/app/models/cluster_states.js
+++ b/ambari-web/app/models/cluster_states.js
@@ -103,19 +103,16 @@ App.clusterStatus = Em.Object.create(App.UserPref, {
/**
* get cluster data from server and update cluster status
- * @param {bool} isAsync set this to true if the call is to be made
asynchronously. if unspecified, false is assumed
* @param {bool} overrideLocaldb
* @return
[2/2] git commit: AMBARI-6438 Possible memory leaks in UI. Browser consumes 1-3 GB RAM and 100%CPU. (ababiichuk)
AMBARI-6438 Possible memory leaks in UI. Browser consumes 1-3 GB RAM and
100%CPU. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ba5430ab
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ba5430ab
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ba5430ab
Branch: refs/heads/trunk
Commit: ba5430ab09aa1710586290efd1787f8cd940
Parents: fbeeaf8
Author: aBabiichuk ababiic...@cybervisiontech.com
Authored: Wed Jul 9 18:04:19 2014 +0300
Committer: aBabiichuk ababiic...@cybervisiontech.com
Committed: Wed Jul 9 18:06:23 2014 +0300
--
ambari-web/app/controllers/wizard/step9_controller.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba5430ab/ambari-web/app/controllers/wizard/step9_controller.js
--
diff --git a/ambari-web/app/controllers/wizard/step9_controller.js
b/ambari-web/app/controllers/wizard/step9_controller.js
index a447ef0..d7e39ea 100644
--- a/ambari-web/app/controllers/wizard/step9_controller.js
+++ b/ambari-web/app/controllers/wizard/step9_controller.js
@@ -802,7 +802,7 @@ App.WizardStep9Controller = Em.Controller.extend({
this.saveInstalledHosts(this);
return true;
}
-this.changeParseHostInfo(false);
+return false;
},
/**
git commit: AMBARI-6439 Filter state does not clear in Background Operation popup and causes a lot of confusion. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/branch-1.6.1 22115a021 - 1f85bdc9b
AMBARI-6439 Filter state does not clear in Background Operation popup and
causes a lot of confusion. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1f85bdc9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1f85bdc9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1f85bdc9
Branch: refs/heads/branch-1.6.1
Commit: 1f85bdc9ba37d2e011a11560777b7d106a21c054
Parents: 22115a0
Author: aBabiichuk ababiic...@cybervisiontech.com
Authored: Wed Jul 9 18:10:45 2014 +0300
Committer: aBabiichuk ababiic...@cybervisiontech.com
Committed: Wed Jul 9 18:10:45 2014 +0300
--
ambari-web/app/utils/host_progress_popup.js | 4
1 file changed, 4 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/1f85bdc9/ambari-web/app/utils/host_progress_popup.js
--
diff --git a/ambari-web/app/utils/host_progress_popup.js
b/ambari-web/app/utils/host_progress_popup.js
index cfc06d1..3c63965 100644
--- a/ambari-web/app/utils/host_progress_popup.js
+++ b/ambari-web/app/utils/host_progress_popup.js
@@ -734,12 +734,16 @@ App.HostPopup = Em.Object.create({
levelInfo.set('name', levelName);
if (levelName === 'HOSTS_LIST') {
this.set('isLevelLoaded',
dataSourceController.requestMostRecent());
+ this.set('hostCategory',
this.get('categories').findProperty('value','all'));
} else if (levelName === 'TASK_DETAILS') {
dataSourceController.requestMostRecent();
this.set('isLevelLoaded', false);
} else if (levelName === 'REQUESTS_LIST') {
+ this.set('serviceCategory',
this.get('categories').findProperty('value','all'));
this.get('controller.hosts').clear();
dataSourceController.requestMostRecent();
+} else {
+ this.set('taskCategory',
this.get('categories').findProperty('value','all'));
}
} else if
(securityControllers.contains(dataSourceController.get('name'))) {
if (levelName === 'TASK_DETAILS') {
git commit: AMBARI-6440. Unable to move NameNode. (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/branch-1.6.1 1f85bdc9b - a95e46d53
AMBARI-6440. Unable to move NameNode. (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a95e46d5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a95e46d5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a95e46d5
Branch: refs/heads/branch-1.6.1
Commit: a95e46d539db12fff727a49cac17a79402072856
Parents: 1f85bdc
Author: Aleksandr Kovalenko akovale...@hortonworks.com
Authored: Wed Jul 9 20:37:57 2014 +0300
Committer: Aleksandr Kovalenko akovale...@hortonworks.com
Committed: Wed Jul 9 20:37:57 2014 +0300
--
.../main/service/reassign/step2_controller.js | 24 ++--
1 file changed, 7 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/a95e46d5/ambari-web/app/controllers/main/service/reassign/step2_controller.js
--
diff --git
a/ambari-web/app/controllers/main/service/reassign/step2_controller.js
b/ambari-web/app/controllers/main/service/reassign/step2_controller.js
index 8964c1b..4b2ad6a 100644
--- a/ambari-web/app/controllers/main/service/reassign/step2_controller.js
+++ b/ambari-web/app/controllers/main/service/reassign/step2_controller.js
@@ -64,7 +64,6 @@ App.ReassignMasterWizardStep2Controller =
App.WizardStep5Controller.extend({
rebalanceSingleComponentHosts:function (componentName) {
var currentComponents =
this.get(selectedServicesMasters).filterProperty(component_name,
componentName),
- componentHosts = currentComponents.mapProperty(selectedHost),
availableComponentHosts = [],
preparedAvailableHosts = null;
this.get(hosts).forEach(function (item) {
@@ -83,20 +82,10 @@ App.ReassignMasterWizardStep2Controller =
App.WizardStep5Controller.extend({
item.set(availableHosts,
preparedAvailableHosts.sortProperty('host_name'));
}, this);
},
- /**
- * Determines if hostName is valid for component:
- * ul
- * lihost should have only one component with
codecomponentName/code/li
- * /ul
- * @param {string} componentName
- * @param {string} selectedHost
- * @returns {boolean} true - valid, false - invalid
- * @method isHostNameValid
- */
- isHostNameValid: function (componentName, selectedHost) {
-var isValid = this._super(componentName, selectedHost);
-if (isValid) {
+ getIsSubmitDisabled: function () {
+var isSubmitDisabled = this._super();
+if (!isSubmitDisabled) {
var reassigned = 0;
var existedComponents =
App.HostComponent.find().filterProperty('componentName',
this.get('content.reassign.component_name')).mapProperty('hostName');
var newComponents =
this.get('servicesMasters').mapProperty('selectedHost');
@@ -105,9 +94,10 @@ App.ReassignMasterWizardStep2Controller =
App.WizardStep5Controller.extend({
reassigned++;
}
}, this);
- isValid = !(reassigned !== 1);
+ isSubmitDisabled = reassigned !== 1;
}
-return isValid;
- }
+this.set('submitDisabled', isSubmitDisabled);
+return isSubmitDisabled;
+ }.observes('servicesMasters.@each.selectedHost',
'servicesMasters.@each.isHostNameValid')
});
git commit: Revert AMBARI-6404 Hive Service Check fails on upgraded and then secured cluster. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/branch-1.6.1 a95e46d53 - e59802195
Revert AMBARI-6404 Hive Service Check fails on upgraded and then secured
cluster. (ababiichuk)
This reverts commit 611595f0f05c67479503f06ca3de08fcba65e96b. After this
commit, On disabling security Hive server start failed with classNotFound
exception
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e5980219
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e5980219
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e5980219
Branch: refs/heads/branch-1.6.1
Commit: e598021954ef20984d2f32d56fe11a314fc8b29d
Parents: a95e46d
Author: Jaimin Jetly jai...@hortonworks.com
Authored: Wed Jul 9 10:49:03 2014 -0700
Committer: Jaimin Jetly jai...@hortonworks.com
Committed: Wed Jul 9 10:49:03 2014 -0700
--
ambari-web/app/data/HDP2/secure_mapping.js | 27 -
1 file changed, 27 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/e5980219/ambari-web/app/data/HDP2/secure_mapping.js
--
diff --git a/ambari-web/app/data/HDP2/secure_mapping.js
b/ambari-web/app/data/HDP2/secure_mapping.js
index 217fac0..a7c5695 100644
--- a/ambari-web/app/data/HDP2/secure_mapping.js
+++ b/ambari-web/app/data/HDP2/secure_mapping.js
@@ -339,33 +339,6 @@ module.exports = [
serviceName: HIVE
},
{
-name: hive.security.authorization.manager,
-templateName: [],
-foreignKey: null,
-value:
org.apache.hadoop.hive.ql.security.authorization.StorageBasedAuthorizationProvider,
-nonSecureValue: NONE,
-filename: hive-site.xml,
-serviceName: HIVE
- },
- {
-name: hive.security.metastore.authorization.manager,
-templateName: [],
-foreignKey: null,
-value:
org.apache.hadoop.hive.ql.security.authorization.StorageBasedAuthorizationProvider,
-nonSecureValue: NONE,
-filename: hive-site.xml,
-serviceName: HIVE
- },
- {
-name: hive.security.authenticator.manager,
-templateName: [],
-foreignKey: null,
-value: org.apache.hadoop.hive.ql.security.ProxyUserAuthenticator,
-nonSecureValue: NONE,
-filename: hive-site.xml,
-serviceName: HIVE
- },
- {
name: hive.server2.authentication,
templateName: [],
foreignKey: null,
git commit: AMBARI-6441 Hosts page: the number of filtered hosts keeps flipping (unable to page; filtered hosts incorrect). (atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk d3b8a5e9e - 627e9261b
AMBARI-6441 Hosts page: the number of filtered hosts keeps flipping (unable to
page; filtered hosts incorrect). (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/627e9261
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/627e9261
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/627e9261
Branch: refs/heads/trunk
Commit: 627e9261bd33de123452fb52549820905dd96942
Parents: d3b8a5e
Author: atkach atk...@hortonworks.com
Authored: Wed Jul 9 20:54:05 2014 +0300
Committer: atkach atk...@hortonworks.com
Committed: Wed Jul 9 20:54:17 2014 +0300
--
.../app/controllers/global/update_controller.js | 33 ++--
1 file changed, 24 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/627e9261/ambari-web/app/controllers/global/update_controller.js
--
diff --git a/ambari-web/app/controllers/global/update_controller.js
b/ambari-web/app/controllers/global/update_controller.js
index 6238658..7d21f1b 100644
--- a/ambari-web/app/controllers/global/update_controller.js
+++ b/ambari-web/app/controllers/global/update_controller.js
@@ -36,6 +36,8 @@ App.UpdateController = Em.Controller.extend({
*/
hostsPreLoadKeys: ['host_components/HostRoles/component_name',
'host_components/HostRoles/stale_configs',
'host_components/HostRoles/maintenance_state'],
+ paginationKeys: ['page_size', 'from'],
+
getUrl: function (testUrl, url) {
return (App.get('testMode')) ? testUrl : App.apiPrefix + '/clusters/' +
this.get('clusterName') + url;
},
@@ -148,7 +150,7 @@ App.UpdateController = Em.Controller.extend({
updateHost: function (callback, error) {
var testUrl = App.get('isHadoop2Stack') ? '/data/hosts/HDP2/hosts.json' :
'/data/hosts/hosts.json',
self = this,
- p = '';
+ hostDetailsFilter = '';
var realUrl =
'/hosts?parametersfields=Hosts/host_name,Hosts/maintenance_state,Hosts/public_host_name,Hosts/cpu_count,Hosts/ph_cpu_count,Hosts/total_mem,'
+
'Hosts/host_status,Hosts/last_heartbeat_time,Hosts/os_arch,Hosts/os_type,Hosts/ip,host_components/HostRoles/state,host_components/HostRoles/maintenance_state,'
+
'host_components/HostRoles/stale_configs,host_components/HostRoles/service_name,metrics/disk,metrics/load/load_one,metrics/cpu/cpu_system,metrics/cpu/cpu_user,'
+
@@ -159,7 +161,7 @@ App.UpdateController = Em.Controller.extend({
}
else {
if(App.router.get('currentState.name') == 'summary'
App.router.get('currentState.parentState.name') == 'hostDetails') {
-p = 'Hosts/host_name=' +
App.router.get('location.lastSetURL').match(/\/hosts\/(.*)\/summary/)[1] + '';
+hostDetailsFilter =
App.router.get('location.lastSetURL').match(/\/hosts\/(.*)\/summary/)[1];
App.updater.updateInterval('updateHost',
App.get('componentsUpdateInterval'));
}
else {
@@ -171,9 +173,19 @@ App.UpdateController = Em.Controller.extend({
}
}
var mainHostController = App.router.get('mainHostController'),
- viewProperties = mainHostController.getViewProperties(),
sortProperties = mainHostController.getSortProperties();
-this.get('queryParams').set('Hosts',
mainHostController.getQueryParameters(true));
+if (hostDetailsFilter) {
+ //if host details page opened then request info only of one displayed
host
+ this.get('queryParams').set('Hosts', [
+{
+ key: 'Hosts/host_name',
+ value: [hostDetailsFilter],
+ type: 'MULTIPLE'
+}
+ ]);
+} else {
+ this.get('queryParams').set('Hosts',
mainHostController.getQueryParameters(true));
+}
var clientCallback = function (skipCall, queryParams) {
if (skipCall) {
//no hosts match filter by component
@@ -184,13 +196,16 @@ App.UpdateController = Em.Controller.extend({
callback();
}
else {
-var params = p + self.computeParameters(queryParams),
- viewProps = self.computeParameters(viewProperties),
+var params = self.computeParameters(queryParams),
+ paginationProps = self.computeParameters(queryParams.filter(function
(param) {
+return (this.get('paginationKeys').contains(param.key));
+ }, self)),
sortProps = self.computeParameters(sortProperties);
-if ((params.length + viewProps.length + sortProps.length) 0) {
+
+if ((params.length + paginationProps.length + sortProps.length) 0) {
realUrl = App.get('apiPrefix') + '/clusters/' +
App.get('clusterName') +
realUrl.replace('parameters', '') +
-(viewProps.length 0 ? '' +
git commit: Revert AMBARI-6404 Hive Service Check fails on upgraded and then secured cluster. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 627e9261b - a48363fc9
Revert AMBARI-6404 Hive Service Check fails on upgraded and then secured
cluster. (ababiichuk)
This reverts commit c9017f328d81ef6fa9343a6d1565ae3036eae4d0. After this
commit, On disabling security Hive server start failed with ClassNotFound
exception
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a48363fc
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a48363fc
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a48363fc
Branch: refs/heads/trunk
Commit: a48363fc98bbf9331dcaece7fe0fa765d839803f
Parents: 627e926
Author: Jaimin Jetly jai...@hortonworks.com
Authored: Wed Jul 9 10:55:05 2014 -0700
Committer: Jaimin Jetly jai...@hortonworks.com
Committed: Wed Jul 9 10:56:30 2014 -0700
--
ambari-web/app/data/HDP2/secure_mapping.js | 27 -
1 file changed, 27 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/a48363fc/ambari-web/app/data/HDP2/secure_mapping.js
--
diff --git a/ambari-web/app/data/HDP2/secure_mapping.js
b/ambari-web/app/data/HDP2/secure_mapping.js
index 217fac0..a7c5695 100644
--- a/ambari-web/app/data/HDP2/secure_mapping.js
+++ b/ambari-web/app/data/HDP2/secure_mapping.js
@@ -339,33 +339,6 @@ module.exports = [
serviceName: HIVE
},
{
-name: hive.security.authorization.manager,
-templateName: [],
-foreignKey: null,
-value:
org.apache.hadoop.hive.ql.security.authorization.StorageBasedAuthorizationProvider,
-nonSecureValue: NONE,
-filename: hive-site.xml,
-serviceName: HIVE
- },
- {
-name: hive.security.metastore.authorization.manager,
-templateName: [],
-foreignKey: null,
-value:
org.apache.hadoop.hive.ql.security.authorization.StorageBasedAuthorizationProvider,
-nonSecureValue: NONE,
-filename: hive-site.xml,
-serviceName: HIVE
- },
- {
-name: hive.security.authenticator.manager,
-templateName: [],
-foreignKey: null,
-value: org.apache.hadoop.hive.ql.security.ProxyUserAuthenticator,
-nonSecureValue: NONE,
-filename: hive-site.xml,
-serviceName: HIVE
- },
- {
name: hive.server2.authentication,
templateName: [],
foreignKey: null,
git commit: AMBARI-6333 Cluster aggregate metric charts do not show up on Dashboard if non-default rrds path. Additional patch (dsen)
Repository: ambari
Updated Branches:
refs/heads/branch-1.6.1 399a5eacf - eac111944
AMBARI-6333 Cluster aggregate metric charts do not show up on Dashboard if
non-default rrds path. Additional patch (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/eac11194
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/eac11194
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/eac11194
Branch: refs/heads/branch-1.6.1
Commit: eac111944f90250e61cf0121eddab95fd5b24a6c
Parents: 399a5ea
Author: Dmytro Sen d...@hortonworks.com
Authored: Wed Jul 9 21:17:29 2014 +0300
Committer: Dmytro Sen d...@hortonworks.com
Committed: Wed Jul 9 21:17:29 2014 +0300
--
.../HDP/1.3.2/services/GANGLIA/package/files/startRrdcached.sh | 1 +
.../HDP/2.0.6/services/GANGLIA/package/files/startRrdcached.sh | 1 +
2 files changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/eac11194/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/files/startRrdcached.sh
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/files/startRrdcached.sh
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/files/startRrdcached.sh
index 53ac8f8..d6f3dfa 100644
---
a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/files/startRrdcached.sh
+++
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/files/startRrdcached.sh
@@ -68,6 +68,7 @@ then
then
sed -i s@\$conf\['rrdcached_socket'] =.*@\$conf\['rrdcached_socket'] =
\unix:${RRDCACHED_LIMITED_ACCESS_UNIX_SOCKET}\;@ $GANGLIA_WEB_CONFIG_FILE
sed -i s@\$conf\['rrds'] =.*@\$conf\['rrds'] =
\${RRDCACHED_BASE_DIR}\;@ $GANGLIA_WEB_CONFIG_FILE
+ sed -i s@\$conf\['gmetad_root'] =.*@\$conf\['gmetad_root'] =
\${RRDCACHED_BASE_DIR}\;@ $GANGLIA_WEB_CONFIG_FILE
else
echo ${GANGLIA_WEB_CONFIG_FILE} can't be found;
exit 1;
http://git-wip-us.apache.org/repos/asf/ambari/blob/eac11194/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/files/startRrdcached.sh
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/files/startRrdcached.sh
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/files/startRrdcached.sh
index 18ef65a..4f86837 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/files/startRrdcached.sh
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/files/startRrdcached.sh
@@ -68,6 +68,7 @@ then
then
sed -i s@\$conf\['rrdcached_socket'] =.*@\$conf\['rrdcached_socket'] =
\unix:${RRDCACHED_LIMITED_ACCESS_UNIX_SOCKET}\;@ $GANGLIA_WEB_CONFIG_FILE
sed -i s@\$conf\['rrds'] =.*@\$conf\['rrds'] =
\${RRDCACHED_BASE_DIR}\;@ $GANGLIA_WEB_CONFIG_FILE
+ sed -i s@\$conf\['gmetad_root'] =.*@\$conf\['gmetad_root'] =
\${RRDCACHED_BASE_DIR}\;@ $GANGLIA_WEB_CONFIG_FILE
else
echo ${GANGLIA_WEB_CONFIG_FILE} can't be found;
exit 1;
git commit: AMBARI-6333 Cluster aggregate metric charts do not show up on Dashboard if non-default rrds path. Additional patch (dsen)
Repository: ambari
Updated Branches:
refs/heads/trunk a48363fc9 - b1e5641d2
AMBARI-6333 Cluster aggregate metric charts do not show up on Dashboard if
non-default rrds path. Additional patch (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b1e5641d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b1e5641d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b1e5641d
Branch: refs/heads/trunk
Commit: b1e5641d21035f62807c80330183d6e460f3ae35
Parents: a48363f
Author: Dmytro Sen d...@hortonworks.com
Authored: Wed Jul 9 21:19:00 2014 +0300
Committer: Dmytro Sen d...@hortonworks.com
Committed: Wed Jul 9 21:19:00 2014 +0300
--
.../HDP/1.3.2/services/GANGLIA/package/files/startRrdcached.sh | 1 +
.../HDP/2.0.6/services/GANGLIA/package/files/startRrdcached.sh | 1 +
2 files changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/b1e5641d/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/files/startRrdcached.sh
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/files/startRrdcached.sh
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/files/startRrdcached.sh
index ad24d65..6066da3 100644
---
a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/files/startRrdcached.sh
+++
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/files/startRrdcached.sh
@@ -68,6 +68,7 @@ then
then
sed -i s@\$conf\['rrdcached_socket'] =.*@\$conf\['rrdcached_socket'] =
\unix:${RRDCACHED_LIMITED_ACCESS_UNIX_SOCKET}\;@ $GANGLIA_WEB_CONFIG_FILE
sed -i s@\$conf\['rrds'] =.*@\$conf\['rrds'] =
\${RRDCACHED_BASE_DIR}\;@ $GANGLIA_WEB_CONFIG_FILE
+ sed -i s@\$conf\['gmetad_root'] =.*@\$conf\['gmetad_root'] =
\${RRDCACHED_BASE_DIR}\;@ $GANGLIA_WEB_CONFIG_FILE
else
echo ${GANGLIA_WEB_CONFIG_FILE} can't be found;
exit 1;
http://git-wip-us.apache.org/repos/asf/ambari/blob/b1e5641d/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/files/startRrdcached.sh
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/files/startRrdcached.sh
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/files/startRrdcached.sh
index dafc3e5..3126d5f 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/files/startRrdcached.sh
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/files/startRrdcached.sh
@@ -68,6 +68,7 @@ then
then
sed -i s@\$conf\['rrdcached_socket'] =.*@\$conf\['rrdcached_socket'] =
\unix:${RRDCACHED_LIMITED_ACCESS_UNIX_SOCKET}\;@ $GANGLIA_WEB_CONFIG_FILE
sed -i s@\$conf\['rrds'] =.*@\$conf\['rrds'] =
\${RRDCACHED_BASE_DIR}\;@ $GANGLIA_WEB_CONFIG_FILE
+ sed -i s@\$conf\['gmetad_root'] =.*@\$conf\['gmetad_root'] =
\${RRDCACHED_BASE_DIR}\;@ $GANGLIA_WEB_CONFIG_FILE
else
echo ${GANGLIA_WEB_CONFIG_FILE} can't be found;
exit 1;
git commit: AMBARI-6442. JS error occurs periodically when Job Details page is opened (Max Shepel via alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk b1e5641d2 - 673f649b0
AMBARI-6442. JS error occurs periodically when Job Details page is opened (Max
Shepel via alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/673f649b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/673f649b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/673f649b
Branch: refs/heads/trunk
Commit: 673f649b0733554542996c47e0546d8d4227c27a
Parents: b1e5641
Author: Alex Antonenko hiv...@gmail.com
Authored: Wed Jul 9 21:23:23 2014 +0300
Committer: Alex Antonenko hiv...@gmail.com
Committed: Wed Jul 9 21:23:23 2014 +0300
--
ambari-web/app/views/common/quick_view_link_view.js | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/673f649b/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 fb76c5b..703523a 100644
--- a/ambari-web/app/views/common/quick_view_link_view.js
+++ b/ambari-web/app/views/common/quick_view_link_view.js
@@ -33,6 +33,7 @@ App.QuickViewLinks = Em.View.extend({
},
loadTagsSuccess: function (data) {
+this.get('actualTags').clear();
var tags = [];
for (var prop in data.Clusters.desired_configs) {
tags.push(Em.Object.create({
@@ -40,7 +41,7 @@ App.QuickViewLinks = Em.View.extend({
tagName: data.Clusters.desired_configs[prop]['tag']
}));
}
-this.set('actualTags', tags);
+this.get('actualTags').pushObjects(tags);
this.setConfigProperties();
this.getQuickLinksHosts();
},
@@ -85,14 +86,13 @@ App.QuickViewLinks = Em.View.extend({
},
setConfigProperties: function () {
-this.set('configProperties', []);
+this.get('configProperties').clear();
var requiredSiteNames = this.get('requiredSiteNames');
var tags = this.get('actualTags').filter(function (tag) {
return requiredSiteNames.contains(tag.siteName);
});
var data =
App.router.get('configurationController').getConfigsByTags(tags);
-this.set('configProperties', data);
-
+this.get('configProperties').pushObjects(data);
},
ambariProperties: function () {
@@ -263,7 +263,7 @@ App.QuickViewLinks = Em.View.extend({
var properties = this.ambariProperties();
var configProperties = this.get('configProperties');
var hadoopSslEnabled = false;
-if (configProperties) {
+if (configProperties configProperties.length 0) {
var site = configProperties.findProperty('type', 'core-site');
site.properties['hadoop.ssl.enabled']
site.properties['hadoop.ssl.enabled'] === 'true' ? hadoopSslEnabled = true :
null;
}
git commit: AMBARI-6443. Add Service Wizard: Hive Database host config empty and disabled. (Buzhor Denys via alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/branch-1.6.1 eac111944 - ffb702b25
AMBARI-6443. Add Service Wizard: Hive Database host config empty and
disabled. (Buzhor Denys via alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ffb702b2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ffb702b2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ffb702b2
Branch: refs/heads/branch-1.6.1
Commit: ffb702b252a8b979529864ec5579465a122060b5
Parents: eac1119
Author: Alex Antonenko hiv...@gmail.com
Authored: Wed Jul 9 23:05:13 2014 +0300
Committer: Alex Antonenko hiv...@gmail.com
Committed: Wed Jul 9 23:05:13 2014 +0300
--
.../controllers/main/service/info/configs.js| 29 +++
.../app/controllers/wizard/step7_controller.js | 22 +++-
.../app/controllers/wizard/step8_controller.js | 33 +
ambari-web/app/data/HDP2/global_properties.js | 6
ambari-web/app/data/global_properties.js| 38 +---
ambari-web/app/views/wizard/controls_view.js| 7 +++-
6 files changed, 67 insertions(+), 68 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/ffb702b2/ambari-web/app/controllers/main/service/info/configs.js
--
diff --git a/ambari-web/app/controllers/main/service/info/configs.js
b/ambari-web/app/controllers/main/service/info/configs.js
index c137e5c..c985389 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -341,6 +341,16 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend({
App.config.loadServiceConfigGroupOverrides(allConfigs,
this.loadedGroupToOverrideSiteToTagMap, this.get('configGroups'),
this.onLoadOverrides, this);
}.observes('selectedConfigGroup'),
+ checkDatabaseProperties: function (serviceConfig) {
+if (!['OOZIE', 'HIVE'].contains(this.get('content.serviceName'))) return;
+var configsToHide = ['oozie_hostname'];
+configsToHide.forEach(function(configName) {
+ var property = serviceConfig.configs.findProperty('name', configName);
+ if (property) property.set('isVisible', false);
+});
+ },
+
+
onLoadOverrides: function (allConfigs) {
var serviceName = this.get('content.serviceName');
var advancedConfigs = this.get('advancedConfigs');
@@ -358,6 +368,7 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend({
this.setRecommendedDefaults(advancedConfigs).done(function () {
self.loadConfigs(allConfigs, serviceConfig);
self.checkOverrideProperty(serviceConfig);
+self.checkDatabaseProperties(serviceConfig);
self.get('stepConfigs').pushObject(serviceConfig);
self.set('selectedService', self.get('stepConfigs').objectAt(0));
self.checkForSecureConfig(self.get('selectedService'));
@@ -610,7 +621,6 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend({
return serviceConfigProperty;
},
-
/**
* trigger addOverrideProperty
* @param {Object} componentConfig
@@ -1237,6 +1247,7 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend({
* @param globals
*/
setOozieHostName: function (globals) {
+var dbHostPropertyName = null;
if (globals.someProperty('name', 'oozie_database')) {
var oozieDb = globals.findProperty('name', 'oozie_database');
if (oozieDb.value === 'New Derby Database') {
@@ -1264,7 +1275,7 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend({
} else if (oozieDb.value === 'Existing MySQL Database') {
var existingMySqlHost = globals.findProperty('name',
'oozie_existing_mysql_host');
if (existingMySqlHost) {
- existingMySqlHost.name = 'oozie_hostname';
+ dbHostPropertyName = 'oozie_existing_mysql_host';
}
globals = globals.without(globals.findProperty('name',
'oozie_ambari_host'));
globals = globals.without(globals.findProperty('name',
'oozie_ambari_database'));
@@ -1276,7 +1287,7 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend({
} else if (oozieDb.value ===
Em.I18n.t('services.service.config.hive.oozie.postgresql')) {
var existingPostgreSqlHost = globals.findProperty('name',
'oozie_existing_postgresql_host');
if (existingPostgreSqlHost) {
- existingPostgreSqlHost.name = 'oozie_hostname';
+ dbHostPropertyName = 'oozie_existing_postgresql_host';
}
globals = globals.without(globals.findProperty('name',
'oozie_ambari_host'));
globals = globals.without(globals.findProperty('name',
'oozie_ambari_database'));
@@ -1288,7 +1299,7 @@ App.MainServiceInfoConfigsController =
git commit: AMBARI-6443. Add Service Wizard: Hive Database host config empty and disabled. (Buzhor Denys via alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 673f649b0 - 3b62427a4
AMBARI-6443. Add Service Wizard: Hive Database host config empty and
disabled. (Buzhor Denys via alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3b62427a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3b62427a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3b62427a
Branch: refs/heads/trunk
Commit: 3b62427a414fd461f18495bf9d83fc5f16c5342a
Parents: 673f649
Author: Alex Antonenko hiv...@gmail.com
Authored: Wed Jul 9 23:14:12 2014 +0300
Committer: Alex Antonenko hiv...@gmail.com
Committed: Wed Jul 9 23:14:12 2014 +0300
--
.../controllers/main/service/info/configs.js| 29 +
.../app/controllers/wizard/step7_controller.js | 22 -
.../app/controllers/wizard/step8_controller.js | 33 +--
ambari-web/app/data/HDP2/global_properties.js | 4 ---
ambari-web/app/data/global_properties.js| 34
ambari-web/app/views/wizard/controls_view.js| 7 +++-
6 files changed, 65 insertions(+), 64 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b62427a/ambari-web/app/controllers/main/service/info/configs.js
--
diff --git a/ambari-web/app/controllers/main/service/info/configs.js
b/ambari-web/app/controllers/main/service/info/configs.js
index 0db4b50..5f4c977 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -340,6 +340,16 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend({
App.config.loadServiceConfigGroupOverrides(allConfigs,
this.loadedGroupToOverrideSiteToTagMap, this.get('configGroups'),
this.onLoadOverrides, this);
}.observes('selectedConfigGroup'),
+ checkDatabaseProperties: function (serviceConfig) {
+if (!['OOZIE', 'HIVE'].contains(this.get('content.serviceName'))) return;
+var configsToHide = ['oozie_hostname'];
+configsToHide.forEach(function(configName) {
+ var property = serviceConfig.configs.findProperty('name', configName);
+ if (property) property.set('isVisible', false);
+});
+ },
+
+
onLoadOverrides: function (allConfigs) {
var serviceName = this.get('content.serviceName');
var advancedConfigs = this.get('advancedConfigs');
@@ -357,6 +367,7 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend({
this.setRecommendedDefaults(advancedConfigs).done(function () {
self.loadConfigs(allConfigs, serviceConfig);
self.checkOverrideProperty(serviceConfig);
+self.checkDatabaseProperties(serviceConfig);
self.get('stepConfigs').pushObject(serviceConfig);
self.set('selectedService', self.get('stepConfigs').objectAt(0));
self.checkForSecureConfig(self.get('selectedService'));
@@ -627,7 +638,6 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend({
});
return dfd.promise();
},
-
/**
* set isEditable property of config for admin
* if default cfg group and not on the host config page
@@ -1199,6 +1209,7 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend({
* @param globals
*/
setOozieHostName: function (globals) {
+var dbHostPropertyName = null;
if (globals.someProperty('name', 'oozie_database')) {
var oozieDb = globals.findProperty('name', 'oozie_database');
if (oozieDb.value === 'New Derby Database') {
@@ -1226,7 +1237,7 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend({
} else if (oozieDb.value === 'Existing MySQL Database') {
var existingMySqlHost = globals.findProperty('name',
'oozie_existing_mysql_host');
if (existingMySqlHost) {
- existingMySqlHost.name = 'oozie_hostname';
+ dbHostPropertyName = 'oozie_existing_mysql_host';
}
globals = globals.without(globals.findProperty('name',
'oozie_ambari_host'));
globals = globals.without(globals.findProperty('name',
'oozie_ambari_database'));
@@ -1238,7 +1249,7 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend({
} else if (oozieDb.value ===
Em.I18n.t('services.service.config.hive.oozie.postgresql')) {
var existingPostgreSqlHost = globals.findProperty('name',
'oozie_existing_postgresql_host');
if (existingPostgreSqlHost) {
- existingPostgreSqlHost.name = 'oozie_hostname';
+ dbHostPropertyName = 'oozie_existing_postgresql_host';
}
globals = globals.without(globals.findProperty('name',
'oozie_ambari_host'));
globals = globals.without(globals.findProperty('name',
'oozie_ambari_database'));
@@ -1250,7 +1261,7 @@
git commit: AMBARI-6421. Add capability to report alert data from agents to Nagios (ncole)
Repository: ambari Updated Branches: refs/heads/trunk 3b62427a4 - b94eb716b AMBARI-6421. Add capability to report alert data from agents to Nagios (ncole) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b94eb716 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b94eb716 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b94eb716 Branch: refs/heads/trunk Commit: b94eb716ba3228be6d39f0fc9009f8e63d146c89 Parents: 3b62427 Author: Nate Cole nc...@hortonworks.com Authored: Tue Jul 8 13:24:43 2014 -0400 Committer: Nate Cole nc...@hortonworks.com Committed: Wed Jul 9 16:21:48 2014 -0400 -- .../ambari/server/agent/HeartbeatMonitor.java | 41 - .../ambari/server/agent/NagiosAlertCommand.java | 44 ++ .../nagios/NagiosPropertyProvider.java | 11 --- .../NAGIOS/package/files/check_ambari_alerts.py | 83 ++ .../NAGIOS/package/scripts/nagios_server.py | 20 ++--- .../package/scripts/nagios_server_config.py | 1 + .../NAGIOS/package/scripts/nagios_service.py| 36 +++- .../services/NAGIOS/package/scripts/params.py | 4 +- .../NAGIOS/package/scripts/status_params.py | 3 + .../package/templates/hadoop-commands.cfg.j2| 5 ++ .../templates/hadoop-servicegroups.cfg.j2 | 7 ++ .../package/templates/hadoop-services.cfg.j2| 15 .../server/agent/TestHeartbeatMonitor.java | 92 .../nagios/NagiosPropertyProviderTest.java | 78 - .../stacks/2.0.6/NAGIOS/test_nagios_server.py | 5 ++ 15 files changed, 340 insertions(+), 105 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/b94eb716/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java -- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java index 5fa4062..959ee5a 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java @@ -17,26 +17,51 @@ */ package org.apache.ambari.server.agent; +import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.COMMAND_TIMEOUT; +import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.GLOBAL; +import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.HOOKS_FOLDER; +import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.JDK_LOCATION; +import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.SCRIPT; +import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.SCRIPT_TYPE; +import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.SERVICE_PACKAGE_FOLDER; +import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.STACK_NAME; +import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.STACK_VERSION; + import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.TreeMap; -import com.google.inject.Injector; import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.actionmanager.ActionManager; import org.apache.ambari.server.api.services.AmbariMetaInfo; import org.apache.ambari.server.configuration.Configuration; import org.apache.ambari.server.controller.AmbariManagementController; import org.apache.ambari.server.controller.MaintenanceStateHelper; -import org.apache.ambari.server.state.*; +import org.apache.ambari.server.state.Alert; +import org.apache.ambari.server.state.Cluster; +import org.apache.ambari.server.state.Clusters; +import org.apache.ambari.server.state.CommandScriptDefinition; +import org.apache.ambari.server.state.ComponentInfo; +import org.apache.ambari.server.state.Config; +import org.apache.ambari.server.state.ConfigHelper; +import org.apache.ambari.server.state.Host; +import org.apache.ambari.server.state.HostState; +import org.apache.ambari.server.state.Service; +import org.apache.ambari.server.state.ServiceComponent; +import org.apache.ambari.server.state.ServiceComponentHost; +import org.apache.ambari.server.state.ServiceInfo; +import org.apache.ambari.server.state.StackId; +import org.apache.ambari.server.state.StackInfo; +import org.apache.ambari.server.state.State; import org.apache.ambari.server.state.fsm.InvalidStateTransitionException; import org.apache.ambari.server.state.host.HostHeartbeatLostEvent; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.*;
git commit: AMBARI-6444. component to service mapping should not be hardcode. (jaimin)
Repository: ambari
Updated Branches:
refs/heads/trunk b94eb716b - 70eec3b86
AMBARI-6444. component to service mapping should not be hardcode. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/70eec3b8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/70eec3b8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/70eec3b8
Branch: refs/heads/trunk
Commit: 70eec3b86ebcff9989c303ae1f2ec944cbd9c67c
Parents: b94eb71
Author: Jaimin Jetly jai...@hortonworks.com
Authored: Wed Jul 9 15:20:48 2014 -0700
Committer: Jaimin Jetly jai...@hortonworks.com
Committed: Wed Jul 9 15:20:57 2014 -0700
--
ambari-web/app/app.js | 9
.../global/background_operations_controller.js | 2 +-
.../main/admin/security/add/step3.js| 2 +-
ambari-web/app/controllers/main/host.js | 2 +-
.../app/controllers/main/host/add_controller.js | 23 -
.../controllers/main/service/add_controller.js | 10 ++--
.../controllers/main/service/info/configs.js| 3 +-
.../service/manage_config_groups_controller.js | 5 +-
.../app/controllers/wizard/step7_controller.js | 9 +++-
ambari-web/app/mappers/server_data_mapper.js| 53
ambari-web/app/models/service.js| 27 --
ambari-web/app/models/stack_service.js | 10
.../app/utils/batch_scheduled_requests.js | 11 ++--
ambari-web/app/utils/config.js | 2 +-
ambari-web/app/views/main/host/summary.js | 15 +++---
ambari-web/app/views/main/service/item.js | 5 +-
16 files changed, 66 insertions(+), 122 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/70eec3b8/ambari-web/app/app.js
--
diff --git a/ambari-web/app/app.js b/ambari-web/app/app.js
index 5e31627..7baea87 100644
--- a/ambari-web/app/app.js
+++ b/ambari-web/app/app.js
@@ -103,9 +103,18 @@ module.exports = Em.Application.create({
return
App.StackService.find().filterProperty('hasClient').mapProperty('serviceName');
}.property('App.router.clusterController.isLoaded'),
+hasMaster: function () {
+ return
App.StackService.find().filterProperty('hasMaster').mapProperty('serviceName');
+}.property('App.router.clusterController.isLoaded'),
+
+hasSlave: function () {
+ return
App.StackService.find().filterProperty('hasSlave').mapProperty('serviceName');
+}.property('App.router.clusterController.isLoaded'),
+
noConfigTypes: function () {
return
App.StackService.find().filterProperty('isNoConfigTypes').mapProperty('serviceName');
}.property('App.router.clusterController.isLoaded'),
+
monitoring: function () {
return
App.StackService.find().filterProperty('isMonitoringService').mapProperty('serviceName');
}.property('App.router.clusterController.isLoaded')
http://git-wip-us.apache.org/repos/asf/ambari/blob/70eec3b8/ambari-web/app/controllers/global/background_operations_controller.js
--
diff --git
a/ambari-web/app/controllers/global/background_operations_controller.js
b/ambari-web/app/controllers/global/background_operations_controller.js
index 99cc81f..c1d0e78 100644
--- a/ambari-web/app/controllers/global/background_operations_controller.js
+++ b/ambari-web/app/controllers/global/background_operations_controller.js
@@ -283,7 +283,7 @@ App.BackgroundOperationsController = Em.Controller.extend({
if (service === 'ALL_SERVICES') {
parsedRequestContext = Em.I18n.t(requestInfo. +
contextCommand.toLowerCase()).format(Em.I18n.t('common.allServices'));
} else {
-parsedRequestContext = Em.I18n.t(requestInfo. +
contextCommand.toLowerCase()).format(App.Service.DisplayNames[service]);
+parsedRequestContext = Em.I18n.t(requestInfo. +
contextCommand.toLowerCase()).format(App.format.role(service));
}
break;
case ROLLING-RESTART:
http://git-wip-us.apache.org/repos/asf/ambari/blob/70eec3b8/ambari-web/app/controllers/main/admin/security/add/step3.js
--
diff --git a/ambari-web/app/controllers/main/admin/security/add/step3.js
b/ambari-web/app/controllers/main/admin/security/add/step3.js
index 0b0969f..659afde 100644
--- a/ambari-web/app/controllers/main/admin/security/add/step3.js
+++ b/ambari-web/app/controllers/main/admin/security/add/step3.js
@@ -256,7 +256,7 @@ App.MainAdminSecurityAddStep3Controller =
Em.Controller.extend({
if (hostComponents.someProperty('componentName',
component.componentName)) {
var configs = this.get('content.serviceConfigProperties');
-var
git commit: AMBARI-6445. core-site configs are being rendered on multiple service's config page. (jaimin)
Repository: ambari
Updated Branches:
refs/heads/trunk 70eec3b86 - 0bc14443b
AMBARI-6445. core-site configs are being rendered on multiple service's config
page. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0bc14443
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0bc14443
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0bc14443
Branch: refs/heads/trunk
Commit: 0bc14443b915030d08b55b7e5248c91d763730d8
Parents: 70eec3b
Author: Jaimin Jetly jai...@hortonworks.com
Authored: Wed Jul 9 16:30:18 2014 -0700
Committer: Jaimin Jetly jai...@hortonworks.com
Committed: Wed Jul 9 16:30:18 2014 -0700
--
.../controllers/main/service/info/configs.js| 264 ++-
ambari-web/app/models/stack_service.js | 5 +
2 files changed, 138 insertions(+), 131 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/0bc14443/ambari-web/app/controllers/main/service/info/configs.js
--
diff --git a/ambari-web/app/controllers/main/service/info/configs.js
b/ambari-web/app/controllers/main/service/info/configs.js
index cca2c6d..c98a611 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -62,7 +62,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({
/**
* Map, which contains relation between group and site
- * to upload overriden properties
+ * to upload overridden properties
*/
loadedGroupToOverrideSiteToTagMap: {},
/**
@@ -159,17 +159,17 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend({
this.loadServiceConfigs();
},
- getHash: function() {
+ getHash: function () {
if (!this.get('stepConfigs')[0]) {
return null;
}
var hash = {};
-this.get('stepConfigs')[0].configs.forEach(function(config) {
+this.get('stepConfigs')[0].configs.forEach(function (config) {
hash[config.get('name')] = {value: config.get('value'), overrides: []};
if (!config.get('overrides')) return;
if (!config.get('overrides.length')) return;
- config.get('overrides').forEach(function(override) {
+ config.get('overrides').forEach(function (override) {
hash[config.get('name')].overrides.push(override.get('value'));
});
});
@@ -206,7 +206,7 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend({
});
},
- loadServiceConfigsSuccess: function(data, opt, params) {
+ loadServiceConfigsSuccess: function (data, opt, params) {
if (data) {
this.setConfigGroups.apply(this, Array.prototype.slice.call(arguments,
0));
} else {
@@ -228,8 +228,8 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend({
var selectedConfigGroup;
var siteToTagMap = {};
var hostsLength = App.router.get('mainHostController.hostsCountMap.TOTAL');
-serviceConfigsDef.get('configTypes').forEach(function(siteName){
- if(data.Clusters.desired_configs[siteName]){
+serviceConfigsDef.get('configTypesRendered').forEach(function (siteName) {
+ if (data.Clusters.desired_configs[siteName]) {
siteToTagMap[siteName] = data.Clusters.desired_configs[siteName].tag;
} else {
siteToTagMap[siteName] = 'version1';
@@ -287,7 +287,7 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend({
selectedConfigGroup = defaultConfigGroup;
}
-this.get('configGroups').sort(function(configGroupA, configGroupB){
+this.get('configGroups').sort(function (configGroupA, configGroupB) {
return (configGroupA.name configGroupB.name);
});
this.get('configGroups').unshift(defaultConfigGroup);
@@ -300,17 +300,15 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend({
var serviceName = this.get('content.serviceName');
//STEP 1: handle tags from JSON data for host overrides
this.loadedGroupToOverrideSiteToTagMap = {};
-if (App.supports.hostOverrides) {
- var configGroupsWithOverrides = selectedConfigGroup.get('isDefault')
!this.get('isHostsConfigsPage') ? this.get('configGroups') :
[selectedConfigGroup];
- configGroupsWithOverrides.forEach(function (item) {
-var groupName = item.get('name');
-this.loadedGroupToOverrideSiteToTagMap[groupName] = {};
-item.get('configSiteTags').forEach(function (siteTag) {
- var site = siteTag.get('site');
- this.loadedGroupToOverrideSiteToTagMap[groupName][site] =
siteTag.get('tag');
-}, this);
+var configGroupsWithOverrides = selectedConfigGroup.get('isDefault')
!this.get('isHostsConfigsPage') ? this.get('configGroups') :
[selectedConfigGroup];
+configGroupsWithOverrides.forEach(function (item) {
+
git commit: AMBARI-6177. Ambari Shell nagios_contact is empty. (Krisztian Horvath via yusaku)
Repository: ambari
Updated Branches:
refs/heads/trunk b08909a1f - 05517dae3
AMBARI-6177. Ambari Shell nagios_contact is empty. (Krisztian Horvath via
yusaku)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/05517dae
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/05517dae
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/05517dae
Branch: refs/heads/trunk
Commit: 05517dae3bad5aa5cc75b9f17297e7d4daaa30d6
Parents: b08909a
Author: Yusaku Sako yus...@hortonworks.com
Authored: Wed Jul 9 17:16:39 2014 -0700
Committer: Yusaku Sako yus...@hortonworks.com
Committed: Wed Jul 9 17:17:14 2014 -0700
--
.../src/main/resources/blueprints/lambda-architecture | 2 +-
.../src/main/resources/blueprints/multi-node-hdfs-yarn | 2 +-
ambari-client/groovy-client/src/main/resources/blueprints/warmup | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/05517dae/ambari-client/groovy-client/src/main/resources/blueprints/lambda-architecture
--
diff --git
a/ambari-client/groovy-client/src/main/resources/blueprints/lambda-architecture
b/ambari-client/groovy-client/src/main/resources/blueprints/lambda-architecture
index c81b83a..3deec4c 100644
---
a/ambari-client/groovy-client/src/main/resources/blueprints/lambda-architecture
+++
b/ambari-client/groovy-client/src/main/resources/blueprints/lambda-architecture
@@ -2,7 +2,7 @@
configurations: [
{
global: {
-nagios_contact:
+nagios_contact: me@my-awesome-domain.example
}
}
],
http://git-wip-us.apache.org/repos/asf/ambari/blob/05517dae/ambari-client/groovy-client/src/main/resources/blueprints/multi-node-hdfs-yarn
--
diff --git
a/ambari-client/groovy-client/src/main/resources/blueprints/multi-node-hdfs-yarn
b/ambari-client/groovy-client/src/main/resources/blueprints/multi-node-hdfs-yarn
index b206896..27a602a 100644
---
a/ambari-client/groovy-client/src/main/resources/blueprints/multi-node-hdfs-yarn
+++
b/ambari-client/groovy-client/src/main/resources/blueprints/multi-node-hdfs-yarn
@@ -2,7 +2,7 @@
configurations: [
{
global: {
-nagios_contact:
+nagios_contact: me@my-awesome-domain.example
}
}
],
http://git-wip-us.apache.org/repos/asf/ambari/blob/05517dae/ambari-client/groovy-client/src/main/resources/blueprints/warmup
--
diff --git a/ambari-client/groovy-client/src/main/resources/blueprints/warmup
b/ambari-client/groovy-client/src/main/resources/blueprints/warmup
index 80d3566..8b745d6 100644
--- a/ambari-client/groovy-client/src/main/resources/blueprints/warmup
+++ b/ambari-client/groovy-client/src/main/resources/blueprints/warmup
@@ -2,7 +2,7 @@
configurations: [
{
global: {
-nagios_contact:
+nagios_contact: me@my-awesome-domain.example
}
}
],
Git Push Summary
Repository: ambari Updated Tags: refs/tags/release-1.6.1-rc1 [created] d597e2e51
git commit: AMBARI-6448. User added properties are not shown in Add Service wizard and removed later by the wizard. (jaimin)
Repository: ambari
Updated Branches:
refs/heads/trunk 05517dae3 - 8af1ee1f2
AMBARI-6448. User added properties are not shown in Add Service wizard and
removed later by the wizard. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8af1ee1f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8af1ee1f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8af1ee1f
Branch: refs/heads/trunk
Commit: 8af1ee1f28bf99091cbe03480fb347f2caafe43b
Parents: 05517da
Author: Jaimin Jetly jai...@hortonworks.com
Authored: Wed Jul 9 18:42:44 2014 -0700
Committer: Jaimin Jetly jai...@hortonworks.com
Committed: Wed Jul 9 18:42:44 2014 -0700
--
ambari-web/app/controllers/wizard/step7_controller.js | 2 +-
ambari-web/app/utils/config.js| 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/8af1ee1f/ambari-web/app/controllers/wizard/step7_controller.js
--
diff --git a/ambari-web/app/controllers/wizard/step7_controller.js
b/ambari-web/app/controllers/wizard/step7_controller.js
index 4baa5fe..616f771 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -775,7 +775,7 @@ App.WizardStep7Controller = Em.Controller.extend({
*/
getConfigTagsSuccess: function (data) {
var installedServiceSites = [];
-App.StackService.find().filterProperty('isSelected').filter(function
(service) {
+App.StackService.find().filterProperty('isInstalled').forEach(function
(service) {
installedServiceSites =
installedServiceSites.concat(service.get('configTypes'));
}, this);
installedServiceSites = installedServiceSites.uniq();
http://git-wip-us.apache.org/repos/asf/ambari/blob/8af1ee1f/ambari-web/app/utils/config.js
--
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index 1c4137d..8ed1262 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -1012,9 +1012,9 @@ App.config = Em.Object.create({
getServiceNameByConfigType: function (type) {
var preDefinedServiceConfigs = this.get('preDefinedServiceConfigs');
var service = preDefinedServiceConfigs.find(function (serviceConfig) {
- return (serviceConfig.sites.contains(type));
+ return (serviceConfig.get('configTypes').contains(type));
}, this);
-return service service.serviceName;
+return service service.get('serviceName');
},
/**
