From c7264459901e59021e180228cea3a6ae334a339f Mon Sep 17 00:00:00 2001 From: Sunil G Date: Thu, 24 Jan 2019 15:01:43 +0530 Subject: [PATCH] YARN-8961. [UI2] Flow Run End Time shows 'Invalid date'. Contributed by Akhil PB --- .../main/webapp/app/serializers/yarn-flowrun-brief.js | 11 +++++++++-- .../src/main/webapp/app/serializers/yarn-flowrun.js | 11 +++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-flowrun-brief.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-flowrun-brief.js index 67603bb5598..89dc85a08ed 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-flowrun-brief.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-flowrun-brief.js @@ -37,9 +37,9 @@ export default DS.JSONAPISerializer.extend({ runid: payload.info.SYSTEM_INFO_FLOW_RUN_ID, shownid: payload.id, type: payload.type, - createTime: Converter.timeStampToDate(payload.createdtime), + createTime: this.checkDateValidity(payload.createdtime), createTimeRaw: payload.createdtime, - endTime: Converter.timeStampToDate(payload.info.SYSTEM_INFO_FLOW_RUN_END_TIME), + endTime: this.checkDateValidity(payload.info.SYSTEM_INFO_FLOW_RUN_END_TIME), endTimeRaw: payload.info.SYSTEM_INFO_FLOW_RUN_END_TIME || 0, user: payload.info.SYSTEM_INFO_USER, uid: payload.info.UID, @@ -51,6 +51,13 @@ export default DS.JSONAPISerializer.extend({ return this._super(store, primaryModelClass, fixedPayload, id, requestType); }, + checkDateValidity(timestamp) { + if (timestamp && timestamp > 0) { + return Converter.timeStampToDate(timestamp); + } + return 'N/A'; + }, + normalizeArrayResponse(store, primaryModelClass, payload, id, requestType) { var normalizedArrayResponse = {data: []}; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-flowrun.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-flowrun.js index 931d134d57f..97dde353b9f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-flowrun.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-flowrun.js @@ -34,8 +34,8 @@ export default DS.JSONAPISerializer.extend({ runid: payload.info.SYSTEM_INFO_FLOW_RUN_ID, shownid: payload.id, type: payload.type, - createTime: Converter.timeStampToDate(payload.createdtime), - endTime: Converter.timeStampToDate(payload.info.SYSTEM_INFO_FLOW_RUN_END_TIME), + createTime: this.checkDateValidity(payload.createdtime), + endTime: this.checkDateValidity(payload.info.SYSTEM_INFO_FLOW_RUN_END_TIME), user: payload.info.SYSTEM_INFO_USER, metrics: payload.metrics, } @@ -44,6 +44,13 @@ export default DS.JSONAPISerializer.extend({ return fixedPayload; }, + checkDateValidity(timestamp) { + if (timestamp && timestamp > 0) { + return Converter.timeStampToDate(timestamp); + } + return 'N/A'; + }, + normalizeSingleResponse(store, primaryModelClass, payload, id/*, requestType*/) { var p = this.internalNormalizeSingleResponse(store, primaryModelClass, payload, id);