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

some more logging cleanup for zk coordination

This commit is contained in:
fjy 2014-07-29 14:07:19 -07:00
parent d21e377a20
commit 1ac84fcd00
5 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,7 +72,7 @@ public abstract class BaseZkCoordinator implements DataSegmentChangeHandler
return; return;
} }
log.info("Starting zkCoordinator for server[%s]", me); log.info("Starting zkCoordinator for server[%s]", me.getName());
final String loadQueueLocation = ZKPaths.makePath(zkPaths.getLoadQueuePath(), me.getName()); final String loadQueueLocation = ZKPaths.makePath(zkPaths.getLoadQueuePath(), me.getName());
final String servedSegmentsLocation = ZKPaths.makePath(zkPaths.getServedSegmentsPath(), me.getName()); final String servedSegmentsLocation = ZKPaths.makePath(zkPaths.getServedSegmentsPath(), me.getName());
@ -107,7 +107,7 @@ public abstract class BaseZkCoordinator implements DataSegmentChangeHandler
child.getData(), DataSegmentChangeRequest.class child.getData(), DataSegmentChangeRequest.class
); );
log.info("New node[%s] with segmentClass[%s]", path, request.getClass()); log.info("New node[%s] with request[%s]", path, request.asString());
try { try {
request.go( request.go(
@ -122,7 +122,7 @@ 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 and removing entry for node[%s]", path); log.info("Completed request and deleting node[%s]", path);
hasRun = true; hasRun = true;
} }
} }
@ -131,8 +131,9 @@ public abstract class BaseZkCoordinator implements DataSegmentChangeHandler
curator.delete().guaranteed().forPath(path); curator.delete().guaranteed().forPath(path);
} }
catch (Exception e1) { catch (Exception e1) {
log.info(e1, "Failed to delete node[%s], but ignoring exception.", path); log.error(e1, "Failed to delete node[%s], but ignoring exception.", path);
} }
log.error(e, "Exception while removing node[%s]", path);
throw Throwables.propagate(e); throw Throwables.propagate(e);
} }
} }
@ -144,7 +145,7 @@ public abstract class BaseZkCoordinator implements DataSegmentChangeHandler
curator.delete().guaranteed().forPath(path); curator.delete().guaranteed().forPath(path);
} }
catch (Exception e1) { catch (Exception e1) {
log.info(e1, "Failed to delete node[%s], but ignoring exception.", path); log.error(e1, "Failed to delete node[%s], but ignoring exception.", path);
} }
log.makeAlert(e, "Segment load/unload: uncaught exception.") log.makeAlert(e, "Segment load/unload: uncaught exception.")
@ -155,7 +156,7 @@ public abstract class BaseZkCoordinator implements DataSegmentChangeHandler
break; break;
case CHILD_REMOVED: case CHILD_REMOVED:
log.info("[%s] was removed", event.getData().getPath()); log.info("node[%s] was removed", event.getData().getPath());
break; break;
default: default:
log.info("Ignoring event[%s]", event); log.info("Ignoring event[%s]", event);

2
server/src/main/java/io/druid/server/coordination/DataSegmentChangeRequest.java
View File

@ -33,4 +33,6 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
public interface DataSegmentChangeRequest public interface DataSegmentChangeRequest
{ {
public void go(DataSegmentChangeHandler handler, DataSegmentChangeCallback callback); public void go(DataSegmentChangeHandler handler, DataSegmentChangeCallback callback);
public String asString();
} }

6
server/src/main/java/io/druid/server/coordination/SegmentChangeRequestDrop.java
View File

@ -51,6 +51,12 @@ public class SegmentChangeRequestDrop implements DataSegmentChangeRequest
handler.removeSegment(segment, callback); handler.removeSegment(segment, callback);
} }
@Override
public String asString()
{
return String.format("load %s", segment.getIdentifier());
}
@Override @Override
public String toString() public String toString()
{ {

6
server/src/main/java/io/druid/server/coordination/SegmentChangeRequestLoad.java
View File

@ -51,6 +51,12 @@ public class SegmentChangeRequestLoad implements DataSegmentChangeRequest
return segment; return segment;
} }
@Override
public String asString()
{
return String.format("drop %s", segment.getIdentifier());
}
@Override @Override
public String toString() public String toString()
{ {

6
server/src/main/java/io/druid/server/coordination/SegmentChangeRequestNoop.java
View File

@ -28,4 +28,10 @@ public class SegmentChangeRequestNoop implements DataSegmentChangeRequest
{ {
// do nothing // do nothing
} }
@Override
public String asString()
{
return "noop";
}
} }