You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2013/04/05 10:08:34 UTC
svn commit: r1464877 - in /incubator/ambari/branches/branch-1.2: CHANGES.txt
ambari-web/app/controllers/main/service/info/configs.js
ambari-web/app/controllers/wizard.js ambari-web/app/routes/add_host_routes.js
Author: yusaku
Date: Fri Apr 5 08:08:33 2013
New Revision: 1464877
URL: http://svn.apache.org/r1464877
Log:
Backporting AMBARI-1794, AMBARI-1795, and AMBARI-1815 to 1.2 branch. (yusaku)
Modified:
incubator/ambari/branches/branch-1.2/CHANGES.txt
incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/main/service/info/configs.js
incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/wizard.js
incubator/ambari/branches/branch-1.2/ambari-web/app/routes/add_host_routes.js
Modified: incubator/ambari/branches/branch-1.2/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/CHANGES.txt?rev=1464877&r1=1464876&r2=1464877&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/CHANGES.txt (original)
+++ incubator/ambari/branches/branch-1.2/CHANGES.txt Fri Apr 5 08:08:33 2013
@@ -310,6 +310,15 @@ Trunk (unreleased changes):
BUG FIXES
+ AMBARI-1795. Add Hosts - retrying install shows all progress bars in red
+ and causes the wizard to get stuck on the progress page. (yusaku)
+
+ AMBARI-1794. Add Host install retry shuts down all services in the cluster.
+ (yusaku)
+
+ AMBARI-1815. After modifying custom configs, properties are shown as blank,
+ leading to corrupt core-site.xml upon save. (yusaku)
+
AMBARI-1748. JDK option on the UI when used is not passed onto the global
parameters. (srimanth)
Modified: incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/main/service/info/configs.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/main/service/info/configs.js?rev=1464877&r1=1464876&r2=1464877&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/main/service/info/configs.js (original)
+++ incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/main/service/info/configs.js Fri Apr 5 08:08:33 2013
@@ -638,7 +638,7 @@ App.MainServiceInfoConfigsController = E
this.setConfigValue(uiConfig, _config);
uiConfig.pushObject({
"id": "site property",
- "name": _config.name,
+ "name": _config._name || _config.name,
"value": _config.value,
"filename": _config.filename
});
@@ -729,7 +729,7 @@ App.MainServiceInfoConfigsController = E
var index = parseInt(_fkValue.match(/\[([\d]*)(?=\])/)[1]);
if (uiConfig.someProperty('name', config.foreignKey[index])) {
var globalValue = uiConfig.findProperty('name', config.foreignKey[index]).value;
- config.name = config.name.replace(_fkValue, globalValue);
+ config._name = config.name.replace(_fkValue, globalValue);
} else if (this.get('globalConfigs').someProperty('name', config.foreignKey[index])) {
var globalValue;
if (this.get('globalConfigs').findProperty('name', config.foreignKey[index]).value === '') {
@@ -737,7 +737,7 @@ App.MainServiceInfoConfigsController = E
} else {
globalValue = this.get('globalConfigs').findProperty('name', config.foreignKey[index]).value;
}
- config.name = config.name.replace(_fkValue, globalValue);
+ config._name = config.name.replace(_fkValue, globalValue);
}
}, this);
}
Modified: incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/wizard.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/wizard.js?rev=1464877&r1=1464876&r2=1464877&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/wizard.js (original)
+++ incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/wizard.js Fri Apr 5 08:08:33 2013
@@ -270,7 +270,7 @@ App.WizardController = Em.Controller.ext
switch (this.get('content.controllerName')) {
case 'addHostController':
if (isRetry) {
- url = App.apiPrefix + '/clusters/' + clusterName + '/host_components?HostRoles/state!=INSTALLED';
+ url = App.apiPrefix + '/clusters/' + clusterName + '/host_components?HostRoles/state=INSTALLED';
data = '{"HostRoles": {"state": "INSTALLED"}}';
} else {
url = App.apiPrefix + '/clusters/' + clusterName + '/host_components?HostRoles/state=INIT';
Modified: incubator/ambari/branches/branch-1.2/ambari-web/app/routes/add_host_routes.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-web/app/routes/add_host_routes.js?rev=1464877&r1=1464876&r2=1464877&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-web/app/routes/add_host_routes.js (original)
+++ incubator/ambari/branches/branch-1.2/ambari-web/app/routes/add_host_routes.js Fri Apr 5 08:08:33 2013
@@ -242,6 +242,7 @@ module.exports = Em.Route.extend({
var isRetry = true;
addHostController.installServices(isRetry);
addHostController.setInfoForStep9();
+ wizardStep9Controller.resetHostsForRetry();
// We need to do recovery based on whether we are in Add Host or Installer wizard
App.clusterStatus.setClusterStatus({
clusterName: this.get('clusterName'),