Repository: ambari Updated Branches: refs/heads/trunk f0544dfa9 -> 72e9d4a4f
AMBARI-19240 Ambari UI should use "hosts_with_failures" from "host_resolution_check" in host check. (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/72e9d4a4 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/72e9d4a4 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/72e9d4a4 Branch: refs/heads/trunk Commit: 72e9d4a4fb6a09b436a363b7ba8cdf6f6fa17132 Parents: f0544df Author: Andrii Tkach <[email protected]> Authored: Mon Dec 19 18:58:43 2016 +0200 Committer: Andrii Tkach <[email protected]> Committed: Mon Dec 19 20:09:35 2016 +0200 ---------------------------------------------------------------------- .../app/mixins/main/host/details/actions/check_host.js | 3 +-- ambari-web/app/utils/ajax/ajax.js | 13 ++++++++++++- ambari-web/test/controllers/wizard/step3_test.js | 6 +++--- 3 files changed, 16 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/72e9d4a4/ambari-web/app/mixins/main/host/details/actions/check_host.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/mixins/main/host/details/actions/check_host.js b/ambari-web/app/mixins/main/host/details/actions/check_host.js index faf8ef1..fbee24c 100644 --- a/ambari-web/app/mixins/main/host/details/actions/check_host.js +++ b/ambari-web/app/mixins/main/host/details/actions/check_host.js @@ -365,8 +365,7 @@ App.CheckHostMixin = Em.Mixin.create({ if (["FAILED", "COMPLETED", "TIMEDOUT"].contains(task.Tasks.status)) { if (task.Tasks.status === "COMPLETED" && !!Em.get(task, "Tasks.structured_out.host_resolution_check.failed_count")) { var targetHostName = Em.get(task, "Tasks.host_name"); - var relatedHostNames = Em.get(task, "Tasks.structured_out.host_resolution_check.failures") - ? Em.get(task, "Tasks.structured_out.host_resolution_check.failures").mapProperty('host') : []; + var relatedHostNames = Em.get(task, "Tasks.structured_out.host_resolution_check.hosts_with_failures") || []; var contextMessage = Em.I18n.t('installer.step3.hostWarningsPopup.resolution.validation.context').format(targetHostName, relatedHostNames.length + ' ' + Em.I18n.t('installer.step3.hostWarningsPopup.host' + (relatedHostNames.length == 1 ? '' : 's'))); var contextMessageLong = Em.I18n.t('installer.step3.hostWarningsPopup.resolution.validation.context').format(targetHostName, relatedHostNames.join(', ')); if (!hostInfo) { http://git-wip-us.apache.org/repos/asf/ambari/blob/72e9d4a4/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 5831521..d4b1474 100644 --- a/ambari-web/app/utils/ajax/ajax.js +++ b/ambari-web/app/utils/ajax/ajax.js @@ -2188,7 +2188,18 @@ var urls = { }, 'preinstalled.checks.tasks': { - 'real': '/requests/{requestId}?fields=tasks/Tasks,Requests/inputs,Requests/request_status', + 'real': '/requests/{requestId}?fields=Requests/inputs,Requests/request_status,tasks/Tasks/host_name,' + + 'tasks/Tasks/structured_out/host_resolution_check/hosts_with_failures,' + + 'tasks/Tasks/structured_out/host_resolution_check/failed_count,' + + 'tasks/Tasks/structured_out/installed_packages,' + + 'tasks/Tasks/structured_out/last_agent_env_check,' + + 'tasks/Tasks/structured_out/transparentHugePage,' + + 'tasks/Tasks/stdout,' + + 'tasks/Tasks/stderr,' + + 'tasks/Tasks/error_log,' + + 'tasks/Tasks/command_detail,' + + 'tasks/Tasks/status' + + '&minimal_response=true', 'mock': '/data/requests/host_check/1.json' }, http://git-wip-us.apache.org/repos/asf/ambari/blob/72e9d4a4/ambari-web/test/controllers/wizard/step3_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/controllers/wizard/step3_test.js b/ambari-web/test/controllers/wizard/step3_test.js index 1e1b3bd..fa90065 100644 --- a/ambari-web/test/controllers/wizard/step3_test.js +++ b/ambari-web/test/controllers/wizard/step3_test.js @@ -3076,9 +3076,9 @@ describe('App.WizardStep3Controller', function () { var data = { tasks: [ - {Tasks: {status: 'COMPLETED', host_name: 'h1', structured_out: {host_resolution_check: {failed_count: 2, failures: [{host: 'h2'}, {host: 'h3'}]}}}}, - {Tasks: {status: 'COMPLETED', host_name: 'h4', structured_out: {host_resolution_check: {failed_count: 2, failures: [{host: 'h5'}, {host: 'h6'}]}}}}, - {Tasks: {status: 'COMPLETED', host_name: 'h7', structured_out: {host_resolution_check: {failed_count: 1, failures: [{host: 'h8'}]}}}} + {Tasks: {status: 'COMPLETED', host_name: 'h1', structured_out: {host_resolution_check: {failed_count: 2, hosts_with_failures: ['h2', 'h3']}}}}, + {Tasks: {status: 'COMPLETED', host_name: 'h4', structured_out: {host_resolution_check: {failed_count: 2, hosts_with_failures: ['h5', 'h6']}}}}, + {Tasks: {status: 'COMPLETED', host_name: 'h7', structured_out: {host_resolution_check: {failed_count: 1, hosts_with_failures: ['h8']}}}} ] }; var hostCheckWarnings = [];
