diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderWebServices.java index dfe04f9fa09..55ad967540c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderWebServices.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderWebServices.java @@ -337,7 +337,8 @@ public TimelineAbout about( metricsTimeStart, metricsTimeEnd)); } catch (Exception e) { handleException(e, url, startTime, - "createdTime start/end or limit or flowrunid"); + "Either createdTime start/end or limit or flowrunid or metricslimit " + + "or metricstime start/end"); } long endTime = Time.monotonicNow(); if (entities == null) { @@ -612,7 +613,8 @@ public TimelineAbout about( metricsTimeStart, metricsTimeEnd)); } catch (Exception e) { handleException(e, url, startTime, - "createdTime start/end or limit or flowrunid"); + "Either createdTime start/end or limit or flowrunid or metricslimit " + + "or metricstime start/end"); } long endTime = Time.monotonicNow(); if (entities == null) { @@ -701,7 +703,8 @@ public TimelineEntity getEntity( confsToRetrieve, metricsToRetrieve, fields, metricsLimit, metricsTimeStart, metricsTimeEnd)); } catch (Exception e) { - handleException(e, url, startTime, "flowrunid"); + handleException(e, url, startTime, + "Either flowrunid or metricslimit or metricstime start/end"); } long endTime = Time.monotonicNow(); if (entity == null) { @@ -890,7 +893,8 @@ public TimelineEntity getEntity( confsToRetrieve, metricsToRetrieve, fields, metricsLimit, metricsTimeStart, metricsTimeEnd)); } catch (Exception e) { - handleException(e, url, startTime, "flowrunid"); + handleException(e, url, startTime, + "Either flowrunid or metricslimit or metricstime start/end"); } long endTime = Time.monotonicNow(); if (entity == null) { @@ -1535,7 +1539,8 @@ public TimelineEntity getApp( confsToRetrieve, metricsToRetrieve, fields, metricsLimit, metricsTimeStart, metricsTimeEnd)); } catch (Exception e) { - handleException(e, url, startTime, "flowrunid"); + handleException(e, url, startTime, + "Either flowrunid or metricslimit or metricstime start/end"); } long endTime = Time.monotonicNow(); if (entity == null) { @@ -1705,7 +1710,8 @@ public TimelineEntity getApp( confsToRetrieve, metricsToRetrieve, fields, metricsLimit, metricsTimeStart, metricsTimeEnd)); } catch (Exception e) { - handleException(e, url, startTime, "flowrunid"); + handleException(e, url, startTime, + "Either flowrunid or metricslimit or metricstime start/end"); } long endTime = Time.monotonicNow(); if (entity == null) { @@ -1845,7 +1851,8 @@ public TimelineEntity getApp( metricsTimeStart, metricsTimeEnd)); } catch (Exception e) { handleException(e, url, startTime, - "createdTime start/end or limit or flowrunid"); + "Either createdTime start/end or limit or flowrunid or metricslimit " + + "or metricstime start/end"); } long endTime = Time.monotonicNow(); if (entities == null) { @@ -3327,7 +3334,8 @@ public TimelineEntity getContainer(@Context HttpServletRequest req, metricsTimeStart, metricsTimeEnd)); } catch (Exception e) { handleException(e, url, startTime, - "createdTime start/end or limit"); + "Either createdTime start/end or limit or metricslimit or metricstime" + + " start/end"); } long endTime = Time.monotonicNow(); if (entities == null) { @@ -3393,7 +3401,8 @@ public TimelineEntity getContainer(@Context HttpServletRequest req, confsToRetrieve, metricsToRetrieve, fields, metricsLimit, metricsTimeStart, metricsTimeEnd)); } catch (Exception e) { - handleException(e, url, startTime, ""); + handleException(e, url, startTime, "Either metricslimit or metricstime " + + "start/end"); } long endTime = Time.monotonicNow(); if (entities == null) {