Author: yusaku
Date: Wed Jan 30 00:48:37 2013
New Revision: 1440230
URL: http://svn.apache.org/viewvc?rev=1440230&view=rev
Log:
AMBARI-1292. Add hosts should skip host checks on existing list of cluster
nodes. (srimanth via yusaku)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step3_controller.js
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1440230&r1=1440229&r2=1440230&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Wed Jan 30 00:48:37 2013
@@ -175,10 +175,14 @@ Trunk (unreleased changes):
AMBARI-1269. Refactor ResourceProvider SPI. (tbeerbower)
- AMBARI-1270. Add predicate objects for checking empty resource category.
(tbeerbower)
+ AMBARI-1270. Add predicate objects for checking empty resource category.
+ (tbeerbower)
BUG FIXES
+ AMBARI-1292. Add hosts should skip host checks on existing list of cluster
+ nodes. (srimanth via yusaku)
+
AMBARI-1290. Left border is missing from the summary section on Jobs page.
(srimanth via yusaku)
Modified:
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step3_controller.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard/step3_controller.js?rev=1440230&r1=1440229&r2=1440230&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step3_controller.js
(original)
+++
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step3_controller.js
Wed Jan 30 00:48:37 2013
@@ -645,10 +645,32 @@ App.WizardStep3Controller = Em.Controlle
checksUpdateProgress:0,
checksUpdateStatus: null,
/**
+ * filter data for warnings parse
+ * is data from host in bootStrap
+ * @param data
+ * @return {Object}
+ */
+ filterBootHosts: function(data){
+ var bootHosts = this.get('bootHosts');
+ var filteredData = {
+ href: data.href,
+ items: []
+ };
+ bootHosts.forEach(function(bootHost){
+ data.items.forEach(function(host){
+ if(host.Hosts.host_name == bootHost.get('name')){
+ filteredData.items.push(host);
+ }
+ })
+ })
+ return filteredData;
+ },
+ /**
* parse warnings data for each host and total
* @param data
*/
parseWarnings: function(data){
+ data = this.filterBootHosts(data);
var warnings = [];
var totalWarnings = {
hostName: 'All Hosts',
