big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

YARN-7627. [ATSv2] When passing a non-number as metricslimit, the error message is wrong. Contributed by Charan Hebri.

Browse Source
This commit is contained in:
Rohith Sharma K S 2019-02-06 09:30:09 +05:30
parent 912d9f790d
commit 1e5e08d83b
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderWebServices.java
View File

@ -350,7 +350,8 @@ public Set<TimelineEntity> getEntities(
succeeded = true; succeeded = true;
} catch (Exception e) { } catch (Exception e) {
handleException(e, url, startTime, handleException(e, url, startTime,
"createdTime start/end or limit or flowrunid"); "Either limit or createdtime start/end or metricslimit or metricstime"
+ " start/end or fromid");
} finally { } finally {
long latency = Time.monotonicNow() - startTime; long latency = Time.monotonicNow() - startTime;
METRICS.addGetEntitiesLatency(latency, succeeded); METRICS.addGetEntitiesLatency(latency, succeeded);
@ -631,7 +632,8 @@ public Set<TimelineEntity> getEntities(
succeeded = true; succeeded = true;
} catch (Exception e) { } catch (Exception e) {
handleException(e, url, startTime, handleException(e, url, startTime,
"createdTime start/end or limit or flowrunid"); "Either flowrunid or limit or createdtime start/end or metricslimit"
+ " or metricstime start/end or fromid");
} finally { } finally {
long latency = Time.monotonicNow() - startTime; long latency = Time.monotonicNow() - startTime;
METRICS.addGetEntitiesLatency(latency, succeeded); METRICS.addGetEntitiesLatency(latency, succeeded);
@ -725,7 +727,8 @@ public TimelineEntity getEntity(
checkAccessForGenericEntity(entity, callerUGI); checkAccessForGenericEntity(entity, callerUGI);
succeeded = true; succeeded = true;
} catch (Exception e) { } catch (Exception e) {
handleException(e, url, startTime, "flowrunid"); handleException(e, url, startTime, "Either metricslimit or metricstime"
+ " start/end");
} finally { } finally {
long latency = Time.monotonicNow() - startTime; long latency = Time.monotonicNow() - startTime;
METRICS.addGetEntitiesLatency(latency, succeeded); METRICS.addGetEntitiesLatency(latency, succeeded);
@ -919,7 +922,8 @@ public TimelineEntity getEntity(
checkAccessForGenericEntity(entity, callerUGI); checkAccessForGenericEntity(entity, callerUGI);
succeeded = true; succeeded = true;
} catch (Exception e) { } catch (Exception e) {
handleException(e, url, startTime, "flowrunid"); handleException(e, url, startTime, "Either flowrunid or metricslimit or"
+ " metricstime start/end");
} finally { } finally {
long latency = Time.monotonicNow() - startTime; long latency = Time.monotonicNow() - startTime;
METRICS.addGetEntitiesLatency(latency, succeeded); METRICS.addGetEntitiesLatency(latency, succeeded);
@ -1606,7 +1610,8 @@ public TimelineEntity getApp(
checkAccessForAppEntity(entity, callerUGI); checkAccessForAppEntity(entity, callerUGI);
succeeded = true; succeeded = true;
} catch (Exception e) { } catch (Exception e) {
handleException(e, url, startTime, "flowrunid"); handleException(e, url, startTime, "Either metricslimit or metricstime"
+ " start/end");
} finally { } finally {
long latency = Time.monotonicNow() - startTime; long latency = Time.monotonicNow() - startTime;
METRICS.addGetEntitiesLatency(latency, succeeded); METRICS.addGetEntitiesLatency(latency, succeeded);
@ -1781,7 +1786,8 @@ public TimelineEntity getApp(
checkAccessForAppEntity(entity, callerUGI); checkAccessForAppEntity(entity, callerUGI);
succeeded = true; succeeded = true;
} catch (Exception e) { } catch (Exception e) {
handleException(e, url, startTime, "flowrunid"); handleException(e, url, startTime, "Either flowrunid or metricslimit or"
+ " metricstime start/end");
} finally { } finally {
long latency = Time.monotonicNow() - startTime; long latency = Time.monotonicNow() - startTime;
METRICS.addGetEntitiesLatency(latency, succeeded); METRICS.addGetEntitiesLatency(latency, succeeded);
@ -1927,7 +1933,8 @@ public Set<TimelineEntity> getFlowRunApps(
succeeded = true; succeeded = true;
} catch (Exception e) { } catch (Exception e) {
handleException(e, url, startTime, handleException(e, url, startTime,
"createdTime start/end or limit or flowrunid"); "Either limit or createdtime start/end or metricslimit or"
+ " metricstime start/end");
} finally { } finally {
long latency = Time.monotonicNow() - startTime; long latency = Time.monotonicNow() - startTime;
METRICS.addGetEntitiesLatency(latency, succeeded); METRICS.addGetEntitiesLatency(latency, succeeded);
@ -3418,7 +3425,8 @@ public Set<TimelineEntity> getSubAppEntities(
succeeded = true; succeeded = true;
} catch (Exception e) { } catch (Exception e) {
handleException(e, url, startTime, handleException(e, url, startTime,
"createdTime start/end or limit"); "Either limit or createdtime start/end or metricslimit or metricstime"
+ " start/end or fromid");
} finally { } finally {
long latency = Time.monotonicNow() - startTime; long latency = Time.monotonicNow() - startTime;
METRICS.addGetEntitiesLatency(latency, succeeded); METRICS.addGetEntitiesLatency(latency, succeeded);
@ -3489,7 +3497,8 @@ public Set<TimelineEntity> getSubAppEntities(@Context HttpServletRequest req,
checkAccessForSubAppEntities(entities,callerUGI); checkAccessForSubAppEntities(entities,callerUGI);
succeeded = true; succeeded = true;
} catch (Exception e) { } catch (Exception e) {
handleException(e, url, startTime, ""); handleException(e, url, startTime, "Either metricslimit or metricstime"
+ " start/end");
} finally { } finally {
long latency = Time.monotonicNow() - startTime; long latency = Time.monotonicNow() - startTime;
METRICS.addGetEntitiesLatency(latency, succeeded); METRICS.addGetEntitiesLatency(latency, succeeded);