From 1586d60ec26b5aec2bc940602ec8f65e9ff25c72 Mon Sep 17 00:00:00 2001 From: fjy Date: Tue, 29 Jul 2014 16:14:29 -0700 Subject: [PATCH] fix bugs in log printing --- .../io/druid/server/coordination/BaseZkCoordinator.java | 6 +++--- .../druid/server/coordination/SegmentChangeRequestDrop.java | 2 +- .../druid/server/coordination/SegmentChangeRequestLoad.java | 2 +- .../druid/server/coordination/SegmentChangeRequestNoop.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/src/main/java/io/druid/server/coordination/BaseZkCoordinator.java b/server/src/main/java/io/druid/server/coordination/BaseZkCoordinator.java index d489d74b445..e751041747b 100644 --- a/server/src/main/java/io/druid/server/coordination/BaseZkCoordinator.java +++ b/server/src/main/java/io/druid/server/coordination/BaseZkCoordinator.java @@ -107,7 +107,7 @@ public abstract class BaseZkCoordinator implements DataSegmentChangeHandler child.getData(), DataSegmentChangeRequest.class ); - log.info("New node[%s] with request[%s]", path, request.asString()); + log.info("New request[%s] with node[%s].", request.asString(), path); try { request.go( @@ -122,7 +122,7 @@ public abstract class BaseZkCoordinator implements DataSegmentChangeHandler try { if (!hasRun) { curator.delete().guaranteed().forPath(path); - log.info("Completed request and deleting node[%s]", path); + log.info("Completed request [%s]", request.asString()); hasRun = true; } } @@ -156,7 +156,7 @@ public abstract class BaseZkCoordinator implements DataSegmentChangeHandler break; case CHILD_REMOVED: - log.info("node[%s] was removed", event.getData().getPath()); + log.info("Node[%s] was removed", event.getData().getPath()); break; default: log.info("Ignoring event[%s]", event); diff --git a/server/src/main/java/io/druid/server/coordination/SegmentChangeRequestDrop.java b/server/src/main/java/io/druid/server/coordination/SegmentChangeRequestDrop.java index a64a51e7d92..5da8ff90058 100644 --- a/server/src/main/java/io/druid/server/coordination/SegmentChangeRequestDrop.java +++ b/server/src/main/java/io/druid/server/coordination/SegmentChangeRequestDrop.java @@ -54,7 +54,7 @@ public class SegmentChangeRequestDrop implements DataSegmentChangeRequest @Override public String asString() { - return String.format("load %s", segment.getIdentifier()); + return String.format("DROP: %s", segment.getIdentifier()); } @Override diff --git a/server/src/main/java/io/druid/server/coordination/SegmentChangeRequestLoad.java b/server/src/main/java/io/druid/server/coordination/SegmentChangeRequestLoad.java index 76d539dcc59..3142c2804f8 100644 --- a/server/src/main/java/io/druid/server/coordination/SegmentChangeRequestLoad.java +++ b/server/src/main/java/io/druid/server/coordination/SegmentChangeRequestLoad.java @@ -54,7 +54,7 @@ public class SegmentChangeRequestLoad implements DataSegmentChangeRequest @Override public String asString() { - return String.format("drop %s", segment.getIdentifier()); + return String.format("LOAD: %s", segment.getIdentifier()); } @Override diff --git a/server/src/main/java/io/druid/server/coordination/SegmentChangeRequestNoop.java b/server/src/main/java/io/druid/server/coordination/SegmentChangeRequestNoop.java index 454d8617044..a5f254b25e3 100644 --- a/server/src/main/java/io/druid/server/coordination/SegmentChangeRequestNoop.java +++ b/server/src/main/java/io/druid/server/coordination/SegmentChangeRequestNoop.java @@ -32,6 +32,6 @@ public class SegmentChangeRequestNoop implements DataSegmentChangeRequest @Override public String asString() { - return "noop"; + return "NOOP"; } }