diff options
| -rw-r--r-- | container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java | 10 | ||||
| -rw-r--r-- | container-search/src/test/java/com/yahoo/prelude/cluster/ClusterSearcherTestCase.java | 53 |
2 files changed, 35 insertions, 28 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java b/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java index 04a7d9a5303..fd150f975c3 100644 --- a/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java +++ b/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java @@ -150,6 +150,7 @@ public class ClusterSearcher extends Searcher { documentDbConfig); addBackendSearcher(searcher); } else { + System.out.println("Dispatchers: " + searchClusterConfig.dispatcher().size()); for (int dispatcherIndex = 0; dispatcherIndex < searchClusterConfig.dispatcher().size(); dispatcherIndex++) { try { if ( ! isRemote(searchClusterConfig.dispatcher(dispatcherIndex).host())) { @@ -160,12 +161,13 @@ public class ClusterSearcher extends Searcher { addBackendSearcher(searcher); } } catch (UnknownHostException e) { + e.printStackTrace(); throw new RuntimeException(e); } } } if ( server == null ) { - log.log(Level.SEVERE, "ClusterSearcher should have a top level dispatch."); + throw new IllegalStateException("ClusterSearcher should have a top level dispatch."); } monitor.freeze(); monitor.startPingThread(); @@ -192,8 +194,7 @@ public class ClusterSearcher extends Searcher { private static ClusterParams makeClusterParams(int searchclusterIndex, LegacyEmulationConfig emulConfig, int dispatchIndex) { - return new ClusterParams("sc" + searchclusterIndex + ".num" + dispatchIndex, - emulConfig); + return new ClusterParams("sc" + searchclusterIndex + ".num" + dispatchIndex, emulConfig); } private static FastSearcher searchDispatch(int searchclusterIndex, @@ -205,8 +206,7 @@ public class ClusterSearcher extends Searcher { Backend backend, Dispatcher dispatcher, int dispatcherIndex) { - ClusterParams clusterParams = makeClusterParams(searchclusterIndex, - emulConfig, dispatcherIndex); + ClusterParams clusterParams = makeClusterParams(searchclusterIndex, emulConfig, dispatcherIndex); return new FastSearcher(backend, fs4ResourcePool, dispatcher, docSumParams, clusterParams, cacheParams, documentdbInfoConfig); } diff --git a/container-search/src/test/java/com/yahoo/prelude/cluster/ClusterSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/cluster/ClusterSearcherTestCase.java index 6443cbdf163..646c466eba9 100644 --- a/container-search/src/test/java/com/yahoo/prelude/cluster/ClusterSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/cluster/ClusterSearcherTestCase.java @@ -517,29 +517,36 @@ public class ClusterSearcherTestCase { private static ClusterSearcher createSearcher(Double maxQueryTimeout, Double maxQueryCacheTimeout) { - ComponentId id = new ComponentId("test-id"); - QrSearchersConfig qrsCfg = new QrSearchersConfig(new QrSearchersConfig.Builder(). - searchcluster(new QrSearchersConfig.Searchcluster.Builder().name("test-cluster"))); - ClusterConfig.Builder clusterCfgBld = new ClusterConfig.Builder().clusterName("test-cluster"); - if (maxQueryTimeout != null) { - clusterCfgBld.maxQueryTimeout(maxQueryTimeout); - } - if (maxQueryCacheTimeout != null) { - clusterCfgBld.maxQueryCacheTimeout(maxQueryCacheTimeout); - } - ClusterConfig clusterCfg = new ClusterConfig(clusterCfgBld); - DocumentdbInfoConfig documentDbCfg = new DocumentdbInfoConfig(new DocumentdbInfoConfig.Builder(). - documentdb(new DocumentdbInfoConfig.Documentdb.Builder().name("type1"))); - LegacyEmulationConfig emulationCfg = new LegacyEmulationConfig(new LegacyEmulationConfig.Builder()); - QrMonitorConfig monitorCfg = new QrMonitorConfig(new QrMonitorConfig.Builder()); - Statistics statistics = Statistics.nullImplementation; - Fs4Config fs4Cfg = new Fs4Config(new Fs4Config.Builder()); - FS4ResourcePool fs4ResourcePool = new FS4ResourcePool(fs4Cfg, new QrConfig(new QrConfig.Builder())); - ClusterSearcher searcher = new ClusterSearcher(id, qrsCfg, clusterCfg, documentDbCfg, emulationCfg, monitorCfg, - new DispatchConfig(new DispatchConfig.Builder()), - createClusterInfoConfig(), - statistics, fs4ResourcePool, new VipStatus()); - return searcher; + QrSearchersConfig.Builder qrSearchersConfig = new QrSearchersConfig.Builder(); + QrSearchersConfig.Searchcluster.Builder searchClusterConfig = + new QrSearchersConfig.Searchcluster.Builder().name("test-cluster"); + qrSearchersConfig.searchcluster(searchClusterConfig); + QrSearchersConfig.Searchcluster.Dispatcher.Builder dispatcherConfig = + new QrSearchersConfig.Searchcluster.Dispatcher.Builder(); + dispatcherConfig.host("localhost"); + dispatcherConfig.port(0); + searchClusterConfig.dispatcher(dispatcherConfig); + + ClusterConfig.Builder clusterConfig = new ClusterConfig.Builder().clusterName("test-cluster"); + if (maxQueryTimeout != null) + clusterConfig.maxQueryTimeout(maxQueryTimeout); + if (maxQueryCacheTimeout != null) + clusterConfig.maxQueryCacheTimeout(maxQueryCacheTimeout); + + DocumentdbInfoConfig.Builder documentDbConfig = new DocumentdbInfoConfig.Builder(); + documentDbConfig.documentdb(new DocumentdbInfoConfig.Documentdb.Builder().name("type1")); + + return new ClusterSearcher(new ComponentId("test-id"), + qrSearchersConfig.build(), + clusterConfig.build(), + documentDbConfig.build(), + new LegacyEmulationConfig.Builder().build(), + new QrMonitorConfig.Builder().build(), + new DispatchConfig.Builder().build(), + createClusterInfoConfig(), + Statistics.nullImplementation, + new FS4ResourcePool(new Fs4Config.Builder().build(), new QrConfig.Builder().build()), + new VipStatus()); } private static ClusterInfoConfig createClusterInfoConfig() { |