YARN-8116. Nodemanager fails with NumberFormatException: For input string: . (Chandni Singh via wangda)

Change-Id: Idd30cfca59982d3fc6e47aa1b88f844a78fae94d
This commit is contained in:
Wangda Tan 2018-04-10 17:32:38 -07:00
parent c467f311d0
commit 2bf9cc2c73
3 changed files with 21 additions and 2 deletions

View File

@ -2191,7 +2191,8 @@ private static void removeDockerContainer(ContainerImpl container) {
}
private void storeRetryContext() {
if (windowRetryContext.getRestartTimes() != null) {
if (windowRetryContext.getRestartTimes() != null &&
!windowRetryContext.getRestartTimes().isEmpty()) {
try {
stateStore.storeContainerRestartTimes(containerId,
windowRetryContext.getRestartTimes());

View File

@ -347,7 +347,9 @@ private RecoveredContainerState loadContainerState(ContainerId containerId,
value.substring(1, value.length() - 1).split(", ");
List<Long> restartTimes = new ArrayList<>();
for (String restartTime : unparsedRestartTimes) {
restartTimes.add(Long.parseLong(restartTime));
if (!restartTime.isEmpty()) {
restartTimes.add(Long.parseLong(restartTime));
}
}
rcs.setRestartTimes(restartTimes);
} else if (suffix.equals(CONTAINER_WORK_DIR_KEY_SUFFIX)) {

View File

@ -1216,6 +1216,22 @@ public void testStateStoreNodeHealth() throws IOException {
Assert.fail("Expected exception not thrown");
}
@Test
public void testEmptyRestartTimes() throws IOException {
List<Long> restartTimes = new ArrayList<>();
ApplicationId appId = ApplicationId.newInstance(1234, 3);
ApplicationAttemptId appAttemptId = ApplicationAttemptId.newInstance(appId,
4);
ContainerId containerId = ContainerId.newContainerId(appAttemptId, 5);
storeMockContainer(containerId);
stateStore.storeContainerRestartTimes(containerId,
restartTimes);
restartStateStore();
RecoveredContainerState rcs = stateStore.loadContainersState().get(0);
List<Long> recoveredRestartTimes = rcs.getRestartTimes();
assertTrue(recoveredRestartTimes.isEmpty());
}
private StartContainerRequest storeMockContainer(ContainerId containerId)
throws IOException {
// create a container request