Merge branch 'master' into improve-bard

This commit is contained in:
fjy 2013-05-10 11:05:29 -07:00
commit 8e38a85788
2 changed files with 3 additions and 3 deletions

View File

@ -135,7 +135,7 @@ public class ServerInventoryView implements ServerView, InventoryView
@Override
public void deadContainer(DruidServer deadContainer)
{
log.info("Server Disdappeared[%s]", deadContainer);
log.info("Server Disappeared[%s]", deadContainer);
runServerCallbacks(deadContainer);
}

View File

@ -102,8 +102,6 @@ public class HadoopDruidIndexerJob implements Jobby
}
}
publishedSegments = IndexGeneratorJob.getPublishedSegments(config);
if (!config.isLeaveIntermediate()) {
if (failedMessage == null || config.isCleanupOnFailure()) {
Path workingPath = config.makeIntermediatePath();
@ -121,6 +119,8 @@ public class HadoopDruidIndexerJob implements Jobby
throw new ISE(failedMessage);
}
publishedSegments = IndexGeneratorJob.getPublishedSegments(config);
return true;
}