diff --git a/server/src/main/java/io/druid/server/coordination/ZkCoordinator.java b/server/src/main/java/io/druid/server/coordination/ZkCoordinator.java index 1987f2212af..a55341a75a1 100644 --- a/server/src/main/java/io/druid/server/coordination/ZkCoordinator.java +++ b/server/src/main/java/io/druid/server/coordination/ZkCoordinator.java @@ -109,17 +109,6 @@ public class ZkCoordinator implements DataSegmentChangeHandler curator.newNamespaceAwareEnsurePath(servedSegmentsLocation).ensure(curator.getZookeeperClient()); curator.newNamespaceAwareEnsurePath(liveSegmentsLocation).ensure(curator.getZookeeperClient()); -/* TODO - if (config.isLoadFromSegmentCacheEnabled()) { - try { - loadCache(); - } - catch (Exception e) { - log.makeAlert(e, "Exception loading from cache") - .emit(); - } - } -*/ loadCache(); loadQueueCache.getListenable().addListener( diff --git a/server/src/main/java/io/druid/server/coordination/ZkCoordinatorConfig.java b/server/src/main/java/io/druid/server/coordination/ZkCoordinatorConfig.java deleted file mode 100644 index c524f152d8c..00000000000 --- a/server/src/main/java/io/druid/server/coordination/ZkCoordinatorConfig.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Druid - a distributed column store. - * Copyright (C) 2012, 2013 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 io.druid.server.coordination; - -import org.skife.config.Config; - -import java.io.File; - -/** - */ -public abstract class ZkCoordinatorConfig -{ - @Config("druid.paths.segmentInfoCache") - public abstract File getSegmentInfoCacheDirectory(); - - @Config("druid.segmentCache.enable") - public boolean isLoadFromSegmentCacheEnabled() - { - return true; - } -}