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

clean up some logging in Zk coordinator

This commit is contained in:
fjy 2014-07-29 11:49:06 -07:00
parent 0be5d27f2a
commit 4a417cbcfc
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
server/src/main/java/io/druid/server/coordination/BaseZkCoordinator.java
View File

@ -103,14 +103,14 @@ public abstract class BaseZkCoordinator implements DataSegmentChangeHandler
switch (event.getType()) { switch (event.getType()) {
case CHILD_ADDED: case CHILD_ADDED:
final String path = child.getPath(); final String path = child.getPath();
final DataSegmentChangeRequest segment = jsonMapper.readValue( final DataSegmentChangeRequest request = jsonMapper.readValue(
child.getData(), DataSegmentChangeRequest.class child.getData(), DataSegmentChangeRequest.class
); );
log.info("New node[%s] with segmentClass[%s]", path, segment.getClass()); log.info("New node[%s] with segmentClass[%s]", path, request.getClass());
try { try {
segment.go( request.go(
getDataSegmentChangeHandler(), getDataSegmentChangeHandler(),
new DataSegmentChangeCallback() new DataSegmentChangeCallback()
{ {
@ -122,11 +122,17 @@ public abstract class BaseZkCoordinator implements DataSegmentChangeHandler
try { try {
if (!hasRun) { if (!hasRun) {
curator.delete().guaranteed().forPath(path); curator.delete().guaranteed().forPath(path);
log.info("Completed processing for node[%s]", path); log.info("Completed processing and removing entry for node[%s]", path);
hasRun = true; hasRun = true;
} }
} }
catch (Exception e) { catch (Exception e) {
try {
curator.delete().guaranteed().forPath(path);
}
catch (Exception e1) {
log.info(e1, "Failed to delete node[%s], but ignoring exception.", path);
}
throw Throwables.propagate(e); throw Throwables.propagate(e);
} }
} }
@ -143,13 +149,13 @@ public abstract class BaseZkCoordinator implements DataSegmentChangeHandler
log.makeAlert(e, "Segment load/unload: uncaught exception.") log.makeAlert(e, "Segment load/unload: uncaught exception.")
.addData("node", path) .addData("node", path)
.addData("nodeProperties", segment) .addData("nodeProperties", request)
.emit(); .emit();
} }
break; break;
case CHILD_REMOVED: case CHILD_REMOVED:
log.info("%s was removed", event.getData().getPath()); log.info("[%s] was removed", event.getData().getPath());
break; break;
default: default:
log.info("Ignoring event[%s]", event); log.info("Ignoring event[%s]", event);