YARN-3157. Refactor the exception handling in ConverterUtils#to*Id. Contributed by Bibin A Chundatt.

This commit is contained in:
Tsuyoshi Ozawa 2015-02-12 18:39:29 +09:00
parent 76e309ead0
commit 95a41bf35d
3 changed files with 31 additions and 1 deletions

View File

@ -269,6 +269,9 @@ Release 2.7.0 - UNRELEASED
YARN-1237. Description for yarn.nodemanager.aux-services in
yarn-default.xml is misleading. (Brahma Reddy Battula via ozawa)
YARN-3157. Refactor the exception handling in ConverterUtils#to*Id.
(Bibin A Chundatt via ozawa)
OPTIMIZATIONS
YARN-2990. FairScheduler's delay-scheduling always waits for node-local and

View File

@ -27,6 +27,7 @@
import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
import java.util.NoSuchElementException;
import org.apache.hadoop.classification.InterfaceAudience.Private;
import org.apache.hadoop.fs.Path;
@ -175,7 +176,12 @@ public static NodeId toNodeId(String nodeIdStr) {
}
public static ContainerId toContainerId(String containerIdStr) {
try {
return ContainerId.fromString(containerIdStr);
} catch (NoSuchElementException e) {
throw new IllegalArgumentException("Invalid ContainerId: "
+ containerIdStr, e);
}
}
public static ApplicationAttemptId toApplicationAttemptId(
@ -190,6 +196,9 @@ public static ApplicationAttemptId toApplicationAttemptId(
} catch (NumberFormatException n) {
throw new IllegalArgumentException("Invalid AppAttemptId: "
+ applicationAttmeptIdStr, n);
} catch (NoSuchElementException e){
throw new IllegalArgumentException("Invalid AppAttemptId: "
+ applicationAttmeptIdStr, e);
}
}
@ -206,6 +215,9 @@ public static ApplicationId toApplicationId(
} catch (NumberFormatException n) {
throw new IllegalArgumentException("Invalid ApplicationId: "
+ appIdStr, n);
} catch (NoSuchElementException e){
throw new IllegalArgumentException("Invalid ApplicationId: "
+ appIdStr, e);
}
}

View File

@ -99,4 +99,19 @@ public void testNodeIdWithDefaultPort() throws URISyntaxException {
assertEquals(nid.getPort(), 0);
assertEquals(nid.getHost(), "node");
}
@Test(expected = IllegalArgumentException.class)
public void testInvalidContainerId() {
ConverterUtils.toContainerId("container_e20_1423221031460_0003_01");
}
@Test(expected = IllegalArgumentException.class)
public void testInvalidAppattemptId() {
ConverterUtils.toApplicationAttemptId("appattempt_1423221031460");
}
@Test(expected = IllegalArgumentException.class)
public void testApplicationId() {
ConverterUtils.toApplicationId("application_1423221031460");
}
}