From 0b621c7bde50c3c9b6af3a2be62a4e90a453d284 Mon Sep 17 00:00:00 2001
From: Eric Tschetter <cheddar@metamarketsgroup.com>
Date: Sat, 6 Apr 2013 11:10:36 -0500
Subject: [PATCH] 1) Expand logging of unregistering real-time segments to help
 diagnose strange zookeeper behavior

---
 .../merger/common/task/RealtimeIndexTask.java | 19 +++++++++++++++++++
 .../plumber/RealtimePlumberSchool.java        |  7 +++++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/merger/src/main/java/com/metamx/druid/merger/common/task/RealtimeIndexTask.java b/merger/src/main/java/com/metamx/druid/merger/common/task/RealtimeIndexTask.java
index 27278537cca..6d57541ceb9 100644
--- a/merger/src/main/java/com/metamx/druid/merger/common/task/RealtimeIndexTask.java
+++ b/merger/src/main/java/com/metamx/druid/merger/common/task/RealtimeIndexTask.java
@@ -1,3 +1,22 @@
+/*
+ * Druid - a distributed column store.
+ * Copyright (C) 2012  Metamarkets Group Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
 package com.metamx.druid.merger.common.task;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
diff --git a/realtime/src/main/java/com/metamx/druid/realtime/plumber/RealtimePlumberSchool.java b/realtime/src/main/java/com/metamx/druid/realtime/plumber/RealtimePlumberSchool.java
index d30ef7d7156..0fa92145c9f 100644
--- a/realtime/src/main/java/com/metamx/druid/realtime/plumber/RealtimePlumberSchool.java
+++ b/realtime/src/main/java/com/metamx/druid/realtime/plumber/RealtimePlumberSchool.java
@@ -421,9 +421,12 @@ public class RealtimePlumberSchool implements PlumberSchool
                     final Long sinkKey = entry.getKey();
                     if (interval.contains(sinkKey)) {
                       final Sink sink = entry.getValue();
-                      log.info("Segment matches sink[%s]", sink);
+                      log.info("Segment[%s] matches sink[%s] on server[%s]", segment, sink, server);
 
-                      if (segment.getVersion().compareTo(sink.getSegment().getVersion()) >= 0) {
+                      final String segmentVersion = segment.getVersion();
+                      final String sinkVersion = sink.getSegment().getVersion();
+                      if (segmentVersion.compareTo(sinkVersion) >= 0) {
+                        log.info("Segment version[%s] >= sink version[%s]", segmentVersion, sinkVersion);
                         try {
                           segmentAnnouncer.unannounceSegment(sink.getSegment());
                           FileUtils.deleteDirectory(computePersistDir(schema, sink.getInterval()));