Bläddra i källkod

AMBARI-13878. Incorrect calculating of task duration (onechiporenko)

Oleg Nechiporenko 9 år sedan
förälder
incheckning
e85822db63

+ 3 - 3
ambari-web/app/controllers/global/background_operations_controller.js

@@ -240,8 +240,8 @@ App.BackgroundOperationsController = Em.Controller.extend({
           isRunning: isRunning,
           hostsMap: {},
           tasks: [],
-          startTime: request.Requests.start_time,
-          endTime: request.Requests.end_time,
+          startTime: App.dateTimeWithTimeZone(request.Requests.start_time),
+          endTime: App.dateTimeWithTimeZone(request.Requests.end_time),
           dependentService: requestParams.dependentService,
           sourceRequestScheduleId: request.Requests.request_schedule && request.Requests.request_schedule.schedule_id,
           previousTaskStatusMap: {},
@@ -259,7 +259,7 @@ App.BackgroundOperationsController = Em.Controller.extend({
     this.removeOldRequests(currentRequestIds);
     this.set("allOperationsCount", runningServices);
     this.set('isShowMoreAvailable', countGot >= countIssued);
-    this.set('serviceTimestamp', App.dateTime());
+    this.set('serviceTimestamp', App.dateTimeWithTimeZone());
   },
   isShowMoreAvailable: null,
   /**

+ 1 - 1
ambari-web/app/utils/date/date.js

@@ -134,7 +134,7 @@ module.exports = {
       return '' + this.timingFormat(endTimestamp - startTimestamp, 1); //lasted for xx secs
     } else {
       // still running, duration till now
-      var time = (App.dateTime() - startTimestamp) < 0 ? 0 : (App.dateTime() - startTimestamp);
+      var time = (App.dateTimeWithTimeZone() - startTimestamp) < 0 ? 0 : (App.dateTimeWithTimeZone() - startTimestamp);
       durationSummary = '' + this.timingFormat(time, 1);
     }
     return durationSummary;

+ 2 - 2
ambari-web/test/utils/date/date_test.js

@@ -167,7 +167,7 @@ describe('date', function () {
     ];
 
     beforeEach(function() {
-      sinon.stub(App, 'dateTime', function () { return 100019000; });
+      sinon.stub(App, 'dateTimeWithTimeZone', function () { return 100019000; });
     });
 
     tests.forEach(function(test) {
@@ -178,7 +178,7 @@ describe('date', function () {
     });
 
     afterEach(function() {
-      App.dateTime.restore();
+      App.dateTimeWithTimeZone.restore();
     });
   });