Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-5970. Validate application update timeout request parameters. Contributed by Rohith Sharma K S.

This commit is contained in:
Sunil G 2016-12-08 15:53:56 +05:30
parent 9ef89ede2f
commit 74d0066d33
4 changed files with 38 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/Times.java
View File

@ -105,6 +105,9 @@ public class Times {
*/
public static long parseISO8601ToLocalTimeInMillis(String isoString)
throws ParseException {
if (isoString == null) {
throw new ParseException("Invalid input.", -1);
}
return isoFormat.get().parse(isoString).getTime();
}
}

3
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMServerUtils.java
View File

@ -507,7 +507,8 @@ public class RMServerUtils {
} catch (ParseException ex) {
String message =
"Expire time is not in ISO8601 format. ISO8601 supported "
+ "format is yyyy-MM-dd'T'HH:mm:ss.SSSZ";
+ "format is yyyy-MM-dd'T'HH:mm:ss.SSSZ. Configured "
+ "timeout value is " + timeout.getValue();
throw new YarnException(message, ex);
}
if (expireTime < currentTimeMillis) {

10
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebServices.java
View File

@ -2434,7 +2434,7 @@ public class RMWebServices extends WebServices {
}
@GET
@Path("/apps/{appid}/timeout/{type}")
@Path("/apps/{appid}/timeouts/{type}")
@Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
public AppTimeoutInfo getAppTimeout(@Context HttpServletRequest hsr,
@ -2571,10 +2571,10 @@ public class RMWebServices extends WebServices {
private Response updateApplicationTimeouts(final RMApp app,
UserGroupInformation callerUGI, final AppTimeoutInfo appTimeout)
throws IOException, InterruptedException {
if (appTimeout.getTimeoutType() == null) {
return Response.status(Status.BAD_REQUEST).entity("Timeout type is null.")
.build();
if (appTimeout.getTimeoutType() == null
|| appTimeout.getExpireTime() == null) {
return Response.status(Status.BAD_REQUEST)
.entity("Timeout type or ExpiryTime is null.").build();
}
String userName = callerUGI.getUserName();

39
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java
View File

@ -1328,19 +1328,11 @@ public class TestRMWebServicesAppsModification extends JerseyTestBase {
ApplicationTimeoutType.LIFETIME, "UNLIMITED", -1);
}
AppTimeoutInfo timeoutUpdate = new AppTimeoutInfo();
long timeOutFromNow = 60;
String expireTime = Times
.formatISO8601(System.currentTimeMillis() + timeOutFromNow * 1000);
timeoutUpdate.setTimeoutType(ApplicationTimeoutType.LIFETIME);
timeoutUpdate.setExpiryTime(expireTime);
Object entity;
if (contentType.equals(MediaType.APPLICATION_JSON_TYPE)) {
entity = appTimeoutToJSON(timeoutUpdate);
} else {
entity = timeoutUpdate;
}
Object entity = getAppTimeoutInfoEntity(ApplicationTimeoutType.LIFETIME,
contentType, expireTime);
response = this
.constructWebResource("apps", app.getApplicationId().toString(),
"timeout")
@ -1361,10 +1353,20 @@ public class TestRMWebServicesAppsModification extends JerseyTestBase {
expireTime, timeOutFromNow);
}
// verify for negative cases
entity = getAppTimeoutInfoEntity(null,
contentType, null);
response = this
.constructWebResource("apps", app.getApplicationId().toString(),
"timeout")
.entity(entity, contentType).accept(mediaType)
.put(ClientResponse.class);
assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo());
// invoke get
response =
this.constructWebResource("apps", app.getApplicationId().toString(),
"timeout", ApplicationTimeoutType.LIFETIME.toString())
"timeouts", ApplicationTimeoutType.LIFETIME.toString())
.accept(mediaType).get(ClientResponse.class);
assertResponseStatusCode(Status.OK, response.getStatusInfo());
if (mediaType.contains(MediaType.APPLICATION_JSON)) {
@ -1376,6 +1378,21 @@ public class TestRMWebServicesAppsModification extends JerseyTestBase {
rm.stop();
}
private Object getAppTimeoutInfoEntity(ApplicationTimeoutType type,
MediaType contentType, String expireTime) throws Exception {
AppTimeoutInfo timeoutUpdate = new AppTimeoutInfo();
timeoutUpdate.setTimeoutType(type);
timeoutUpdate.setExpiryTime(expireTime);
Object entity;
if (contentType.equals(MediaType.APPLICATION_JSON_TYPE)) {
entity = appTimeoutToJSON(timeoutUpdate);
} else {
entity = timeoutUpdate;
}
return entity;
}
protected static void verifyAppTimeoutJson(ClientResponse response,
ApplicationTimeoutType type, String expireTime, long timeOutFromNow)
throws JSONException {