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

Merge pull request #214 from metamx/startup-fix 

Fix Zk Coordinator failing startup due to server manager exceptions and cleanup example configs
This commit is contained in:
cheddar 2013-08-12 13:17:58 -07:00
parent 2f728f3478 a39eb65edb
commit de5e746d48
1 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
server/src/main/java/com/metamx/druid/coordination/ZkCoordinator.java
View File

@ -107,7 +107,13 @@ public class ZkCoordinator implements DataSegmentChangeHandler
curator.newNamespaceAwareEnsurePath(liveSegmentsLocation).ensure(curator.getZookeeperClient()); curator.newNamespaceAwareEnsurePath(liveSegmentsLocation).ensure(curator.getZookeeperClient());
if (config.isLoadFromSegmentCacheEnabled()) { if (config.isLoadFromSegmentCacheEnabled()) {
loadCache(); try {
loadCache();
}
catch (Exception e) {
log.makeAlert(e, "Exception loading from cache")
.emit();
}
} }
loadQueueCache.getListenable().addListener( loadQueueCache.getListenable().addListener(
@ -254,7 +260,6 @@ public class ZkCoordinator implements DataSegmentChangeHandler
announcer.announceSegment(segment); announcer.announceSegment(segment);
} }
catch (IOException e) { catch (IOException e) {
removeSegment(segment);
throw new SegmentLoadingException(e, "Failed to announce segment[%s]", segment.getIdentifier()); throw new SegmentLoadingException(e, "Failed to announce segment[%s]", segment.getIdentifier());
} }
@ -269,6 +274,9 @@ public class ZkCoordinator implements DataSegmentChangeHandler
public void addSegments(Iterable<DataSegment> segments) public void addSegments(Iterable<DataSegment> segments)
{ {
try { try {
final List<String> segmentFailures = Lists.newArrayList();
final List<DataSegment> validSegments = Lists.newArrayList();
for (DataSegment segment : segments) { for (DataSegment segment : segments) {
log.info("Loading segment %s", segment.getIdentifier()); log.info("Loading segment %s", segment.getIdentifier());
@ -276,8 +284,10 @@ public class ZkCoordinator implements DataSegmentChangeHandler
serverManager.loadSegment(segment); serverManager.loadSegment(segment);
} }
catch (Exception e) { catch (Exception e) {
log.error(e, "Exception loading segment[%s]", segment.getIdentifier());
removeSegment(segment); removeSegment(segment);
throw new SegmentLoadingException(e, "Exception loading segment[%s]", segment.getIdentifier()); segmentFailures.add(segment.getIdentifier());
continue;
} }
File segmentInfoCacheFile = new File(config.getSegmentInfoCacheDirectory(), segment.getIdentifier()); File segmentInfoCacheFile = new File(config.getSegmentInfoCacheDirectory(), segment.getIdentifier());
@ -286,21 +296,29 @@ public class ZkCoordinator implements DataSegmentChangeHandler
jsonMapper.writeValue(segmentInfoCacheFile, segment); jsonMapper.writeValue(segmentInfoCacheFile, segment);
} }
catch (IOException e) { catch (IOException e) {
log.error(e, "Failed to write to disk segment info cache file[%s]", segmentInfoCacheFile);
removeSegment(segment); removeSegment(segment);
throw new SegmentLoadingException( segmentFailures.add(segment.getIdentifier());
e, "Failed to write to disk segment info cache file[%s]", segmentInfoCacheFile continue;
);
} }
} }
validSegments.add(segment);
} }
try { try {
announcer.announceSegments(segments); announcer.announceSegments(validSegments);
} }
catch (IOException e) { catch (IOException e) {
removeSegments(segments);
throw new SegmentLoadingException(e, "Failed to announce segments[%s]", segments); throw new SegmentLoadingException(e, "Failed to announce segments[%s]", segments);
} }
if (!segmentFailures.isEmpty()) {
for (String segmentFailure : segmentFailures) {
log.error("%s failed to load", segmentFailure);
}
throw new SegmentLoadingException("%,d errors seen while loading segments", segmentFailures.size());
}
} }
catch (SegmentLoadingException e) { catch (SegmentLoadingException e) {
log.makeAlert(e, "Failed to load segments for dataSource") log.makeAlert(e, "Failed to load segments for dataSource")