Updated Branches: refs/heads/trunk 00ec1d302 -> b3f7fa6ec
AMBARI-3651. Reassign wizard "Configure Component": Task "Stop All Services" failed, but after retry is marked as successful. (akovalenko) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/b3f7fa6e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/b3f7fa6e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/b3f7fa6e Branch: refs/heads/trunk Commit: b3f7fa6ec1aa44b2ef394da698fb13991a735cd4 Parents: 00ec1d3 Author: Aleksandr Kovalenko <[email protected]> Authored: Fri Nov 1 15:51:21 2013 +0200 Committer: Aleksandr Kovalenko <[email protected]> Committed: Fri Nov 1 15:51:21 2013 +0200 ---------------------------------------------------------------------- .../main/admin/highAvailability/progress_controller.js | 1 + ambari-web/app/utils/ajax.js | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/b3f7fa6e/ambari-web/app/controllers/main/admin/highAvailability/progress_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/highAvailability/progress_controller.js b/ambari-web/app/controllers/main/admin/highAvailability/progress_controller.js index a610ee8..25fa8a1 100644 --- a/ambari-web/app/controllers/main/admin/highAvailability/progress_controller.js +++ b/ambari-web/app/controllers/main/admin/highAvailability/progress_controller.js @@ -356,6 +356,7 @@ App.HighAvailabilityProgressPageController = App.HighAvailabilityWizardControlle } } else { console.warn('func: startPolling3'); + this.setTaskLogs(this.get('currentTaskId'), []); this.onTaskCompleted(); } }, http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/b3f7fa6e/ambari-web/app/utils/ajax.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/ajax.js b/ambari-web/app/utils/ajax.js index 55706a9..47fdd1e 100644 --- a/ambari-web/app/utils/ajax.js +++ b/ambari-web/app/utils/ajax.js @@ -89,7 +89,7 @@ var urls = { } }, 'reassign.stop_services': { - 'real': '/clusters/{clusterName}/services?ServiceInfo/state=STARTED', + 'real': '/clusters/{clusterName}/services', 'mock': '', 'format': function (data, opt) { return { @@ -108,7 +108,7 @@ var urls = { } }, 'reassign.start_services': { - 'real': '/clusters/{clusterName}/services?ServiceInfo/state=INSTALLED¶ms/run_smoke_test=true', + 'real': '/clusters/{clusterName}/services?params/run_smoke_test=true', 'mock': '', 'format': function (data, opt) { return { @@ -549,7 +549,7 @@ var urls = { } }, 'admin.high_availability.stop_all_services': { - 'real': '/clusters/{clusterName}/services?ServiceInfo/state=STARTED', + 'real': '/clusters/{clusterName}/services', 'mock': '', 'format': function (data, opt) { return { @@ -568,7 +568,7 @@ var urls = { } }, 'admin.high_availability.start_all_services': { - 'real': '/clusters/{clusterName}/services?ServiceInfo/state=INSTALLED', + 'real': '/clusters/{clusterName}/services', 'mock': '', 'format': function (data, opt) { return {
