You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2017/05/08 16:00:30 UTC
ambari git commit: AMBARI-20956 Optimize request for background
operations. (atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk e74d4f3fa -> 8a6995103
AMBARI-20956 Optimize request for background operations. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8a699510
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8a699510
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8a699510
Branch: refs/heads/trunk
Commit: 8a69951030d62479ddb2d6b3fbd310dcf77e55f5
Parents: e74d4f3
Author: Andrii Tkach <at...@apache.org>
Authored: Mon May 8 17:49:02 2017 +0300
Committer: Andrii Tkach <at...@apache.org>
Committed: Mon May 8 17:49:02 2017 +0300
----------------------------------------------------------------------
.../global/background_operations_controller.js | 12 +-
ambari-web/app/utils/ajax/ajax.js | 4 +-
.../global/background_operations_test.js | 179 +------------------
3 files changed, 5 insertions(+), 190 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/8a699510/ambari-web/app/controllers/global/background_operations_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/global/background_operations_controller.js b/ambari-web/app/controllers/global/background_operations_controller.js
index d833661..de420b5 100644
--- a/ambari-web/app/controllers/global/background_operations_controller.js
+++ b/ambari-web/app/controllers/global/background_operations_controller.js
@@ -217,7 +217,7 @@ App.BackgroundOperationsController = Em.Controller.extend({
return;
}
var rq = this.get("services").findProperty('id', request.Requests.id);
- var isRunning = this.isRequestRunning(request);
+ var isRunning = request.Requests.request_status === 'IN_PROGRESS';
var requestParams = this.parseRequestContext(request.Requests.request_context);
this.assignScheduleId(request, requestParams);
currentRequestIds.push(request.Requests.id);
@@ -282,16 +282,6 @@ App.BackgroundOperationsController = Em.Controller.extend({
},
/**
- * identify whether request is running by task counters
- * @param request
- * @return {Boolean}
- */
- isRequestRunning: function (request) {
- return (request.Requests.task_count -
- (request.Requests.aborted_task_count + request.Requests.completed_task_count + request.Requests.failed_task_count
- + request.Requests.timed_out_task_count - request.Requests.queued_task_count)) > 0;
- },
- /**
* identify whether there is only one host in request
* @param inputs
* @return {Boolean}
http://git-wip-us.apache.org/repos/asf/ambari/blob/8a699510/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 6e93654..d9eeaa6 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -539,7 +539,9 @@ var urls = {
'mock': '/data/alerts/alert_instances_history.json'
},
'background_operations.get_most_recent': {
- 'real': '/clusters/{clusterName}/requests?to=end&page_size={operationsCount}&fields=Requests',
+ 'real': '/clusters/{clusterName}/requests?to=end&page_size={operationsCount}&fields=' +
+ 'Requests/end_time,Requests/id,Requests/progress_percent,Requests/request_context,' +
+ 'Requests/request_status,Requests/start_time,Requests/cluster_name&minimal_response=true',
'mock': '/data/background_operations/list_on_start.json',
'testInProduction': true
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/8a699510/ambari-web/test/controllers/global/background_operations_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/global/background_operations_test.js b/ambari-web/test/controllers/global/background_operations_test.js
index 8d982bb..4a8235c 100644
--- a/ambari-web/test/controllers/global/background_operations_test.js
+++ b/ambari-web/test/controllers/global/background_operations_test.js
@@ -227,12 +227,7 @@ describe('App.BackgroundOperationsController', function () {
Requests: {
id: 1,
request_context: '',
- task_count: 1,
- aborted_task_count: 0,
- completed_task_count: 0,
- failed_task_count: 0,
- timed_out_task_count: 0,
- queued_task_count: 0
+ request_status: 'IN_PROGRESS'
}
}
]
@@ -336,178 +331,6 @@ describe('App.BackgroundOperationsController', function () {
});
});
- describe('#isRequestRunning()', function () {
- var testCases = [
- {
- title: 'Counters are missing',
- request: {
- Requests: {}
- },
- result: false
- },
- {
- title: 'Request has zero tasks',
- request: {
- Requests: {
- task_count: 0,
- aborted_task_count: 0,
- completed_task_count: 0,
- failed_task_count: 0,
- timed_out_task_count: 0,
- queued_task_count: 0
- }
- },
- result: false
- },
- {
- title: 'One task in running status',
- request: {
- Requests: {
- task_count: 1,
- aborted_task_count: 0,
- completed_task_count: 0,
- failed_task_count: 0,
- timed_out_task_count: 0,
- queued_task_count: 0
- }
- },
- result: true
- },
- {
- title: 'One task in queued status',
- request: {
- Requests: {
- task_count: 1,
- aborted_task_count: 0,
- completed_task_count: 0,
- failed_task_count: 0,
- timed_out_task_count: 0,
- queued_task_count: 1
- }
- },
- result: true
- },
- {
- title: 'One task in aborted status',
- request: {
- Requests: {
- task_count: 1,
- aborted_task_count: 1,
- completed_task_count: 0,
- failed_task_count: 0,
- timed_out_task_count: 0,
- queued_task_count: 0
- }
- },
- result: false
- },
- {
- title: 'One task in completed status',
- request: {
- Requests: {
- task_count: 1,
- aborted_task_count: 0,
- completed_task_count: 1,
- failed_task_count: 0,
- timed_out_task_count: 0,
- queued_task_count: 0
- }
- },
- result: false
- },
- {
- title: 'One task in failed status',
- request: {
- Requests: {
- task_count: 1,
- aborted_task_count: 0,
- completed_task_count: 0,
- failed_task_count: 1,
- timed_out_task_count: 0,
- queued_task_count: 0
- }
- },
- result: false
- },
- {
- title: 'One task in timed out status',
- request: {
- Requests: {
- task_count: 1,
- aborted_task_count: 0,
- completed_task_count: 0,
- failed_task_count: 0,
- timed_out_task_count: 1,
- queued_task_count: 0
- }
- },
- result: false
- },
- {
- title: 'One task in timed out status and the second one in running',
- request: {
- Requests: {
- task_count: 2,
- aborted_task_count: 0,
- completed_task_count: 0,
- failed_task_count: 0,
- timed_out_task_count: 1,
- queued_task_count: 0
- }
- },
- result: true
- },
- {
- title: 'One task in each status',
- request: {
- Requests: {
- task_count: 5,
- aborted_task_count: 1,
- completed_task_count: 1,
- failed_task_count: 1,
- timed_out_task_count: 1,
- queued_task_count: 1
- }
- },
- result: true
- },
- {
- title: 'One task in each status except queued',
- request: {
- Requests: {
- task_count: 5,
- aborted_task_count: 1,
- completed_task_count: 1,
- failed_task_count: 1,
- timed_out_task_count: 1,
- queued_task_count: 0
- }
- },
- result: true
- },
- {
- title: 'No tasks in running status',
- request: {
- Requests: {
- task_count: 4,
- aborted_task_count: 1,
- completed_task_count: 1,
- failed_task_count: 1,
- timed_out_task_count: 1,
- queued_task_count: 0
- }
- },
- result: false
- }
- ];
-
- testCases.forEach(function (test) {
- it(test.title, function () {
- expect(controller.isRequestRunning(test.request)).to.eql(test.result);
- });
- });
- });
-
describe('#isOneHost()', function () {
var testCases = [
{