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

1) Log when servers show up and when they load segments 

2) Adjust nodes to publish to ZK as the last part of their initialization
This commit is contained in:
cheddar 2013-04-24 18:24:48 -05:00
parent 3e94204c44
commit b6d72c0da4
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/main/java/com/metamx/druid/QueryableNode.java
View File

@ -389,7 +389,7 @@ public abstract class QueryableNode<T extends QueryableNode> extends Registering
lifecycle.addManagedInstance(announcer);
setAnnouncer(new CuratorDataSegmentAnnouncer(getDruidServerMetadata(), getZkPaths(), announcer, getJsonMapper()));
lifecycle.addManagedInstance(getAnnouncer());
lifecycle.addManagedInstance(getAnnouncer(), Lifecycle.Stage.LAST);
}
}

20
client/src/main/java/com/metamx/druid/client/ServerInventoryThingie.java
View File

@ -28,6 +28,7 @@ import com.metamx.common.lifecycle.LifecycleStart;
import com.metamx.common.lifecycle.LifecycleStop;
import com.metamx.druid.curator.inventory.CuratorInventoryManager;
import com.metamx.druid.curator.inventory.CuratorInventoryManagerStrategy;
import com.metamx.emitter.EmittingLogger;
import org.apache.curator.framework.CuratorFramework;
import java.io.IOException;
@ -42,6 +43,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
*/
public class ServerInventoryThingie implements ServerView
{
private static final EmittingLogger log = new EmittingLogger(ServerInventoryThingie.class);
private final CuratorInventoryManager<DruidServer, DataSegment> inventoryManager;
private final AtomicBoolean started = new AtomicBoolean(false);
@ -108,14 +111,15 @@ public class ServerInventoryThingie implements ServerView
}
@Override
public void newContainer(DruidServer newContainer)
public void newContainer(DruidServer container)
{
// Do nothing.
log.info("New Server[%s]", container);
}
@Override
public void deadContainer(DruidServer deadContainer)
{
log.info("Server Disdappeared[%s]", deadContainer);
runServerCallbacks(deadContainer);
}
@ -128,6 +132,9 @@ public class ServerInventoryThingie implements ServerView
@Override
public DruidServer addInventory(final DruidServer container, String inventoryKey, final DataSegment inventory)
{
log.info("Server[%s] added segment[%s]", container.getName(), inventory);
final DruidServer retVal = container.addDataSegment(inventoryKey, inventory);
runSegmentCallbacks(
new Function<SegmentCallback, CallbackAction>()
{
@ -138,13 +145,17 @@ public class ServerInventoryThingie implements ServerView
}
}
);
return container.addDataSegment(inventoryKey, inventory);
return retVal;
}
@Override
public DruidServer removeInventory(final DruidServer container, String inventoryKey)
{
log.info("Server[%s] removed segment[%s]", container.getName(), inventoryKey);
final DataSegment segment = container.getSegment(inventoryKey);
final DruidServer retVal = container.removeDataSegment(inventoryKey);
runSegmentCallbacks(
new Function<SegmentCallback, CallbackAction>()
{
@ -155,8 +166,9 @@ public class ServerInventoryThingie implements ServerView
}
}
);
removedSegments.put(inventoryKey, config.getRemovedSegmentLifetime());
return container.removeDataSegment(inventoryKey);
return retVal;
}
}
);

2
pom.xml
View File

@ -38,7 +38,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<metamx.java-util.version>0.21.0</metamx.java-util.version>
<metamx.java-util.version>0.22.0-SNAPSHOT</metamx.java-util.version>
<netflix.curator.version>2.0.1-21-22-SNAPSHOT</netflix.curator.version>
</properties>