Revert "YARN-3157. Refactor the exception handling in ConverterUtils#to*Id. Contributed by Bibin A Chundatt."
This reverts commit 95a41bf35d
.
This commit is contained in:
parent
95a41bf35d
commit
4cbaa74f62
|
@ -269,9 +269,6 @@ 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
|
||||
|
|
|
@ -27,7 +27,6 @@ import java.util.HashMap;
|
|||
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;
|
||||
|
@ -176,12 +175,7 @@ public class ConverterUtils {
|
|||
}
|
||||
|
||||
public static ContainerId toContainerId(String containerIdStr) {
|
||||
try {
|
||||
return ContainerId.fromString(containerIdStr);
|
||||
} catch (NoSuchElementException e) {
|
||||
throw new IllegalArgumentException("Invalid ContainerId: "
|
||||
+ containerIdStr, e);
|
||||
}
|
||||
return ContainerId.fromString(containerIdStr);
|
||||
}
|
||||
|
||||
public static ApplicationAttemptId toApplicationAttemptId(
|
||||
|
@ -196,9 +190,6 @@ public class ConverterUtils {
|
|||
} catch (NumberFormatException n) {
|
||||
throw new IllegalArgumentException("Invalid AppAttemptId: "
|
||||
+ applicationAttmeptIdStr, n);
|
||||
} catch (NoSuchElementException e){
|
||||
throw new IllegalArgumentException("Invalid AppAttemptId: "
|
||||
+ applicationAttmeptIdStr, e);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -215,9 +206,6 @@ public class ConverterUtils {
|
|||
} catch (NumberFormatException n) {
|
||||
throw new IllegalArgumentException("Invalid ApplicationId: "
|
||||
+ appIdStr, n);
|
||||
} catch (NoSuchElementException e){
|
||||
throw new IllegalArgumentException("Invalid ApplicationId: "
|
||||
+ appIdStr, e);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -99,19 +99,4 @@ public class TestConverterUtils {
|
|||
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");
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue