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

1) Use PathChildrenCacheFactory to simplify creation of PathChildrenCache objects.

This commit is contained in:
cheddar 2013-04-23 16:07:40 -05:00
parent 57c31656d1
commit 545b489093
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
client/src/main/java/com/metamx/druid/curator/inventory/CuratorInventoryManager.java
View File

@ -27,6 +27,8 @@ import com.metamx.common.lifecycle.LifecycleStart;
import com.metamx.common.lifecycle.LifecycleStop; import com.metamx.common.lifecycle.LifecycleStop;
import com.metamx.common.logger.Logger; import com.metamx.common.logger.Logger;
import com.metamx.druid.curator.ShutdownNowIgnoringExecutorService; import com.metamx.druid.curator.ShutdownNowIgnoringExecutorService;
import com.metamx.druid.curator.cache.PathChildrenCacheFactory;
import com.metamx.druid.curator.cache.SimplePathChildrenCacheFactory;
import com.netflix.curator.framework.CuratorFramework; import com.netflix.curator.framework.CuratorFramework;
import com.netflix.curator.framework.recipes.cache.ChildData; import com.netflix.curator.framework.recipes.cache.ChildData;
import com.netflix.curator.framework.recipes.cache.PathChildrenCache; import com.netflix.curator.framework.recipes.cache.PathChildrenCache;
@ -54,12 +56,12 @@ public class CuratorInventoryManager<ContainerClass, InventoryClass>
private final Object lock = new Object(); private final Object lock = new Object();
private final InventoryManagerConfig config;
private final CuratorFramework curatorFramework; private final CuratorFramework curatorFramework;
private final ExecutorService exec; private final InventoryManagerConfig config;
private final CuratorInventoryManagerStrategy<ContainerClass, InventoryClass> strategy; private final CuratorInventoryManagerStrategy<ContainerClass, InventoryClass> strategy;
private final ConcurrentMap<String, ContainerHolder> containers; private final ConcurrentMap<String, ContainerHolder> containers;
private final PathChildrenCacheFactory cacheFactory;
private volatile PathChildrenCache childrenCache; private volatile PathChildrenCache childrenCache;
@ -72,10 +74,11 @@ public class CuratorInventoryManager<ContainerClass, InventoryClass>
{ {
this.curatorFramework = curatorFramework; this.curatorFramework = curatorFramework;
this.config = config; this.config = config;
this.exec = exec;
this.strategy = strategy; this.strategy = strategy;
this.containers = new MapMaker().makeMap(); this.containers = new MapMaker().makeMap();
this.cacheFactory = new SimplePathChildrenCacheFactory(true, true, new ShutdownNowIgnoringExecutorService(exec));
} }
@LifecycleStart @LifecycleStart
@ -86,13 +89,7 @@ public class CuratorInventoryManager<ContainerClass, InventoryClass>
return; return;
} }
childrenCache = new PathChildrenCache( childrenCache = cacheFactory.make(curatorFramework, config.getContainerPath());
curatorFramework,
config.getContainerPath(),
true,
true,
new ShutdownNowIgnoringExecutorService(exec)
);
} }
childrenCache.getListenable().addListener(new ContainerCacheListener()); childrenCache.getListenable().addListener(new ContainerCacheListener());
@ -212,9 +209,7 @@ public class CuratorInventoryManager<ContainerClass, InventoryClass>
} }
final String inventoryPath = String.format("%s/%s", config.getContainerPath(), containerKey); final String inventoryPath = String.format("%s/%s", config.getContainerPath(), containerKey);
PathChildrenCache containerCache = new PathChildrenCache( PathChildrenCache containerCache = cacheFactory.make(curatorFramework, inventoryPath);
curatorFramework, inventoryPath, true, true, new ShutdownNowIgnoringExecutorService(exec)
);
containerCache.getListenable().addListener(new InventoryCacheListener(containerKey, inventoryPath)); containerCache.getListenable().addListener(new InventoryCacheListener(containerKey, inventoryPath));
containers.put(containerKey, new ContainerHolder(container, containerCache)); containers.put(containerKey, new ContainerHolder(container, containerCache));