Merge pull request #11327 from vespa-engine/balder/fdispatch-is-really-gone-rebased

Balder/fdispatch is really gone rebased

15 files changed, 0 insertions, 552 deletions

diff --git a/config-model/src/test/cfg/admin/sdconfigs/partitions.cfg b/config-model/src/test/cfg/admin/sdconfigs/partitions.cfg
deleted file mode 100644
index 20bff56fe4a..00000000000
--- a/config-model/src/test/cfg/admin/sdconfigs/partitions.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-namespace=config
-partbits 8
diff --git a/config-model/src/test/cfg/search/compare/complex/search/cluster.music/tlds/tld.0/fdispatchrc.MODEL.cfg b/config-model/src/test/cfg/search/compare/complex/search/cluster.music/tlds/tld.0/fdispatchrc.MODEL.cfg
deleted file mode 100644
index 34cf36e450e..00000000000
--- a/config-model/src/test/cfg/search/compare/complex/search/cluster.music/tlds/tld.0/fdispatchrc.MODEL.cfg
+++ /dev/null
@@ -1,22 +0,0 @@
-fnetlockwait 20.0
-defaultslowdocsumlimitbias 1.0
-defaultslowdocsumlimitfactor 2.0
-defaultslowquerylimitbias 1.0
-defaultslowquerylimitfactor 2.0
-frtport 19114
-healthport 19116
-indexswitchminsearchgrace 0.0
-indexswitchmindocsumgrace 0.0
-indexswitchmaxsearchgrace 0.0
-indexswitchmaxdocsumgrace 64.0
-maxsocksilent 50.0
-maxthreads 1000
-transportthreads 1
-partition 0
-ptport 19115
-transport ""
-transportnodelay true
-packetcompresslimit 1024
-packetcompresslevel 3
-packetcompresstype LZ4
-dispatchlevel 0
diff --git a/config-model/src/test/cfg/search/compare/complex/search/cluster.music/tlds/tld.0/partitions.MODEL.cfg b/config-model/src/test/cfg/search/compare/complex/search/cluster.music/tlds/tld.0/partitions.MODEL.cfg
deleted file mode 100644
index 03e722d0fa8..00000000000
--- a/config-model/src/test/cfg/search/compare/complex/search/cluster.music/tlds/tld.0/partitions.MODEL.cfg
+++ /dev/null
@@ -1,66 +0,0 @@
-dataset[].id 0
-dataset[].refcost 1
-dataset[].partbits 8
-dataset[].rowbits 1
-dataset[].numparts 2
-dataset[].firstpart 0
-dataset[].minpartitions 0
-dataset[].mpp 2
-dataset[].maxnodesdownperfixedrow 0
-dataset[].useroundrobinforfixedrow true
-dataset[].allowsearchonwarmupnodes true
-dataset[].beforewarmupdelay 600.0
-dataset[].engine[].name_and_port "tcp/zarya:19121"
-dataset[].engine[].partid 0
-dataset[].engine[].rowid 0
-dataset[].engine[].subdatasetid 0
-dataset[].engine[].refcost 1
-dataset[].engine[].overridepartids true
-dataset[].engine[].name_and_port "tcp/zarya:19127"
-dataset[].engine[].partid 0
-dataset[].engine[].rowid 1
-dataset[].engine[].subdatasetid 0
-dataset[].engine[].refcost 1
-dataset[].engine[].overridepartids true
-dataset[].engine[].name_and_port "tcp/zarya:19133"
-dataset[].engine[].partid 1
-dataset[].engine[].rowid 0
-dataset[].engine[].subdatasetid 0
-dataset[].engine[].refcost 1
-dataset[].engine[].overridepartids true
-dataset[].engine[].name_and_port "tcp/zarya:19139"
-dataset[].engine[].partid 1
-dataset[].engine[].rowid 1
-dataset[].engine[].subdatasetid 0
-dataset[].engine[].refcost 1
-dataset[].engine[].overridepartids true
-dataset[].maxhitspernode 2147483647
-dataset[].estparts 0
-dataset[].estpartcutoff 0
-dataset[].minactive 500
-dataset[].maxactive 500
-dataset[].cutoffactive 1000
-dataset[].minestactive 500
-dataset[].maxestactive 1000
-dataset[].cutoffestactive 1000
-dataset[].queuedrainrate 400.0
-dataset[].queuedrainmax 40.0
-dataset[].slowquerylimitfactor 0.0
-dataset[].slowquerylimitbias 100.0
-dataset[].slowdocsumlimitfactor 0.0
-dataset[].slowdocsumlimitbias 100.0
-dataset[].monitorinterval 1.0
-dataset[].higher_coverage_maxsearchwait 1.0
-dataset[].higher_coverage_minsearchwait 0.0
-dataset[].higher_coverage_basesearchwait 0.1
-dataset[].minimal_searchcoverage 100.0
-dataset[].higher_coverage_maxdocsumwait 0.3
-dataset[].higher_coverage_mindocsumwait 0.1
-dataset[].higher_coverage_basedocsumwait 0.1
-dataset[].minimal_docsumcoverage 100.0
-dataset[].querydistribution AUTOMATIC
-dataset[].min_group_coverage 100.0
-dataset[].min_activedocs_coverage 97.0
-dataset[].latency_decay_rate 10000.0
-dataset[].querydistributionsamplesize 10000
-dataset[].querydistributionconfidenceinterval 99.9
diff --git a/config-model/src/test/cfg/search/compare/complex/search/cluster.music/tlds/tld.1/fdispatchrc.MODEL.cfg b/config-model/src/test/cfg/search/compare/complex/search/cluster.music/tlds/tld.1/fdispatchrc.MODEL.cfg
deleted file mode 100644
index d11651139fa..00000000000
--- a/config-model/src/test/cfg/search/compare/complex/search/cluster.music/tlds/tld.1/fdispatchrc.MODEL.cfg
+++ /dev/null
@@ -1,22 +0,0 @@
-fnetlockwait 20.0
-defaultslowdocsumlimitbias 1.0
-defaultslowdocsumlimitfactor 2.0
-defaultslowquerylimitbias 1.0
-defaultslowquerylimitfactor 2.0
-frtport 19117
-healthport 19119
-indexswitchminsearchgrace 0.0
-indexswitchmindocsumgrace 0.0
-indexswitchmaxsearchgrace 0.0
-indexswitchmaxdocsumgrace 64.0
-maxsocksilent 50.0
-maxthreads 1000
-transportthreads 1
-partition 0
-ptport 19118
-transport ""
-transportnodelay true
-packetcompresslimit 1024
-packetcompresslevel 3
-packetcompresstype LZ4
-dispatchlevel 0
diff --git a/config-model/src/test/cfg/search/compare/complex/search/cluster.music/tlds/tld.1/partitions.MODEL.cfg b/config-model/src/test/cfg/search/compare/complex/search/cluster.music/tlds/tld.1/partitions.MODEL.cfg
deleted file mode 100644
index 03e722d0fa8..00000000000
--- a/config-model/src/test/cfg/search/compare/complex/search/cluster.music/tlds/tld.1/partitions.MODEL.cfg
+++ /dev/null
@@ -1,66 +0,0 @@
-dataset[].id 0
-dataset[].refcost 1
-dataset[].partbits 8
-dataset[].rowbits 1
-dataset[].numparts 2
-dataset[].firstpart 0
-dataset[].minpartitions 0
-dataset[].mpp 2
-dataset[].maxnodesdownperfixedrow 0
-dataset[].useroundrobinforfixedrow true
-dataset[].allowsearchonwarmupnodes true
-dataset[].beforewarmupdelay 600.0
-dataset[].engine[].name_and_port "tcp/zarya:19121"
-dataset[].engine[].partid 0
-dataset[].engine[].rowid 0
-dataset[].engine[].subdatasetid 0
-dataset[].engine[].refcost 1
-dataset[].engine[].overridepartids true
-dataset[].engine[].name_and_port "tcp/zarya:19127"
-dataset[].engine[].partid 0
-dataset[].engine[].rowid 1
-dataset[].engine[].subdatasetid 0
-dataset[].engine[].refcost 1
-dataset[].engine[].overridepartids true
-dataset[].engine[].name_and_port "tcp/zarya:19133"
-dataset[].engine[].partid 1
-dataset[].engine[].rowid 0
-dataset[].engine[].subdatasetid 0
-dataset[].engine[].refcost 1
-dataset[].engine[].overridepartids true
-dataset[].engine[].name_and_port "tcp/zarya:19139"
-dataset[].engine[].partid 1
-dataset[].engine[].rowid 1
-dataset[].engine[].subdatasetid 0
-dataset[].engine[].refcost 1
-dataset[].engine[].overridepartids true
-dataset[].maxhitspernode 2147483647
-dataset[].estparts 0
-dataset[].estpartcutoff 0
-dataset[].minactive 500
-dataset[].maxactive 500
-dataset[].cutoffactive 1000
-dataset[].minestactive 500
-dataset[].maxestactive 1000
-dataset[].cutoffestactive 1000
-dataset[].queuedrainrate 400.0
-dataset[].queuedrainmax 40.0
-dataset[].slowquerylimitfactor 0.0
-dataset[].slowquerylimitbias 100.0
-dataset[].slowdocsumlimitfactor 0.0
-dataset[].slowdocsumlimitbias 100.0
-dataset[].monitorinterval 1.0
-dataset[].higher_coverage_maxsearchwait 1.0
-dataset[].higher_coverage_minsearchwait 0.0
-dataset[].higher_coverage_basesearchwait 0.1
-dataset[].minimal_searchcoverage 100.0
-dataset[].higher_coverage_maxdocsumwait 0.3
-dataset[].higher_coverage_mindocsumwait 0.1
-dataset[].higher_coverage_basedocsumwait 0.1
-dataset[].minimal_docsumcoverage 100.0
-dataset[].querydistribution AUTOMATIC
-dataset[].min_group_coverage 100.0
-dataset[].min_activedocs_coverage 97.0
-dataset[].latency_decay_rate 10000.0
-dataset[].querydistributionsamplesize 10000
-dataset[].querydistributionconfidenceinterval 99.9
diff --git a/config-model/src/test/cfg/search/compare/complex/search/cluster.rt/tlds/tld.0/fdispatchrc.MODEL.cfg b/config-model/src/test/cfg/search/compare/complex/search/cluster.rt/tlds/tld.0/fdispatchrc.MODEL.cfg
deleted file mode 100644
index 2d3ea040969..00000000000
--- a/config-model/src/test/cfg/search/compare/complex/search/cluster.rt/tlds/tld.0/fdispatchrc.MODEL.cfg
+++ /dev/null
@@ -1,22 +0,0 @@
-fnetlockwait 20.0
-defaultslowdocsumlimitbias 1.0
-defaultslowdocsumlimitfactor 2.0
-defaultslowquerylimitbias 1.0
-defaultslowquerylimitfactor 2.0
-frtport 19148
-healthport 19150
-indexswitchminsearchgrace 0.0
-indexswitchmindocsumgrace 0.0
-indexswitchmaxsearchgrace 0.0
-indexswitchmaxdocsumgrace 64.0
-maxsocksilent 50.0
-maxthreads 1000
-transportthreads 1
-partition 0
-ptport 19149
-transport ""
-transportnodelay true
-packetcompresslimit 1024
-packetcompresslevel 3
-packetcompresstype LZ4
-dispatchlevel 0
diff --git a/config-model/src/test/cfg/search/compare/complex/search/cluster.rt/tlds/tld.0/partitions.MODEL.cfg b/config-model/src/test/cfg/search/compare/complex/search/cluster.rt/tlds/tld.0/partitions.MODEL.cfg
deleted file mode 100644
index f3178216f39..00000000000
--- a/config-model/src/test/cfg/search/compare/complex/search/cluster.rt/tlds/tld.0/partitions.MODEL.cfg
+++ /dev/null
@@ -1,66 +0,0 @@
-dataset[].id 0
-dataset[].refcost 1
-dataset[].partbits 8
-dataset[].rowbits 1
-dataset[].numparts 2
-dataset[].firstpart 0
-dataset[].minpartitions 0
-dataset[].mpp 1
-dataset[].maxnodesdownperfixedrow 0
-dataset[].useroundrobinforfixedrow true
-dataset[].allowsearchonwarmupnodes true
-dataset[].beforewarmupdelay 600.0
-dataset[].engine[].name_and_port "tcp/zarya:19152"
-dataset[].engine[].partid 0
-dataset[].engine[].rowid 0
-dataset[].engine[].subdatasetid 0
-dataset[].engine[].refcost 1
-dataset[].engine[].overridepartids true
-dataset[].engine[].name_and_port "tcp/dev-mathiasm:19101"
-dataset[].engine[].partid 0
-dataset[].engine[].rowid 1
-dataset[].engine[].subdatasetid 0
-dataset[].engine[].refcost 1
-dataset[].engine[].overridepartids true
-dataset[].engine[].name_and_port "tcp/dev-mathiasm:19107"
-dataset[].engine[].partid 1
-dataset[].engine[].rowid 0
-dataset[].engine[].subdatasetid 0
-dataset[].engine[].refcost 1
-dataset[].engine[].overridepartids true
-dataset[].engine[].name_and_port "tcp/zarya:19158"
-dataset[].engine[].partid 1
-dataset[].engine[].rowid 1
-dataset[].engine[].subdatasetid 0
-dataset[].engine[].refcost 1
-dataset[].engine[].overridepartids true
-dataset[].maxhitspernode 2147483647
-dataset[].estparts 0
-dataset[].estpartcutoff 0
-dataset[].minactive 500
-dataset[].maxactive 500
-dataset[].cutoffactive 1000
-dataset[].minestactive 500
-dataset[].maxestactive 1000
-dataset[].cutoffestactive 1000
-dataset[].queuedrainrate 400.0
-dataset[].queuedrainmax 40.0
-dataset[].slowquerylimitfactor 0.0
-dataset[].slowquerylimitbias 100.0
-dataset[].slowdocsumlimitfactor 0.0
-dataset[].slowdocsumlimitbias 100.0
-dataset[].monitorinterval 1.0
-dataset[].higher_coverage_maxsearchwait 1.0
-dataset[].higher_coverage_minsearchwait 0.0
-dataset[].higher_coverage_basesearchwait 0.1
-dataset[].minimal_searchcoverage 100.0
-dataset[].higher_coverage_maxdocsumwait 0.3
-dataset[].higher_coverage_mindocsumwait 0.1
-dataset[].higher_coverage_basedocsumwait 0.1
-dataset[].minimal_docsumcoverage 100.0
-dataset[].querydistribution AUTOMATIC
-dataset[].min_group_coverage 100.0
-dataset[].min_activedocs_coverage 97.0
-dataset[].latency_decay_rate 10000.0
-dataset[].querydistributionsamplesize 10000
-dataset[].querydistributionconfidenceinterval 99.9
diff --git a/config-model/src/test/cfg/search/compare/optionals/search/cluster.music/tlds/tld.0/fdispatchrc.MODEL.cfg b/config-model/src/test/cfg/search/compare/optionals/search/cluster.music/tlds/tld.0/fdispatchrc.MODEL.cfg
deleted file mode 100644
index d11651139fa..00000000000
--- a/config-model/src/test/cfg/search/compare/optionals/search/cluster.music/tlds/tld.0/fdispatchrc.MODEL.cfg
+++ /dev/null
@@ -1,22 +0,0 @@
-fnetlockwait 20.0
-defaultslowdocsumlimitbias 1.0
-defaultslowdocsumlimitfactor 2.0
-defaultslowquerylimitbias 1.0
-defaultslowquerylimitfactor 2.0
-frtport 19117
-healthport 19119
-indexswitchminsearchgrace 0.0
-indexswitchmindocsumgrace 0.0
-indexswitchmaxsearchgrace 0.0
-indexswitchmaxdocsumgrace 64.0
-maxsocksilent 50.0
-maxthreads 1000
-transportthreads 1
-partition 0
-ptport 19118
-transport ""
-transportnodelay true
-packetcompresslimit 1024
-packetcompresslevel 3
-packetcompresstype LZ4
-dispatchlevel 0
diff --git a/config-model/src/test/cfg/search/compare/optionals/search/cluster.music/tlds/tld.0/partitions.MODEL.cfg b/config-model/src/test/cfg/search/compare/optionals/search/cluster.music/tlds/tld.0/partitions.MODEL.cfg
deleted file mode 100644
index efdd78cbbe1..00000000000
--- a/config-model/src/test/cfg/search/compare/optionals/search/cluster.music/tlds/tld.0/partitions.MODEL.cfg
+++ /dev/null
@@ -1,48 +0,0 @@
-dataset[].id 0
-dataset[].refcost 1
-dataset[].partbits 8
-dataset[].rowbits 0
-dataset[].numparts 1
-dataset[].firstpart 0
-dataset[].minpartitions 0
-dataset[].mpp 1
-dataset[].maxnodesdownperfixedrow 0
-dataset[].useroundrobinforfixedrow true
-dataset[].allowsearchonwarmupnodes true
-dataset[].beforewarmupdelay 600.0
-dataset[].engine[].name_and_port "tcp/zarya:19121"
-dataset[].engine[].partid 0
-dataset[].engine[].rowid 0
-dataset[].engine[].subdatasetid 0
-dataset[].engine[].refcost 1
-dataset[].engine[].overridepartids true
-dataset[].maxhitspernode 2147483647
-dataset[].estparts 0
-dataset[].estpartcutoff 0
-dataset[].minactive 500
-dataset[].maxactive 500
-dataset[].cutoffactive 1000
-dataset[].minestactive 500
-dataset[].maxestactive 1000
-dataset[].cutoffestactive 1000
-dataset[].queuedrainrate 400.0
-dataset[].queuedrainmax 40.0
-dataset[].slowquerylimitfactor 0.0
-dataset[].slowquerylimitbias 100.0
-dataset[].slowdocsumlimitfactor 0.0
-dataset[].slowdocsumlimitbias 100.0
-dataset[].monitorinterval 1.0
-dataset[].higher_coverage_maxsearchwait 1.0
-dataset[].higher_coverage_minsearchwait 0.0
-dataset[].higher_coverage_basesearchwait 0.1
-dataset[].minimal_searchcoverage 100.0
-dataset[].higher_coverage_maxdocsumwait 0.3
-dataset[].higher_coverage_mindocsumwait 0.1
-dataset[].higher_coverage_basedocsumwait 0.1
-dataset[].minimal_docsumcoverage 100.0
-dataset[].querydistribution AUTOMATIC
-dataset[].min_group_coverage 100.0
-dataset[].min_activedocs_coverage 97.0
-dataset[].latency_decay_rate 10000.0
-dataset[].querydistributionsamplesize 10000
-dataset[].querydistributionconfidenceinterval 99.9
diff --git a/config-model/src/test/cfg/search/compare/simple/search/cluster.music/tlds/tld.0/fdispatchrc.MODEL.cfg b/config-model/src/test/cfg/search/compare/simple/search/cluster.music/tlds/tld.0/fdispatchrc.MODEL.cfg
deleted file mode 100644
index 9ddce0a52a9..00000000000
--- a/config-model/src/test/cfg/search/compare/simple/search/cluster.music/tlds/tld.0/fdispatchrc.MODEL.cfg
+++ /dev/null
@@ -1,22 +0,0 @@
-fnetlockwait 20.0
-defaultslowdocsumlimitbias 1.0
-defaultslowdocsumlimitfactor 2.0
-defaultslowquerylimitbias 1.0
-defaultslowquerylimitfactor 2.0
-frtport 19110
-healthport 19112
-indexswitchminsearchgrace 0.0
-indexswitchmindocsumgrace 0.0
-indexswitchmaxsearchgrace 0.0
-indexswitchmaxdocsumgrace 64.0
-maxsocksilent 50.0
-maxthreads 1000
-transportthreads 1
-partition 0
-ptport 19111
-transport ""
-transportnodelay true
-packetcompresslimit 1024
-packetcompresslevel 3
-packetcompresstype LZ4
-dispatchlevel 0
diff --git a/config-model/src/test/cfg/search/compare/simple/search/cluster.music/tlds/tld.0/partitions.MODEL.cfg b/config-model/src/test/cfg/search/compare/simple/search/cluster.music/tlds/tld.0/partitions.MODEL.cfg
deleted file mode 100644
index 38588fc0a1b..00000000000
--- a/config-model/src/test/cfg/search/compare/simple/search/cluster.music/tlds/tld.0/partitions.MODEL.cfg
+++ /dev/null
@@ -1,48 +0,0 @@
-dataset[].id 0
-dataset[].refcost 1
-dataset[].partbits 8
-dataset[].rowbits 0
-dataset[].numparts 1
-dataset[].firstpart 0
-dataset[].minpartitions 0
-dataset[].mpp 1
-dataset[].maxnodesdownperfixedrow 0
-dataset[].useroundrobinforfixedrow true
-dataset[].allowsearchonwarmupnodes true
-dataset[].beforewarmupdelay 600.0
-dataset[].engine[].name_and_port "tcp/zarya:19114"
-dataset[].engine[].partid 0
-dataset[].engine[].rowid 0
-dataset[].engine[].subdatasetid 0
-dataset[].engine[].refcost 1
-dataset[].engine[].overridepartids true
-dataset[].maxhitspernode 2147483647
-dataset[].estparts 0
-dataset[].estpartcutoff 0
-dataset[].minactive 500
-dataset[].maxactive 500
-dataset[].cutoffactive 1000
-dataset[].minestactive 500
-dataset[].maxestactive 1000
-dataset[].cutoffestactive 1000
-dataset[].queuedrainrate 400.0
-dataset[].queuedrainmax 40.0
-dataset[].slowquerylimitfactor 0.0
-dataset[].slowquerylimitbias 100.0
-dataset[].slowdocsumlimitfactor 0.0
-dataset[].slowdocsumlimitbias 100.0
-dataset[].monitorinterval 1.0
-dataset[].higher_coverage_maxsearchwait 1.0
-dataset[].higher_coverage_minsearchwait 0.0
-dataset[].higher_coverage_basesearchwait 0.1
-dataset[].minimal_searchcoverage 100.0
-dataset[].higher_coverage_maxdocsumwait 0.3
-dataset[].higher_coverage_mindocsumwait 0.1
-dataset[].higher_coverage_basedocsumwait 0.1
-dataset[].minimal_docsumcoverage 100.0
-dataset[].querydistribution AUTOMATIC
-dataset[].min_group_coverage 100.0
-dataset[].min_activedocs_coverage 97.0
-dataset[].latency_decay_rate 10000.0
-dataset[].querydistributionsamplesize 10000
-dataset[].querydistributionconfidenceinterval 99.9
diff --git a/config-model/src/test/cfg/search/compare/twoFeedTargetClusters/search/cluster.music1/tlds/tld.0/fdispatchrc.MODEL.cfg b/config-model/src/test/cfg/search/compare/twoFeedTargetClusters/search/cluster.music1/tlds/tld.0/fdispatchrc.MODEL.cfg
deleted file mode 100644
index d5ab3679c99..00000000000
--- a/config-model/src/test/cfg/search/compare/twoFeedTargetClusters/search/cluster.music1/tlds/tld.0/fdispatchrc.MODEL.cfg
+++ /dev/null
@@ -1,22 +0,0 @@
-fnetlockwait 20.0
-defaultslowdocsumlimitbias 1.0
-defaultslowdocsumlimitfactor 2.0
-defaultslowquerylimitbias 1.0
-defaultslowquerylimitfactor 2.0
-frtport 19107
-healthport 19109
-indexswitchminsearchgrace 0.0
-indexswitchmindocsumgrace 0.0
-indexswitchmaxsearchgrace 0.0
-indexswitchmaxdocsumgrace 64.0
-maxsocksilent 50.0
-maxthreads 1000
-transportthreads 1
-partition 0
-ptport 19108
-transport ""
-transportnodelay true
-packetcompresslimit 1024
-packetcompresslevel 3
-packetcompresstype LZ4
-dispatchlevel 0
diff --git a/config-model/src/test/cfg/search/compare/twoFeedTargetClusters/search/cluster.music1/tlds/tld.0/partitions.MODEL.cfg b/config-model/src/test/cfg/search/compare/twoFeedTargetClusters/search/cluster.music1/tlds/tld.0/partitions.MODEL.cfg
deleted file mode 100644
index f0891513e5c..00000000000
--- a/config-model/src/test/cfg/search/compare/twoFeedTargetClusters/search/cluster.music1/tlds/tld.0/partitions.MODEL.cfg
+++ /dev/null
@@ -1,48 +0,0 @@
-dataset[].id 0
-dataset[].refcost 1
-dataset[].partbits 8
-dataset[].rowbits 0
-dataset[].numparts 1
-dataset[].firstpart 0
-dataset[].minpartitions 0
-dataset[].mpp 1
-dataset[].maxnodesdownperfixedrow 0
-dataset[].useroundrobinforfixedrow true
-dataset[].allowsearchonwarmupnodes true
-dataset[].beforewarmupdelay 600.0
-dataset[].engine[].name_and_port "tcp/zarya:19111"
-dataset[].engine[].partid 0
-dataset[].engine[].rowid 0
-dataset[].engine[].subdatasetid 0
-dataset[].engine[].refcost 1
-dataset[].engine[].overridepartids true
-dataset[].maxhitspernode 2147483647
-dataset[].estparts 0
-dataset[].estpartcutoff 0
-dataset[].minactive 500
-dataset[].maxactive 500
-dataset[].cutoffactive 1000
-dataset[].minestactive 500
-dataset[].maxestactive 1000
-dataset[].cutoffestactive 1000
-dataset[].queuedrainrate 400.0
-dataset[].queuedrainmax 40.0
-dataset[].slowquerylimitfactor 0.0
-dataset[].slowquerylimitbias 100.0
-dataset[].slowdocsumlimitfactor 0.0
-dataset[].slowdocsumlimitbias 100.0
-dataset[].monitorinterval 1.0
-dataset[].higher_coverage_maxsearchwait 1.0
-dataset[].higher_coverage_minsearchwait 0.0
-dataset[].higher_coverage_basesearchwait 0.1
-dataset[].minimal_searchcoverage 100.0
-dataset[].higher_coverage_maxdocsumwait 0.3
-dataset[].higher_coverage_mindocsumwait 0.1
-dataset[].higher_coverage_basedocsumwait 0.1
-dataset[].minimal_docsumcoverage 100.0
-dataset[].querydistribution AUTOMATIC
-dataset[].min_group_coverage 100.0
-dataset[].min_activedocs_coverage 97.0
-dataset[].latency_decay_rate 10000.0
-dataset[].querydistributionsamplesize 10000
-dataset[].querydistributionconfidenceinterval 99.9
diff --git a/config-model/src/test/cfg/search/compare/twoFeedTargetClusters/search/cluster.music2/tlds/tld.0/fdispatchrc.MODEL.cfg b/config-model/src/test/cfg/search/compare/twoFeedTargetClusters/search/cluster.music2/tlds/tld.0/fdispatchrc.MODEL.cfg
deleted file mode 100644
index 487310efd77..00000000000
--- a/config-model/src/test/cfg/search/compare/twoFeedTargetClusters/search/cluster.music2/tlds/tld.0/fdispatchrc.MODEL.cfg
+++ /dev/null
@@ -1,22 +0,0 @@
-fnetlockwait 20.0
-defaultslowdocsumlimitbias 1.0
-defaultslowdocsumlimitfactor 2.0
-defaultslowquerylimitbias 1.0
-defaultslowquerylimitfactor 2.0
-frtport 19118
-healthport 19120
-indexswitchminsearchgrace 0.0
-indexswitchmindocsumgrace 0.0
-indexswitchmaxsearchgrace 0.0
-indexswitchmaxdocsumgrace 64.0
-maxsocksilent 50.0
-maxthreads 1000
-transportthreads 1
-partition 0
-ptport 19119
-transport ""
-transportnodelay true
-packetcompresslimit 1024
-packetcompresslevel 3
-packetcompresstype LZ4
-dispatchlevel 0
diff --git a/config-model/src/test/cfg/search/compare/twoFeedTargetClusters/search/cluster.music2/tlds/tld.0/partitions.MODEL.cfg b/config-model/src/test/cfg/search/compare/twoFeedTargetClusters/search/cluster.music2/tlds/tld.0/partitions.MODEL.cfg
deleted file mode 100644
index b70e743f4bf..00000000000
--- a/config-model/src/test/cfg/search/compare/twoFeedTargetClusters/search/cluster.music2/tlds/tld.0/partitions.MODEL.cfg
+++ /dev/null
@@ -1,54 +0,0 @@
-dataset[].id 0
-dataset[].refcost 1
-dataset[].partbits 8
-dataset[].rowbits 1
-dataset[].numparts 1
-dataset[].firstpart 0
-dataset[].minpartitions 0
-dataset[].mpp 1
-dataset[].maxnodesdownperfixedrow 0
-dataset[].useroundrobinforfixedrow true
-dataset[].allowsearchonwarmupnodes true
-dataset[].beforewarmupdelay 600.0
-dataset[].engine[].name_and_port "tcp/zarya:19122"
-dataset[].engine[].partid 0
-dataset[].engine[].rowid 0
-dataset[].engine[].subdatasetid 0
-dataset[].engine[].refcost 1
-dataset[].engine[].overridepartids true
-dataset[].engine[].name_and_port "tcp/zarya:19128"
-dataset[].engine[].partid 0
-dataset[].engine[].rowid 1
-dataset[].engine[].subdatasetid 0
-dataset[].engine[].refcost 1
-dataset[].engine[].overridepartids true
-dataset[].maxhitspernode 2147483647
-dataset[].estparts 0
-dataset[].estpartcutoff 0
-dataset[].minactive 500
-dataset[].maxactive 500
-dataset[].cutoffactive 1000
-dataset[].minestactive 500
-dataset[].maxestactive 1000
-dataset[].cutoffestactive 1000
-dataset[].queuedrainrate 400.0
-dataset[].queuedrainmax 40.0
-dataset[].slowquerylimitfactor 0.0
-dataset[].slowquerylimitbias 100.0
-dataset[].slowdocsumlimitfactor 0.0
-dataset[].slowdocsumlimitbias 100.0
-dataset[].monitorinterval 1.0
-dataset[].higher_coverage_maxsearchwait 1.0
-dataset[].higher_coverage_minsearchwait 0.0
-dataset[].higher_coverage_basesearchwait 0.1
-dataset[].minimal_searchcoverage 100.0
-dataset[].higher_coverage_maxdocsumwait 0.3
-dataset[].higher_coverage_mindocsumwait 0.1
-dataset[].higher_coverage_basedocsumwait 0.1
-dataset[].minimal_docsumcoverage 100.0
-dataset[].querydistribution AUTOMATIC
-dataset[].min_group_coverage 100.0
-dataset[].min_activedocs_coverage 97.0
-dataset[].latency_decay_rate 10000.0
-dataset[].querydistributionsamplesize 10000
-dataset[].querydistributionconfidenceinterval 99.9