Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into improve-bard

This commit is contained in:
fjy 2013-05-10 11:05:29 -07:00
parent 7cc30a0747 3e3f2c2da7
commit 8e38a85788
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/main/java/com/metamx/druid/client/ServerInventoryView.java
View File

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

4
indexer/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerJob.java
View File

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