Updated Branches: refs/heads/trunk 73f1ee079 -> 2234d389a
AMBARI-2616. Host checks show more hosts than are in cluster. (Aleksandr Kovalenko via yusaku) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/2234d389 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/2234d389 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/2234d389 Branch: refs/heads/trunk Commit: 2234d389a82cb5ba7a3e327537854ed1b9aa6a50 Parents: 73f1ee0 Author: Yusaku Sako <[email protected]> Authored: Wed Jul 10 11:33:37 2013 -0700 Committer: Yusaku Sako <[email protected]> Committed: Wed Jul 10 11:33:37 2013 -0700 ---------------------------------------------------------------------- ambari-web/app/controllers/wizard/step3_controller.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/2234d389/ambari-web/app/controllers/wizard/step3_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard/step3_controller.js b/ambari-web/app/controllers/wizard/step3_controller.js index 1cc674f..1261624 100644 --- a/ambari-web/app/controllers/wizard/step3_controller.js +++ b/ambari-web/app/controllers/wizard/step3_controller.js @@ -705,7 +705,7 @@ App.WizardStep3Controller = Em.Controller.extend({ var stackFoldersAndFiles = _host.Hosts.last_agent_env.stackFoldersAndFiles || _host.Hosts.last_agent_env.paths; stackFoldersAndFiles.forEach(function (path) { - warning = warnings.findProperty('name', path.name); + warning = warnings.filterProperty('category', 'fileFolders').findProperty('name', path.name); if (warning) { warning.hosts.push(_host.Hosts.host_name); warning.onSingleHost = false; @@ -725,7 +725,7 @@ App.WizardStep3Controller = Em.Controller.extend({ _host.Hosts.last_agent_env.rpms.forEach(function (_package) { if (_package.installed) { - warning = warnings.findProperty('name', _package.name); + warning = warnings.filterProperty('category', 'packages').findProperty('name', _package.name); if (warning) { warning.hosts.push(_host.Hosts.host_name); warning.onSingleHost = false; @@ -748,7 +748,7 @@ App.WizardStep3Controller = Em.Controller.extend({ var javaProcs = _host.Hosts.last_agent_env.hostHealth ? _host.Hosts.last_agent_env.hostHealth.activeJavaProcs : _host.Hosts.last_agent_env.javaProcs; javaProcs.forEach(function (process) { - warning = warnings.findProperty('name', (process.command.substr(0, 15) + '...')); + warning = warnings.filterProperty('category', 'processes').findProperty('pid', process.pid); if (warning) { warning.hosts.push(_host.Hosts.host_name); warning.onSingleHost = false; @@ -774,7 +774,7 @@ App.WizardStep3Controller = Em.Controller.extend({ _host.Hosts.last_agent_env.hostHealth.liveServices.forEach(function (service) { if (service.status === 'Healthy') { - warning = warnings.findProperty('name', service.name); + warning = warnings.filterProperty('category', 'services').findProperty('name', service.name); if (warning) { warning.hosts.push(_host.Hosts.host_name); warning.onSingleHost = false; @@ -797,7 +797,7 @@ App.WizardStep3Controller = Em.Controller.extend({ if (_host.Hosts.last_agent_env.existingUsers) { _host.Hosts.last_agent_env.existingUsers.forEach(function (user) { - warning = warnings.findProperty('name', user.userName); + warning = warnings.filterProperty('category', 'users').findProperty('name', user.userName); if (warning) { warning.hosts.push(_host.Hosts.host_name); warning.onSingleHost = false;
