diff options
58 files changed, 203 insertions, 1995 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 diff --git a/configserver/src/test/apps/zkfeed/configs/fdispatchrc.cfg b/configserver/src/test/apps/zkfeed/configs/fdispatchrc.cfg deleted file mode 100644 index 257cc5642cb..00000000000 --- a/configserver/src/test/apps/zkfeed/configs/fdispatchrc.cfg +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/container-search/src/main/java/com/yahoo/prelude/query/NonReducibleCompositeItem.java b/container-search/src/main/java/com/yahoo/prelude/query/NonReducibleCompositeItem.java index 97d724953ea..3e49df85333 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/NonReducibleCompositeItem.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/NonReducibleCompositeItem.java @@ -14,8 +14,10 @@ import java.util.Optional; * @author bratseth */ public abstract class NonReducibleCompositeItem extends CompositeItem { + @Override public Optional<Item> extractSingleChild() { return Optional.empty(); } + } diff --git a/container-search/src/main/java/com/yahoo/prelude/query/SameElementItem.java b/container-search/src/main/java/com/yahoo/prelude/query/SameElementItem.java index 4a13d24d953..ac4e8b98b03 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/SameElementItem.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/SameElementItem.java @@ -1,7 +1,6 @@ // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.query; -import com.google.common.annotations.Beta; import com.yahoo.protect.Validator; import java.nio.ByteBuffer; @@ -15,7 +14,6 @@ import java.util.Optional; * * @author baldersheim */ -@Beta public class SameElementItem extends NonReducibleCompositeItem { private final String fieldName; diff --git a/fbench/README b/fbench/README index 5d9ee714a32..8d217ad0dc5 100644 --- a/fbench/README +++ b/fbench/README @@ -127,23 +127,7 @@ mark optional parameters and default values): | <port> : the port to use when contacting the host. The only mandatory parameters are the hostname and the port of the -server you want to benchmark. If you are measuring server performance, -you should ensure that the caches are cleared between each run. This -may be done either by stopping and starting fsearch and fdispatch or -by using the geturl program to fetch '/admin?command=clear_caches' -from the http port on each fsearch and fdispatch (this requires that -you are running from a host that is known as privileged by the -fastserver nodes or that fastserver was compiled to accept all hosts -as privileged). - -| usage: geturl <host> <port> <url> - -You may clear the caches by doing: - -$ bin/geturl <host> <port> "/admin?command=clear_caches" - -This must be done for each fsearch and fdispatch http port to clear -all caches. +server you want to benchmark. Example: You want to test just how well fastserver does under massive preassure by letting 200 clients search continuously as fast as they @@ -318,8 +302,7 @@ on. (vespa-fbench is run as 'bin/vespa-fbench' etc.). Example: You want to see how well fastserver performs with varying client count and cycle time. Assume that you have already prepared 200 -query files and that you have edited the 'pretest.sh' script to make -it clear all fsearch and fdispatch caches. To test with client count +query files. To test with client count from 10 to 200 with intervals of 10 clients and cycle time from 0 to 5000 milliseconds with 500 ms intervals you may do the following: diff --git a/fbench/util/pretest.sh b/fbench/util/pretest.sh index 315a8019987..756a72e7c5f 100755 --- a/fbench/util/pretest.sh +++ b/fbench/util/pretest.sh @@ -3,21 +3,8 @@ # # This script will be run by the 'runtests.sh' script before -# each individual test run. It will typically use the 'geturl' -# program to clear the fsearch and fdispatch caches. -# +# each individual test run. # do not produce any output, log error messages to 'pretest.err' exec > /dev/null 2>>pretest.err -# -# Clear fsearch and fdispatch caches. hostX and portX should be -# replaced with real host names and port numbers referring to the http -# daemons of the fsearch and fdispatch programs you are benchmarking. -# -#bin/geturl host1 port1 "/admin?command=clear_caches" -#bin/geturl host2 port2 "/admin?command=clear_caches" -#bin/geturl host3 port3 "/admin?command=clear_caches" -#bin/geturl host4 port4 "/admin?command=clear_caches" -#bin/geturl host5 port5 "/admin?command=clear_caches" -#... diff --git a/functions.cmake b/functions.cmake index a049276d845..3212ea04a65 100644 --- a/functions.cmake +++ b/functions.cmake @@ -550,8 +550,7 @@ function(install_java_artifact NAME) endfunction() function(install_java_artifact_dependencies NAME) - install(DIRECTORY "target/dependency/" DESTINATION lib/jars/${NAME} FILES_MATCHING PATTERN "*.jar") - install(CODE "execute_process(COMMAND bash -c \"cd \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/lib/jars && if [ -d ${NAME} ]; then ln -sf ${NAME}/*.jar . ; fi\")") + install(DIRECTORY "target/dependency/" DESTINATION lib/jars FILES_MATCHING PATTERN "*.jar") endfunction() function(install_fat_java_artifact NAME) diff --git a/jdisc-security-filters/CMakeLists.txt b/jdisc-security-filters/CMakeLists.txt index 1c6e067f974..9c5b35941bb 100644 --- a/jdisc-security-filters/CMakeLists.txt +++ b/jdisc-security-filters/CMakeLists.txt @@ -1,5 +1,4 @@ # Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. install_fat_java_artifact(jdisc-security-filters) -install_java_artifact_dependencies(jdisc-security-filters) install_config_definition(src/main/resources/configdefinitions/cors-filter.def) diff --git a/juniper/doc/written/fsearchparams.html b/juniper/doc/written/fsearchparams.html index 790d064480c..d27e4e66de8 100644 --- a/juniper/doc/written/fsearchparams.html +++ b/juniper/doc/written/fsearchparams.html @@ -445,17 +445,6 @@ variables such as <p> in the relevant rc file. -Note that for a Data Search installation, the QR server has -the responsibility of providing dynamic teasers, consequently the -<tt>etc/qrserver/qrserverrc</tt> file should provide the above -configuration. -<p> -For a similar Web Search configuration, using a "bare-bone" top level -fdispatch instance, the <tt>fdispatchrc</tt> file is the appropriate place. -<p> -For a "standalone" Real-Time Search setup, the appropriate configuration -file(s) is the fdispatch.addon file(s). - <h2>How to report bugs/errors related to Juniper</h2> Errors/problems related to Juniper can be divided into two categories: <ol> diff --git a/logserver/src/test/files/value-events.txt b/logserver/src/test/files/value-events.txt index 20143d9cd53..d08452ecff9 100644 --- a/logserver/src/test/files/value-events.txt +++ b/logserver/src/test/files/value-events.txt @@ -12,8 +12,6 @@ 1107248439.235871 example.yahoo.com 28555 vsm fsearch.queryperf event value/1 name="active" value=0 1107248439.236632 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107248439.236684 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107248439.345800 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107248439.345924 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="active" value=0 1107248454.346566 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107248454.346701 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107248454.346755 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -24,16 +22,12 @@ 1107248499.377855 example.yahoo.com 28555 vsm fsearch.queryperf event value/1 name="active" value=0 1107248499.378618 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107248499.378670 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107248499.379345 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107248499.379407 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="active" value=0 1107248515.068667 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107248515.068795 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107248515.068848 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numbytes" value=0 1107248545.429750 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107248545.429879 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107248545.429933 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numbytes" value=0 -1107248559.509728 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107248559.509849 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="active" value=0 1107248559.510318 example.yahoo.com 28555 vsm fsearch.queryperf event value/1 name="queued" value=0 1107248559.510382 example.yahoo.com 28555 vsm fsearch.queryperf event value/1 name="active" value=0 1107248559.511135 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 @@ -44,8 +38,6 @@ 1107248606.151589 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107248606.151717 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107248606.151769 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numbytes" value=0 -1107248619.601700 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107248619.601824 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="active" value=0 1107248619.602250 example.yahoo.com 28555 vsm fsearch.queryperf event value/1 name="queued" value=0 1107248619.602314 example.yahoo.com 28555 vsm fsearch.queryperf event value/1 name="active" value=0 1107248619.603067 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 @@ -56,8 +48,6 @@ 1107248666.873517 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107248666.873740 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107248666.873796 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numbytes" value=0 -1107248679.703659 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107248679.703779 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="active" value=0 1107248679.704182 example.yahoo.com 28555 vsm fsearch.queryperf event value/1 name="queued" value=0 1107248679.704244 example.yahoo.com 28555 vsm fsearch.queryperf event value/1 name="active" value=0 1107248679.704995 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 @@ -72,8 +62,6 @@ 1107248739.755880 example.yahoo.com 28555 vsm fsearch.queryperf event value/1 name="active" value=0 1107248739.756771 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107248739.756824 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107248739.865626 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107248739.865746 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="active" value=0 1107248757.956408 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107248757.956542 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107248757.956595 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -84,8 +72,6 @@ 1107248799.887747 example.yahoo.com 28555 vsm fsearch.queryperf event value/1 name="active" value=0 1107248799.888510 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107248799.888563 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107248799.888865 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107248799.889013 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="active" value=0 1107248818.678404 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107248818.678542 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107248818.678607 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -96,8 +82,6 @@ 1107248859.959735 example.yahoo.com 28555 vsm fsearch.queryperf event value/1 name="active" value=0 1107248859.960498 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107248859.960550 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107248860.069650 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107248860.069875 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="active" value=0 1107248879.400552 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107248879.400678 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107248879.400732 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -108,8 +92,6 @@ 1107248920.061705 example.yahoo.com 28555 vsm fsearch.queryperf event value/1 name="active" value=0 1107248920.062472 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107248920.062525 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107248920.171575 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107248920.171695 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="active" value=0 1107248940.122556 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107248940.122697 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107248940.122751 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -120,8 +102,6 @@ 1107248980.223719 example.yahoo.com 28555 vsm fsearch.queryperf event value/1 name="active" value=0 1107248980.224483 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107248980.224536 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107248980.225291 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107248980.225386 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="active" value=0 1107249000.844582 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107249000.844711 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107249000.844765 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -132,8 +112,6 @@ 1107249040.295643 example.yahoo.com 28555 vsm fsearch.queryperf event value/1 name="active" value=0 1107249040.296405 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107249040.296457 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107249040.297130 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107249040.297192 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="active" value=0 1107249061.566458 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107249061.566586 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107249061.566640 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -144,8 +122,6 @@ 1107249100.327593 example.yahoo.com 28555 vsm fsearch.queryperf event value/1 name="active" value=0 1107249100.328494 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107249100.328547 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107249100.457718 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107249100.457824 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="active" value=0 1107249122.288543 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107249122.288671 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107249122.288724 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -153,9 +129,7 @@ 1107249152.649816 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107249152.649869 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numbytes" value=0 1107249160.509467 example.yahoo.com 28555 vsm fsearch.queryperf event value/1 name="queued" value=0 -1107249160.509544 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="queued" value=0 1107249160.509615 example.yahoo.com 28555 vsm fsearch.queryperf event value/1 name="active" value=0 -1107249160.509708 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="active" value=0 1107249160.510802 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107249160.510855 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 1107249183.011765 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numcollections" value=0 @@ -168,8 +142,6 @@ 1107249220.551563 example.yahoo.com 28555 vsm fsearch.queryperf event value/1 name="active" value=0 1107249220.552329 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107249220.552381 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107249220.661500 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107249220.661627 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="active" value=0 1107249243.732724 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107249243.732852 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107249243.732906 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -180,8 +152,6 @@ 1107249280.663550 example.yahoo.com 28555 vsm fsearch.queryperf event value/1 name="active" value=0 1107249280.664313 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107249280.664365 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107249280.773405 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107249280.773526 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="active" value=0 1107249304.454704 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107249304.454833 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107249304.454886 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -192,8 +162,6 @@ 1107249340.825488 example.yahoo.com 28555 vsm fsearch.queryperf event value/1 name="active" value=0 1107249340.826289 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107249340.826342 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107249340.827122 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107249340.827187 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="active" value=0 1107249365.177542 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107249365.177669 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107249365.177723 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -204,8 +172,6 @@ 1107249482.760259 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107249482.760989 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107249482.761042 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107249484.460156 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107249484.460310 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107249521.879344 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107249521.879842 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107249521.879913 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -213,8 +179,6 @@ 1107249542.732513 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107249542.733591 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107249542.733644 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107249544.402200 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107249544.402588 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107249552.232878 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107249552.233293 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107249552.233356 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -225,8 +189,6 @@ 1107249602.935138 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107249602.936242 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107249602.936310 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107249604.514022 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107249604.514411 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107249612.954767 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107249612.954976 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107249612.955162 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -237,8 +199,6 @@ 1107249662.938636 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107249662.939500 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107249662.939552 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107249664.606105 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107249664.606520 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107249673.676574 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107249673.677044 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107249673.677282 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -249,8 +209,6 @@ 1107249723.108405 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107249723.109464 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107249723.109518 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107249724.667973 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107249724.668503 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107249734.398557 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107249734.399061 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107249734.399424 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -261,8 +219,6 @@ 1107249783.150509 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107249783.151530 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107249783.151610 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107249784.860115 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107249784.860543 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107249795.120517 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107249795.121115 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107249795.121470 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -273,8 +229,6 @@ 1107249843.303003 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107249843.304400 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107249843.304486 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107249844.971993 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107249844.972487 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107249855.842709 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107249855.843038 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107249855.843176 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -285,8 +239,6 @@ 1107249903.434091 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107249903.435239 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107249903.435292 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107249905.023913 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107249905.024305 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107249916.564719 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107249916.565133 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107249916.565277 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -297,8 +249,6 @@ 1107249963.526251 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107249963.527498 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107249963.527562 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107249965.085940 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107249965.086355 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107249977.286716 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107249977.286985 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107249977.287134 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -309,8 +259,6 @@ 1107250023.558227 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107250023.559250 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107250023.559334 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107250025.247819 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107250025.248795 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107250038.008626 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107250038.008972 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107250038.009117 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -321,8 +269,6 @@ 1107250083.690303 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107250083.691188 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107250083.691300 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107250085.359965 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107250085.360376 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107250098.730564 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107250098.732151 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107250098.732322 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -333,8 +279,6 @@ 1107250143.762207 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107250143.763278 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107250143.763355 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107250145.471889 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107250145.472434 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107250159.453836 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107250159.454250 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107250159.454313 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -345,8 +289,6 @@ 1107250203.924112 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107250203.925109 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107250203.925196 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107250205.513914 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107250205.514315 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107250220.176334 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107250220.176748 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107250220.176811 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -357,8 +299,6 @@ 1107250263.945967 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107250263.947065 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107250263.947151 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107250265.655706 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107250265.656171 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107250280.896680 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107250280.897147 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107250280.897565 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -369,8 +309,6 @@ 1107250324.068159 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107250324.068986 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107250324.069111 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107250325.727674 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107250325.728124 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107248423.987624 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107248423.987754 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107248423.987809 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -378,8 +316,6 @@ 1107248439.235871 example.yahoo.com 28555 vsm fsearch.queryperf event value/1 name="active" value=0 1107248439.236632 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107248439.236684 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107248439.345800 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107248439.345924 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="active" value=0 1107248454.346566 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107248454.346701 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107248454.346755 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -390,16 +326,12 @@ 1107248499.377855 example.yahoo.com 28555 vsm fsearch.queryperf event value/1 name="active" value=0 1107248499.378618 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107248499.378670 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107248499.379345 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107248499.379407 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="active" value=0 1107248515.068667 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107248515.068795 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107248515.068848 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numbytes" value=0 1107248545.429750 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107248545.429879 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107248545.429933 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numbytes" value=0 -1107248559.509728 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107248559.509849 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="active" value=0 1107248559.510318 example.yahoo.com 28555 vsm fsearch.queryperf event value/1 name="queued" value=0 1107248559.510382 example.yahoo.com 28555 vsm fsearch.queryperf event value/1 name="active" value=0 1107248559.511135 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 @@ -410,8 +342,6 @@ 1107248606.151589 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107248606.151717 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107248606.151769 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numbytes" value=0 -1107248619.601700 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107248619.601824 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="active" value=0 1107248619.602250 example.yahoo.com 28555 vsm fsearch.queryperf event value/1 name="queued" value=0 1107248619.602314 example.yahoo.com 28555 vsm fsearch.queryperf event value/1 name="active" value=0 1107248619.603067 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 @@ -422,8 +352,6 @@ 1107248666.873517 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107248666.873740 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107248666.873796 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numbytes" value=0 -1107248679.703659 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107248679.703779 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="active" value=0 1107248679.704182 example.yahoo.com 28555 vsm fsearch.queryperf event value/1 name="queued" value=0 1107248679.704244 example.yahoo.com 28555 vsm fsearch.queryperf event value/1 name="active" value=0 1107248679.704995 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 @@ -438,8 +366,6 @@ 1107248739.755880 example.yahoo.com 28555 vsm fsearch.queryperf event value/1 name="active" value=0 1107248739.756771 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107248739.756824 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107248739.865626 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107248739.865746 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="active" value=0 1107248757.956408 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107248757.956542 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107248757.956595 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -450,8 +376,6 @@ 1107248799.887747 example.yahoo.com 28555 vsm fsearch.queryperf event value/1 name="active" value=0 1107248799.888510 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107248799.888563 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107248799.888865 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107248799.889013 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="active" value=0 1107248818.678404 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107248818.678542 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107248818.678607 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -462,8 +386,6 @@ 1107248859.959735 example.yahoo.com 28555 vsm fsearch.queryperf event value/1 name="active" value=0 1107248859.960498 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107248859.960550 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107248860.069650 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107248860.069875 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="active" value=0 1107248879.400552 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107248879.400678 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107248879.400732 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -474,8 +396,6 @@ 1107248920.061705 example.yahoo.com 28555 vsm fsearch.queryperf event value/1 name="active" value=0 1107248920.062472 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107248920.062525 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107248920.171575 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107248920.171695 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="active" value=0 1107248940.122556 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107248940.122697 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107248940.122751 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -486,8 +406,6 @@ 1107248980.223719 example.yahoo.com 28555 vsm fsearch.queryperf event value/1 name="active" value=0 1107248980.224483 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107248980.224536 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107248980.225291 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107248980.225386 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="active" value=0 1107249000.844582 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107249000.844711 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107249000.844765 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -498,8 +416,6 @@ 1107249040.295643 example.yahoo.com 28555 vsm fsearch.queryperf event value/1 name="active" value=0 1107249040.296405 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107249040.296457 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107249040.297130 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107249040.297192 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="active" value=0 1107249061.566458 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107249061.566586 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107249061.566640 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -510,8 +426,6 @@ 1107249100.327593 example.yahoo.com 28555 vsm fsearch.queryperf event value/1 name="active" value=0 1107249100.328494 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107249100.328547 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107249100.457718 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107249100.457824 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="active" value=0 1107249122.288543 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107249122.288671 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107249122.288724 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -519,9 +433,7 @@ 1107249152.649816 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107249152.649869 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numbytes" value=0 1107249160.509467 example.yahoo.com 28555 vsm fsearch.queryperf event value/1 name="queued" value=0 -1107249160.509544 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="queued" value=0 1107249160.509615 example.yahoo.com 28555 vsm fsearch.queryperf event value/1 name="active" value=0 -1107249160.509708 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="active" value=0 1107249160.510802 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107249160.510855 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 1107249183.011765 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numcollections" value=0 @@ -534,8 +446,6 @@ 1107249220.551563 example.yahoo.com 28555 vsm fsearch.queryperf event value/1 name="active" value=0 1107249220.552329 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107249220.552381 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107249220.661500 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107249220.661627 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="active" value=0 1107249243.732724 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107249243.732852 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107249243.732906 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -546,8 +456,6 @@ 1107249280.663550 example.yahoo.com 28555 vsm fsearch.queryperf event value/1 name="active" value=0 1107249280.664313 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107249280.664365 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107249280.773405 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107249280.773526 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="active" value=0 1107249304.454704 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107249304.454833 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107249304.454886 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -558,8 +466,6 @@ 1107249340.825488 example.yahoo.com 28555 vsm fsearch.queryperf event value/1 name="active" value=0 1107249340.826289 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107249340.826342 example.yahoo.com 28555 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107249340.827122 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107249340.827187 example.yahoo.com 28552 tld fdispatch.queryperf event value/1 name="active" value=0 1107249365.177542 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107249365.177669 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107249365.177723 example.yahoo.com 28577 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -570,8 +476,6 @@ 1107249482.760259 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107249482.760989 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107249482.761042 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107249484.460156 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107249484.460310 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107249521.879344 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107249521.879842 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107249521.879913 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -579,8 +483,6 @@ 1107249542.732513 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107249542.733591 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107249542.733644 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107249544.402200 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107249544.402588 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107249552.232878 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107249552.233293 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107249552.233356 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -591,8 +493,6 @@ 1107249602.935138 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107249602.936242 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107249602.936310 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107249604.514022 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107249604.514411 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107249612.954767 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107249612.954976 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107249612.955162 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -603,8 +503,6 @@ 1107249662.938636 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107249662.939500 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107249662.939552 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107249664.606105 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107249664.606520 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107249673.676574 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107249673.677044 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107249673.677282 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -615,8 +513,6 @@ 1107249723.108405 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107249723.109464 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107249723.109518 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107249724.667973 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107249724.668503 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107249734.398557 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107249734.399061 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107249734.399424 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -627,8 +523,6 @@ 1107249783.150509 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107249783.151530 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107249783.151610 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107249784.860115 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107249784.860543 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107249795.120517 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107249795.121115 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107249795.121470 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -639,8 +533,6 @@ 1107249843.303003 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107249843.304400 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107249843.304486 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107249844.971993 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107249844.972487 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107249855.842709 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107249855.843038 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107249855.843176 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -651,8 +543,6 @@ 1107249903.434091 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107249903.435239 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107249903.435292 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107249905.023913 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107249905.024305 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107249916.564719 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107249916.565133 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107249916.565277 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -663,8 +553,6 @@ 1107249963.526251 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107249963.527498 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107249963.527562 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107249965.085940 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107249965.086355 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107249977.286716 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107249977.286985 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107249977.287134 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -675,8 +563,6 @@ 1107250023.558227 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107250023.559250 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107250023.559334 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107250025.247819 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107250025.248795 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107250038.008626 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107250038.008972 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107250038.009117 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -687,8 +573,6 @@ 1107250083.690303 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107250083.691188 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107250083.691300 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107250085.359965 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107250085.360376 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107250098.730564 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107250098.732151 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107250098.732322 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -699,8 +583,6 @@ 1107250143.762207 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107250143.763278 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107250143.763355 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107250145.471889 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107250145.472434 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107250159.453836 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107250159.454250 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107250159.454313 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -711,8 +593,6 @@ 1107250203.924112 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107250203.925109 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107250203.925196 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107250205.513914 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107250205.514315 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107250220.176334 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107250220.176748 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107250220.176811 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -723,8 +603,6 @@ 1107250263.945967 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107250263.947065 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107250263.947151 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107250265.655706 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107250265.656171 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107250280.896680 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107250280.897147 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107250280.897565 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -735,8 +613,6 @@ 1107250324.068159 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107250324.068986 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107250324.069111 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107250325.727674 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107250325.728124 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107250341.618469 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107250341.619001 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107250341.619367 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -747,8 +623,6 @@ 1107250384.210153 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107250384.211269 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107250384.211322 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107250385.789685 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107250385.790201 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107250402.340723 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107250402.341145 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107250402.341208 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -759,8 +633,6 @@ 1107250444.242282 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107250444.243410 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107250444.243524 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107250445.921705 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107250445.922178 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107250463.062779 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107250463.063193 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107250463.063257 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -771,8 +643,6 @@ 1107250504.434091 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107250504.435178 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107250504.435231 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107250506.013628 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107250506.013991 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107250523.791832 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107250523.791966 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107250523.792019 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -783,8 +653,6 @@ 1107250564.525632 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107250564.526387 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107250564.526439 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107250566.085563 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107250566.085687 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107250584.506801 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107250584.506957 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107250584.507011 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -795,8 +663,6 @@ 1107250624.567734 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107250624.568485 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107250624.568536 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107250626.257564 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107250626.257686 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107250645.229659 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107250645.229812 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107250645.229866 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -807,8 +673,6 @@ 1107250684.729580 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107250684.730461 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107250684.730512 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107250686.299574 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107250686.299692 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107250705.950505 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107250705.950692 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107250705.950769 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -819,8 +683,6 @@ 1107250744.761626 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107250744.762381 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107250744.762433 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107250746.441505 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107250746.441626 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107250766.672522 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107250766.672708 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107250766.672763 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -831,8 +693,6 @@ 1107250804.863613 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107250804.864360 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107250804.864411 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107250806.573649 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107250806.573769 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107250827.395696 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107250827.395823 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107250827.395876 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -843,8 +703,6 @@ 1107250865.035581 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107250865.036337 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107250865.036388 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107250866.595476 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107250866.595599 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107250888.116534 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107250888.116674 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107250888.116737 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -855,8 +713,6 @@ 1107250925.137544 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107250925.138351 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107250925.138403 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107250926.717467 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107250926.717575 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107250948.838645 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107250948.838779 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107250948.838836 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -867,8 +723,6 @@ 1107250985.131117 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107250985.131975 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107250985.132027 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107250986.809443 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107250986.809566 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107251009.560525 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107251009.560664 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107251009.560727 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -879,8 +733,6 @@ 1107251045.311598 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107251045.312351 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107251045.312403 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107251046.871495 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107251046.871619 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107251070.282709 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107251070.282849 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107251070.282918 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -891,8 +743,6 @@ 1107251105.403514 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107251105.404268 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107251105.404320 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107251106.983407 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107251106.983527 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107251131.004511 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107251131.004656 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107251131.004753 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -903,8 +753,6 @@ 1107251165.455454 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107251165.456208 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107251165.456260 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107251167.135419 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107251167.135523 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107251191.726752 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107251191.726890 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107251191.726957 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -915,8 +763,6 @@ 1107251225.587559 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107251225.588311 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107251225.588363 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107251227.167723 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107251227.167846 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107251252.448823 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107251252.448959 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107251252.449014 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -927,8 +773,6 @@ 1107251285.629447 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107251285.630309 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107251285.630361 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107251287.319473 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107251287.319591 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107251313.170437 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107251313.170575 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107251313.170631 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -939,8 +783,6 @@ 1107251345.811464 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107251345.812220 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107251345.812272 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107251347.391374 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107251347.391481 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107251373.892751 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107251373.892890 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107251373.892954 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -951,8 +793,6 @@ 1107251405.923418 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107251405.924170 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107251405.924221 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107251407.513274 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107251407.513397 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107251434.614618 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107251434.614759 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107251434.614823 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -963,8 +803,6 @@ 1107251466.005448 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107251466.006208 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107251466.006260 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107251467.565334 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107251467.565455 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107251495.336518 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107251495.336658 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107251495.336721 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 @@ -975,8 +813,6 @@ 1107251526.047353 example.yahoo.com 59768 vsm fsearch.queryperf event value/1 name="active" value=0 1107251526.048109 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.1st.latency.ms.max" value=0 1107251526.048161 example.yahoo.com 59768 vsm fsearch.vsm.vsmmanager event value/1 name="chunk.all.latency.ms.max" value=0 -1107251527.737300 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="queued" value=0 -1107251527.737423 example.yahoo.com 59773 tld fdispatch.queryperf event value/1 name="active" value=0 1107251556.058595 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numcollections" value=0 1107251556.058737 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numdocuments" value=0 1107251556.058848 example.yahoo.com 59791 storage storageserver.collection-man event value/1 name="numbytes" value=0 diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerApi.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerApi.java index 9b496526804..90768facf34 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerApi.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerApi.java @@ -1,6 +1,7 @@ // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.node.admin.configserver; +import java.time.Duration; import java.util.Optional; /** @@ -9,16 +10,42 @@ import java.util.Optional; * @author freva */ public interface ConfigServerApi extends AutoCloseable { - - <T> T get(String path, Class<T> wantedReturnType); - - <T> T post(String path, Object bodyJsonPojo, Class<T> wantedReturnType); - - <T> T put(String path, Optional<Object> bodyJsonPojo, Class<T> wantedReturnType); - - <T> T patch(String path, Object bodyJsonPojo, Class<T> wantedReturnType); - - <T> T delete(String path, Class<T> wantedReturnType); + class Params { + private Optional<Duration> connectionTimeout; + + /** Set the socket connect and read timeouts. */ + public Params setConnectionTimeout(Duration connectionTimeout) { + this.connectionTimeout = Optional.of(connectionTimeout); + return this; + } + + public Optional<Duration> getConnectionTimeout() { return connectionTimeout; } + } + + <T> T get(String path, Class<T> wantedReturnType, Params params); + default <T> T get(String path, Class<T> wantedReturnType) { + return get(path, wantedReturnType, null); + } + + <T> T post(String path, Object bodyJsonPojo, Class<T> wantedReturnType, Params params); + default <T> T post(String path, Object bodyJsonPojo, Class<T> wantedReturnType) { + return post(path, bodyJsonPojo, wantedReturnType, null); + } + + <T> T put(String path, Optional<Object> bodyJsonPojo, Class<T> wantedReturnType, Params params); + default <T> T put(String path, Optional<Object> bodyJsonPojo, Class<T> wantedReturnType) { + return put(path, bodyJsonPojo, wantedReturnType, null); + } + + <T> T patch(String path, Object bodyJsonPojo, Class<T> wantedReturnType, Params params); + default <T> T patch(String path, Object bodyJsonPojo, Class<T> wantedReturnType) { + return patch(path, bodyJsonPojo, wantedReturnType, null); + } + + <T> T delete(String path, Class<T> wantedReturnType, Params params); + default <T> T delete(String path, Class<T> wantedReturnType) { + return delete(path, wantedReturnType, null); + } /** Close the underlying HTTP client and any threads this class might have started. */ @Override diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerApiImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerApiImpl.java index 4dadcb359ea..a066375ce5c 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerApiImpl.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerApiImpl.java @@ -49,6 +49,11 @@ import java.util.logging.Logger; public class ConfigServerApiImpl implements ConfigServerApi { private static final Logger logger = Logger.getLogger(ConfigServerApiImpl.class.getName()); + private static final RequestConfig DEFAULT_REQUEST_CONFIG = RequestConfig.custom() + .setConnectionRequestTimeout(1_000) // connection from connection manager + .setConnectTimeout(10_000) // establishment of connection + .setSocketTimeout(10_000) // waiting for data + .build(); private final ObjectMapper mapper = new ObjectMapper(); @@ -134,9 +139,11 @@ public class ConfigServerApiImpl implements ConfigServerApi { } @Override - public <T> T put(String path, Optional<Object> bodyJsonPojo, Class<T> wantedReturnType) { + public <T> T put(String path, Optional<Object> bodyJsonPojo, Class<T> wantedReturnType, Params paramsOrNull) { + Optional<RequestConfig> requestConfigOverride = getRequestConfigOverride(paramsOrNull); return tryAllConfigServers(configServer -> { HttpPut put = new HttpPut(configServer.resolve(path)); + requestConfigOverride.ifPresent(put::setConfig); setContentTypeToApplicationJson(put); if (bodyJsonPojo.isPresent()) { put.setEntity(new StringEntity(mapper.writeValueAsString(bodyJsonPojo.get()))); @@ -146,9 +153,11 @@ public class ConfigServerApiImpl implements ConfigServerApi { } @Override - public <T> T patch(String path, Object bodyJsonPojo, Class<T> wantedReturnType) { + public <T> T patch(String path, Object bodyJsonPojo, Class<T> wantedReturnType, Params paramsOrNull) { + Optional<RequestConfig> requestConfigOverride = getRequestConfigOverride(paramsOrNull); return tryAllConfigServers(configServer -> { HttpPatch patch = new HttpPatch(configServer.resolve(path)); + requestConfigOverride.ifPresent(patch::setConfig); setContentTypeToApplicationJson(patch); patch.setEntity(new StringEntity(mapper.writeValueAsString(bodyJsonPojo))); return patch; @@ -156,21 +165,31 @@ public class ConfigServerApiImpl implements ConfigServerApi { } @Override - public <T> T delete(String path, Class<T> wantedReturnType) { - return tryAllConfigServers(configServer -> - new HttpDelete(configServer.resolve(path)), wantedReturnType); + public <T> T delete(String path, Class<T> wantedReturnType, Params paramsOrNull) { + Optional<RequestConfig> requestConfigOverride = getRequestConfigOverride(paramsOrNull); + return tryAllConfigServers(configServer -> { + HttpDelete delete = new HttpDelete(configServer.resolve(path)); + requestConfigOverride.ifPresent(delete::setConfig); + return delete; + }, wantedReturnType); } @Override - public <T> T get(String path, Class<T> wantedReturnType) { - return tryAllConfigServers(configServer -> - new HttpGet(configServer.resolve(path)), wantedReturnType); + public <T> T get(String path, Class<T> wantedReturnType, Params paramsOrNull) { + Optional<RequestConfig> requestConfig = getRequestConfigOverride(paramsOrNull); + return tryAllConfigServers(configServer -> { + HttpGet get = new HttpGet(configServer.resolve(path)); + requestConfig.ifPresent(get::setConfig); + return get; + }, wantedReturnType); } @Override - public <T> T post(String path, Object bodyJsonPojo, Class<T> wantedReturnType) { + public <T> T post(String path, Object bodyJsonPojo, Class<T> wantedReturnType, Params paramsOrNull) { + Optional<RequestConfig> requestConfigOverride = getRequestConfigOverride(paramsOrNull); return tryAllConfigServers(configServer -> { HttpPost post = new HttpPost(configServer.resolve(path)); + requestConfigOverride.ifPresent(post::setConfig); setContentTypeToApplicationJson(post); post.setEntity(new StringEntity(mapper.writeValueAsString(bodyJsonPojo))); return post; @@ -203,23 +222,28 @@ public class ConfigServerApiImpl implements ConfigServerApi { cm.setMaxTotal(200); // Increase max total connections to 200, which should be enough // Have experienced hang in socket read, which may have been because of - // system defaults, therefore set explicit timeouts. Set arbitrarily to - // 15s > 10s used by Orchestrator lock timeout. - int timeoutMs = 15_000; - RequestConfig requestBuilder = RequestConfig.custom() - .setConnectTimeout(timeoutMs) // establishment of connection - .setConnectionRequestTimeout(timeoutMs) // connection from connection manager - .setSocketTimeout(timeoutMs) // waiting for data - .build(); - + // system defaults, therefore set explicit timeouts. return HttpClientBuilder.create() - .setDefaultRequestConfig(requestBuilder) + .setDefaultRequestConfig(DEFAULT_REQUEST_CONFIG) .disableAutomaticRetries() .setUserAgent("node-admin") .setConnectionManager(cm) .build(); } + private static Optional<RequestConfig> getRequestConfigOverride(Params paramsOrNull) { + if (paramsOrNull == null) return Optional.empty(); + + RequestConfig.Builder builder = RequestConfig.copy(DEFAULT_REQUEST_CONFIG); + + paramsOrNull.getConnectionTimeout().ifPresent(connectionTimeout -> { + builder.setConnectTimeout((int) connectionTimeout.toMillis()); + builder.setSocketTimeout((int) connectionTimeout.toMillis()); + }); + + return Optional.of(builder.build()); + } + // Shuffle config server URIs to balance load private static List<URI> randomizeConfigServerUris(Collection<URI> configServerUris) { List<URI> shuffledConfigServerHosts = new ArrayList<>(configServerUris); diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/ConnectionException.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/ConnectionException.java index 7e860bfb66b..ef91e9bf81b 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/ConnectionException.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/ConnectionException.java @@ -14,8 +14,8 @@ import java.net.SocketTimeoutException; @SuppressWarnings("serial") public class ConnectionException extends ConvergenceException { - private ConnectionException(String message) { - super(message); + private ConnectionException(String message, Throwable cause) { + super(message, cause); } /** @@ -24,7 +24,7 @@ public class ConnectionException extends ConvergenceException { */ public static RuntimeException handleException(String prefix, Throwable t) { if (isKnownConnectionException(t)) - return new ConnectionException(prefix + t.getMessage()); + return new ConnectionException(prefix + t.getMessage(), t); return new RuntimeException(prefix, t); } diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/orchestrator/OrchestratorImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/orchestrator/OrchestratorImpl.java index 353abd64778..20c0604b5dc 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/orchestrator/OrchestratorImpl.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/orchestrator/OrchestratorImpl.java @@ -10,6 +10,7 @@ import com.yahoo.vespa.orchestrator.restapi.HostSuspensionApi; import com.yahoo.vespa.orchestrator.restapi.wire.BatchOperationResult; import com.yahoo.vespa.orchestrator.restapi.wire.UpdateHostResponse; +import java.time.Duration; import java.util.List; import java.util.Optional; @@ -19,6 +20,15 @@ import java.util.Optional; * @author dybis */ public class OrchestratorImpl implements Orchestrator { + // The server-side Orchestrator has an internal timeout of 10s. + // + // Note: A 409 has been observed to be returned after 33s in a case possibly involving + // zk leader election (which is unfortunate as it is difficult to differentiate between + // transient timeouts (do not allow suspend on timeout) and the config server being + // permanently down (allow suspend)). For now we'd like to investigate such long + // requests so keep the timeout low(er). + private static final Duration CONNECTION_TIMEOUT = Duration.ofSeconds(15); + // TODO: Find a way to avoid duplicating this (present in orchestrator's services.xml also). private static final String ORCHESTRATOR_PATH_PREFIX = "/orchestrator"; static final String ORCHESTRATOR_PATH_PREFIX_HOST_API @@ -36,9 +46,8 @@ public class OrchestratorImpl implements Orchestrator { public void suspend(final String hostName) { UpdateHostResponse response; try { - response = configServerApi.put(getSuspendPath(hostName), - Optional.empty(), /* body */ - UpdateHostResponse.class); + var params = new ConfigServerApi.Params().setConnectionTimeout(CONNECTION_TIMEOUT); + response = configServerApi.put(getSuspendPath(hostName), Optional.empty(), UpdateHostResponse.class, params); } catch (HttpException.NotFoundException n) { throw new OrchestratorNotFoundException("Failed to suspend " + hostName + ", host not found"); } catch (HttpException e) { @@ -58,10 +67,11 @@ public class OrchestratorImpl implements Orchestrator { public void suspend(String parentHostName, List<String> hostNames) { final BatchOperationResult batchOperationResult; try { - String params = String.join("&hostname=", hostNames); + var params = new ConfigServerApi.Params().setConnectionTimeout(CONNECTION_TIMEOUT); + String hostnames = String.join("&hostname=", hostNames); String url = String.format("%s/%s?hostname=%s", ORCHESTRATOR_PATH_PREFIX_HOST_SUSPENSION_API, - parentHostName, params); - batchOperationResult = configServerApi.put(url, Optional.empty(), BatchOperationResult.class); + parentHostName, hostnames); + batchOperationResult = configServerApi.put(url, Optional.empty(), BatchOperationResult.class, params); } catch (HttpException e) { throw new OrchestratorException("Failed to batch suspend for " + parentHostName + ": " + e.toString()); } catch (ConnectionException e) { diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerApiImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerApiImplTest.java index 1ed3e5729e5..0909a03749e 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerApiImplTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerApiImplTest.java @@ -15,15 +15,19 @@ import org.junit.Test; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; +import java.net.SocketTimeoutException; import java.net.URI; import java.nio.charset.StandardCharsets; +import java.time.Duration; import java.util.Arrays; import java.util.List; +import java.util.Optional; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.Matchers.arrayContainingInAnyOrder; import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.mockito.ArgumentMatchers.any; @@ -37,6 +41,9 @@ import static org.mockito.Mockito.when; */ public class ConfigServerApiImplTest { + private static final int FAIL_RETURN_CODE = 100000; + private static final int TIMEOUT_RETURN_CODE = 100001; + @JsonIgnoreProperties(ignoreUnknown = true) public static class TestPojo { @JsonProperty("foo") @@ -50,7 +57,7 @@ public class ConfigServerApiImplTest { private final List<URI> configServers = Arrays.asList(URI.create(uri1), URI.create(uri2)); private final StringBuilder mockLog = new StringBuilder(); - private ConfigServerApiImpl executor; + private ConfigServerApiImpl configServerApi; private int mockReturnCode = 200; @Before @@ -59,7 +66,11 @@ public class ConfigServerApiImplTest { when(httpMock.execute(any())).thenAnswer(invocationOnMock -> { HttpGet get = (HttpGet) invocationOnMock.getArguments()[0]; mockLog.append(get.getMethod()).append(" ").append(get.getURI()).append(" "); - if (mockReturnCode == 100000) throw new RuntimeException("FAIL"); + + switch (mockReturnCode) { + case FAIL_RETURN_CODE: throw new RuntimeException("FAIL"); + case TIMEOUT_RETURN_CODE: throw new SocketTimeoutException("read timed out"); + } BasicStatusLine statusLine = new BasicStatusLine(HttpVersion.HTTP_1_1, mockReturnCode, null); BasicHttpEntity entity = new BasicHttpEntity(); @@ -73,12 +84,12 @@ public class ConfigServerApiImplTest { return response; }); - executor = ConfigServerApiImpl.createForTestingWithClient(configServers, httpMock); + configServerApi = ConfigServerApiImpl.createForTestingWithClient(configServers, httpMock); } @Test public void testBasicParsingSingleServer() { - TestPojo answer = executor.get("/path", TestPojo.class); + TestPojo answer = configServerApi.get("/path", TestPojo.class); assertThat(answer.foo, is("bar")); assertLogStringContainsGETForAHost(); } @@ -88,7 +99,7 @@ public class ConfigServerApiImplTest { // Server is returning 400, no retries. mockReturnCode = 400; - TestPojo testPojo = executor.get("/path", TestPojo.class); + TestPojo testPojo = configServerApi.get("/path", TestPojo.class); assertEquals(testPojo.errorCode.intValue(), mockReturnCode); assertLogStringContainsGETForAHost(); } @@ -98,17 +109,33 @@ public class ConfigServerApiImplTest { // Server is returning 201, no retries. mockReturnCode = 201; - TestPojo testPojo = executor.get("/path", TestPojo.class); + TestPojo testPojo = configServerApi.get("/path", TestPojo.class); assertEquals(testPojo.errorCode.intValue(), mockReturnCode); assertLogStringContainsGETForAHost(); } @Test + public void testBasicSuccessWithCustomTimeouts() { + mockReturnCode = TIMEOUT_RETURN_CODE; + + var params = new ConfigServerApi.Params(); + params.setConnectionTimeout(Duration.ofSeconds(3)); + + try { + TestPojo testPojo = configServerApi.get("/path", TestPojo.class, params); + fail(); + } catch (ConnectionException e) { + assertNotNull(e.getCause()); + assertEquals("read timed out", e.getCause().getMessage()); + } + } + + @Test public void testRetries() { // Client is throwing exception, should be retries. - mockReturnCode = 100000; + mockReturnCode = FAIL_RETURN_CODE; try { - executor.get("/path", TestPojo.class); + configServerApi.get("/path", TestPojo.class); fail("Expected failure"); } catch (Exception e) { // ignore @@ -123,7 +150,7 @@ public class ConfigServerApiImplTest { // Client is throwing exception, should be retries. mockReturnCode = 503; try { - executor.get("/path", TestPojo.class); + configServerApi.get("/path", TestPojo.class); fail("Expected failure"); } catch (Exception e) { // ignore @@ -136,7 +163,7 @@ public class ConfigServerApiImplTest { public void testForbidden() { mockReturnCode = 403; try { - executor.get("/path", TestPojo.class); + configServerApi.get("/path", TestPojo.class); fail("Expected exception"); } catch (HttpException.ForbiddenException e) { // ignore @@ -149,7 +176,7 @@ public class ConfigServerApiImplTest { // Server is returning 404, special exception is thrown. mockReturnCode = 404; try { - executor.get("/path", TestPojo.class); + configServerApi.get("/path", TestPojo.class); fail("Expected exception"); } catch (HttpException.NotFoundException e) { // ignore @@ -161,7 +188,7 @@ public class ConfigServerApiImplTest { public void testConflict() { // Server is returning 409, no exception is thrown. mockReturnCode = 409; - executor.get("/path", TestPojo.class); + configServerApi.get("/path", TestPojo.class); assertLogStringContainsGETForAHost(); } diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/orchestrator/OrchestratorImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/orchestrator/OrchestratorImplTest.java index e4c46c504be..936a7bb224d 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/orchestrator/OrchestratorImplTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/orchestrator/OrchestratorImplTest.java @@ -12,6 +12,7 @@ import java.util.Arrays; import java.util.List; import java.util.Optional; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -29,9 +30,10 @@ public class OrchestratorImplTest { @Test public void testSuspendCall() { when(configServerApi.put( - OrchestratorImpl.ORCHESTRATOR_PATH_PREFIX_HOST_API + "/" + hostName+ "/suspended", - Optional.empty(), - UpdateHostResponse.class + eq(OrchestratorImpl.ORCHESTRATOR_PATH_PREFIX_HOST_API + "/" + hostName+ "/suspended"), + eq(Optional.empty()), + eq(UpdateHostResponse.class), + any() )).thenReturn(new UpdateHostResponse(hostName, null)); orchestrator.suspend(hostName); @@ -40,9 +42,10 @@ public class OrchestratorImplTest { @Test(expected=OrchestratorException.class) public void testSuspendCallWithFailureReason() { when(configServerApi.put( - OrchestratorImpl.ORCHESTRATOR_PATH_PREFIX_HOST_API + "/" + hostName+ "/suspended", - Optional.empty(), - UpdateHostResponse.class + eq(OrchestratorImpl.ORCHESTRATOR_PATH_PREFIX_HOST_API + "/" + hostName+ "/suspended"), + eq(Optional.empty()), + eq(UpdateHostResponse.class), + any() )).thenReturn(new UpdateHostResponse(hostName, new HostStateChangeDenialReason("hostname", "fail"))); orchestrator.suspend(hostName); @@ -50,22 +53,16 @@ public class OrchestratorImplTest { @Test(expected=OrchestratorNotFoundException.class) public void testSuspendCallWithNotFound() { - when(configServerApi.put( - any(String.class), - any(), - any() - )).thenThrow(new HttpException.NotFoundException("Not Found")); + when(configServerApi.put(any(String.class), any(), any(), any())) + .thenThrow(new HttpException.NotFoundException("Not Found")); orchestrator.suspend(hostName); } @Test(expected=RuntimeException.class) public void testSuspendCallWithSomeOtherException() { - when(configServerApi.put( - any(String.class), - any(), - any() - )).thenThrow(new RuntimeException("Some parameter was wrong")); + when(configServerApi.put(any(String.class), any(), any(), any())) + .thenThrow(new RuntimeException("Some parameter was wrong")); orchestrator.suspend(hostName); } @@ -103,11 +100,8 @@ public class OrchestratorImplTest { @Test(expected=RuntimeException.class) public void testResumeCallWithSomeOtherException() { - when(configServerApi.put( - any(String.class), - any(), - any() - )).thenThrow(new RuntimeException("Some parameter was wrong")); + when(configServerApi.put(any(String.class), any(), any(), any())) + .thenThrow(new RuntimeException("Some parameter was wrong")); orchestrator.suspend(hostName); } @@ -118,9 +112,10 @@ public class OrchestratorImplTest { List<String> hostNames = Arrays.asList("a1.host1.test.yahoo.com", "a2.host1.test.yahoo.com"); when(configServerApi.put( - "/orchestrator/v1/suspensions/hosts/host1.test.yahoo.com?hostname=a1.host1.test.yahoo.com&hostname=a2.host1.test.yahoo.com", - Optional.empty(), - BatchOperationResult.class + eq("/orchestrator/v1/suspensions/hosts/host1.test.yahoo.com?hostname=a1.host1.test.yahoo.com&hostname=a2.host1.test.yahoo.com"), + eq(Optional.empty()), + eq(BatchOperationResult.class), + any() )).thenReturn(BatchOperationResult.successResult()); orchestrator.suspend(parentHostName, hostNames); @@ -133,9 +128,10 @@ public class OrchestratorImplTest { String failureReason = "Failed to suspend"; when(configServerApi.put( - "/orchestrator/v1/suspensions/hosts/host1.test.yahoo.com?hostname=a1.host1.test.yahoo.com&hostname=a2.host1.test.yahoo.com", - Optional.empty(), - BatchOperationResult.class + eq("/orchestrator/v1/suspensions/hosts/host1.test.yahoo.com?hostname=a1.host1.test.yahoo.com&hostname=a2.host1.test.yahoo.com"), + eq(Optional.empty()), + eq(BatchOperationResult.class), + any() )).thenReturn(new BatchOperationResult(failureReason)); orchestrator.suspend(parentHostName, hostNames); @@ -148,9 +144,10 @@ public class OrchestratorImplTest { String exceptionMessage = "Exception: Something crashed!"; when(configServerApi.put( - "/orchestrator/v1/suspensions/hosts/host1.test.yahoo.com?hostname=a1.host1.test.yahoo.com&hostname=a2.host1.test.yahoo.com", - Optional.empty(), - BatchOperationResult.class + eq("/orchestrator/v1/suspensions/hosts/host1.test.yahoo.com?hostname=a1.host1.test.yahoo.com&hostname=a2.host1.test.yahoo.com"), + eq(Optional.empty()), + eq(BatchOperationResult.class), + any() )).thenThrow(new RuntimeException(exceptionMessage)); orchestrator.suspend(parentHostName, hostNames); diff --git a/searchcore/src/vespa/searchcore/config/CMakeLists.txt b/searchcore/src/vespa/searchcore/config/CMakeLists.txt index 3d62309161c..a4f5560c712 100644 --- a/searchcore/src/vespa/searchcore/config/CMakeLists.txt +++ b/searchcore/src/vespa/searchcore/config/CMakeLists.txt @@ -3,8 +3,6 @@ vespa_add_library(searchcore_fconfig STATIC SOURCES DEPENDS ) -vespa_generate_config(searchcore_fconfig partitions.def) -install_config_definition(partitions.def vespa.config.search.core.partitions.def) vespa_generate_config(searchcore_fconfig fdispatchrc.def) install_config_definition(fdispatchrc.def vespa.config.search.core.fdispatchrc.def) vespa_generate_config(searchcore_fconfig proton.def) diff --git a/searchcore/src/vespa/searchcore/config/fdispatchrc.def b/searchcore/src/vespa/searchcore/config/fdispatchrc.def index f9464815f6a..f2e33e463b8 100644 --- a/searchcore/src/vespa/searchcore/config/fdispatchrc.def +++ b/searchcore/src/vespa/searchcore/config/fdispatchrc.def @@ -1,84 +1,5 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=vespa.config.search.core -## Default bias used when calculating docsum slowness limit. The -## formula used is: factor * Average Docsum Time + bias. If a node -## uses more time than this limit, it is considered slow. This config -## value may be overridden per dataset by using the slowdocsumlimitbias -## keyword in the partitions file. -defaultslowdocsumlimitbias double default=1.0 restart - -## Default factor used when calculating docsum slowness limit. The -## formula used is: factor * Average Docsum Time + bias. If a node -## uses more time than this limit, it is considered slow. This config -## value may be overridden per dataset by using the slowdocsumlimitfactor -## keyword in the partitions file. -defaultslowdocsumlimitfactor double default=2.0 restart - -## Default bias used when calculating query slowness limit. The -## formula used is: factor * Average Search Time + bias. If a node -## uses more time than this limit, it is considered slow. This config -## value may be overridden per dataset by using the slowquerylimitbias -## keyword in the partitions file. -defaultslowquerylimitbias double default=1.0 restart - -## Default factor used when calculating query slowness limit. The -## formula used is: factor * Average Search Time + bias. If a node -## uses more time than this limit, it is considered slow. This config -## value may be overridden per dataset by using the slowquerylimitfactor -## keyword in the partitions file. -defaultslowquerylimitfactor double default=2.0 restart - -## The port where FNET Remote Tools RPC service should be made available. -## If 0, fdispatch will not offer RPC service. -frtport int default=0 restart - -## Port for health reporting -healthport int default=0 restart - -## The maximum time between successful reads on a socket before timeout. -maxsocksilent double default=5.0 restart - -## The maximum number of threads used. 0 means no limit. -maxthreads int default=150 restart - ## The number of transport threads used when talking to search nodes. transportthreads int default=1 restart - -## specifies the partition we provide upwards in a multi-level dispatch system. -partition int default=0 restart - -## specifies the port number for the persistent internal transport -## protocol provided for a multi-level dispatch system. If this value -## is 0, MLD service is not provided, and this process cannot be used -## by other fdispatch processes. -ptport int default=0 restart - -## The name of the upwards transport to be used. If empty, use -## the default transport. -## This config setting is unused and should be removed. -transport string default="" - -## If present, the TCP_NODELAY option is set on the persistent -## transport connections. This causes non-full packets to be sent even -## though previously sent data has not yet been acknowledged (e.g. due -## to the delayed ack feature present on various tcp stacks). -transportnodelay bool default=true restart - -## Minimum size of packets to compress (0 means no compression) -## -packetcompresslimit int default = 1024 restart - -## Compression level for packets -## -## Default value is 3 -packetcompresslevel int default = 3 restart - -## Compression type for packets -## -## Default is LZ4 -packetcompresstype enum {NONE, LZ4} default=LZ4 restart - -## Specifies at which level this dispatcher is in a multi-level dispatch system. -## The top-level dispatcher is at level 0. -dispatchlevel int default=0 restart diff --git a/searchcore/src/vespa/searchcore/config/partitions.def b/searchcore/src/vespa/searchcore/config/partitions.def deleted file mode 100644 index b9c3aabb37e..00000000000 --- a/searchcore/src/vespa/searchcore/config/partitions.def +++ /dev/null @@ -1,209 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=vespa.config.search.core - -## each dataset must be identified by a unique id, preferably a small integer. -## note that the array index in the dataset[] array is never significant. -dataset[].id int - -## Define the cost of using a dataset. fdispatch will try to -## spread queries not specifying dataset over all datasets having a -## nonzero refcost to minimize the maximum active refcost. -dataset[].refcost int default=0 - -## Number of searchable copies on each node. -## Searchable copies - nodes down < 1 will trigger an estimate of coverage. -dataset[].searchablecopies long default=1 - -## Defines the number of bits used to encode the partition number -## internally on a dispatch node. The value must be in the range [1,8]. -## The default value is 6, allowing the numparts parameter to be up to 63. -dataset[].partbits int default=8 - -## Defines the number of bits used to encode the row number internally -## on a dispatch node. A nonzero value is needed to allow slightly -## different engines to be on the same partition. -dataset[].rowbits int default=0 - -## Defines the number of partitions below this fdispatch process. -## The fsearch and fdispatch processes contacted must provide a partition -## number in the range [ firstpart, firstpart + partitions - 1 ] -## The legal range for numparts is limited by the partbits parameter. -## For PLAIN datasets numparts must be positive. -dataset[].numparts int default=0 - -## Defines the lowest partition number accepted by this fdispatch -## process. -dataset[].firstpart int default=0 - -## Minimum number of partitions available for the dataset to be -## considered up. If any dataset is considered down then the HTTP -## interface on fdispatch is temporarily closed. A dispatch node below -## can represent multiple partitions, e.g. a dispatch node having 5 -## dispatch nodes below that each has 20 search nodes below can have -## 100 partitions. Setting minpartitions to 95 will then mean that at -## most 5 search nodes can be down before the top level dispatch node -## takes down it's HTTP interface. -dataset[].minpartitions int default=0 - -## Minimum number of good engines in a partition before the partition is -## used for queries. -dataset[].mpp int default=1 - -## Maximum number of nodes that can be down in a row while still using this row -## for queries when using the FIXEDROW query distribution. -dataset[].maxnodesdownperfixedrow int default=0 - -## Use simple roundrobin or adaptive based on latency. -dataset[].useroundrobinforfixedrow bool default=true - -## specifies where a fdispatch or fsearch process can be contacted. -## must be in the format hostname:port/id where /id is optional. -## Normally you have at least as many engine array members as -## the number of partitions specified. To reduce the impact of -## packet loss, multiple instances of the same host and port but -## with different ids can be used. -dataset[].engine[].name_and_port string - -## If a non-negative partition number is specified then the engine -## is hardwired to that partition number and considered to be down if -## the monitoring partition ID doesn't match (but see overridepartids). -dataset[].engine[].partid int default=0 - -## If rowbits is nonzero you can specify a rowid for each engine. -## Then engines with different rowid and the same partition number -## don't need to be completely identical. If the rowid can't be -## encoded within the number of rowbits then the behaviour is undefined. -dataset[].engine[].rowid int default=0 - -## If the engine is a dispatch node, the subdatasetid specifies -## which of the engine's datasets should be used. -dataset[].engine[].subdatasetid int default=0 - -## The refcost is used for load balancing between different engines -## in the same partition (column) in the same manner as the refcost -## parameter for datasets. A refcost of 0 means that the engine won't -## be selected as part of load balancing. -dataset[].engine[].refcost int default=1 - -## When set to true, overrides of the partition id reported by the node. -## This only affects the engine if the partid is specified. -dataset[].engine[].overridepartids bool default=true - -## Maximum number of hits that will be requested from a single node -## in this dataset. If not set, there is no limit. Using this option -## may help reduce network traffic when searching in datasets with big -## fan-out, but it will also result in incorrect and incomplete results; -## don't use it if you don't (really) mean it. -dataset[].maxhitspernode int default=2147483647 - -## When using this dataset as an estimation dataset -## only use estparts number of partitions instead of the full numparts. -## The partitions are randomly chosen and the estimate multiplied with -## numparts/estparts. If estparts=0 the entire dataset is used. -dataset[].estparts int default=0 - -## When using this dataset as an estimation dataset only consider -## the partitions with partition number below estpartcutoff. -## estpartcutoff=0 means no cutoff. Avoid using this parameter. -dataset[].estpartcutoff int default=0 - -## Minimum active requests before considering estimates. -dataset[].minactive int default=500 - -## Maximum active requests before queueing. -dataset[].maxactive int default=500 - -## Maximum active requests before cutoff. -dataset[].cutoffactive int default=1000 - -## Minimum estimated active requests before queueing. -dataset[].minestactive int default=500 - -## Maximum estimated active requests before early drop. -dataset[].maxestactive int default=1000 - -## Maximum estimated active requests (100% early drop). -dataset[].cutoffestactive int default=1000 - -## Maximum query queue drain rate. -dataset[].queuedrainrate double default=400 - -## Maximum queued queries drained at once. -dataset[].queuedrainmax double default=40 - -## Factor used when calculating query slowness limit. The formula -## used is: factor * Average Search Time + bias. If a node uses more -## time than this limit, it is considered slow. The default value is -## defined by the defaultslowquerylimitfactor config value in the -## fdispatchrc config. -dataset[].slowquerylimitfactor double default=0.0 - -## Bias used when calculating query slowness limit. -dataset[].slowquerylimitbias double default=100.0 - -## Factor used when calculating docsum slowness limit. The formula -## used is: factor * Average Docsum Time + bias. If a node uses more -## time than this limit, it is considered slow. The default value is -## defined by the defaultslowdocsumlimitfactor config value in the -## fdispatchrc config. -dataset[].slowdocsumlimitfactor double default=0 - -## Bias used when calculating docsum slowness limit. -dataset[].slowdocsumlimitbias double default=100.0 - -## The number of seconds between sending monitor requests to the -## attached search nodes. -dataset[].monitorinterval double default=1.0 - -## The maximum number of seconds to wait for the resultset after -## minimal search coverage is reached. -dataset[].higher_coverage_maxsearchwait double default=1.0 - -## The minimum number of seconds to wait for the resultset while -## full search coverage is still not reached. -dataset[].higher_coverage_minsearchwait double default=0.0 - -## If less time than the base wait has elapsed then boost the timeouts -## above with the difference between the base wait and the elapsed -## time. This compensates somewhat for quick responses (e.g. cached -## response on most nodes) without impacting the timeouts for -## responses that are not so quick. -dataset[].higher_coverage_basesearchwait double default=0.1 - -## The minimum search coverage, as a percentage. -dataset[].minimal_searchcoverage double default=100.0 - -## The maximum number of seconds to wait for document summaries -## after minimum docsum coverage is reached. -dataset[].higher_coverage_maxdocsumwait double default=0.3 - -## The minimum number of seconds to wait for document summaries -## while full docsum coverage is still not reached. -dataset[].higher_coverage_mindocsumwait double default=0.1 - -## If less time than the base wait has elapsed then boost the timeouts -## above with the difference between the base wait and the elapsed -## time. This compensates somewhat for quick responses (e.g. cached -## response on most nodes) without impacting the timeouts for -## responses that are not so quick. -dataset[].higher_coverage_basedocsumwait double default=0.1 - -## The minimum docsum coverage, as a percentage. -dataset[].minimal_docsumcoverage double default=100.0 - -## If random, use standard load balancing. -## if deterministic, use deterministic query forwarding -## If auto, use deterministic when the frequence distribution of -## the queries are relatively well balanced, and fall back to -## standard load balancing when not. -dataset[].querydistribution enum { RANDOM, AUTOMATIC, FIXEDROW } default=AUTOMATIC - -## Minimum coverage for allowing a group to be considered for serving. -dataset[].min_group_coverage double default=100 - -## Required activedocs coverage for a group, as a percentage -dataset[].min_activedocs_coverage double default=97.0 - -## Decay rate used when loadbalancing between groups. -## Lower number will react faster to changes in cluster. -dataset[].latency_decay_rate double default=1000 diff --git a/searchcore/src/vespa/searchcore/grouping/mergingmanager.cpp b/searchcore/src/vespa/searchcore/grouping/mergingmanager.cpp index 6c0d201c28c..1fcb8a56acb 100644 --- a/searchcore/src/vespa/searchcore/grouping/mergingmanager.cpp +++ b/searchcore/src/vespa/searchcore/grouping/mergingmanager.cpp @@ -20,18 +20,14 @@ private: uint32_t _rowBits; uint32_t _partId; uint32_t _rowId; - bool _mld; public: typedef search::aggregation::FS4Hit FS4Hit; - PathMangler(uint32_t partBits, uint32_t rowBits, uint32_t partId, uint32_t rowId, bool mld) - : _partBits(partBits), _rowBits(rowBits), _partId(partId), _rowId(rowId), _mld(mld) {} + PathMangler(uint32_t partBits, uint32_t rowBits, uint32_t partId, uint32_t rowId) + : _partBits(partBits), _rowBits(rowBits), _partId(partId), _rowId(rowId) {} bool check(const vespalib::Identifiable &obj) const override; void execute(vespalib::Identifiable &obj) override __attribute__((noinline)); uint32_t computeNewPath(uint32_t path) const { - if (_mld) { - path = (path + 1) << _partBits; - } path += _partId; if (_rowBits > 0) { path = (path << _rowBits) + _rowId; @@ -70,18 +66,16 @@ MergingManager::~MergingManager() } void -MergingManager::addResult(uint32_t partId, uint32_t rowId, bool mld, +MergingManager::addResult(uint32_t partId, uint32_t rowId, const char *groupResult, size_t groupResultLen) { - _input.push_back(Entry(partId, rowId, mld, groupResult, groupResultLen)); + _input.push_back(Entry(partId, rowId, groupResult, groupResultLen)); } bool MergingManager::needMerge() const { if (_input.size() == 1) { - PathMangler pathMangler(_partBits, _rowBits, - _input[0].partId, _input[0].rowId, - _input[0].mld); + PathMangler pathMangler(_partBits, _rowBits, _input[0].partId, _input[0].rowId); if (pathMangler.computeNewPath(0) == 0) { return false; } @@ -110,7 +104,7 @@ namespace { void mergeOne(MAP & map, const MergingManager::Entry & input, uint32_t partBits, uint32_t rowBits) __attribute__((noinline)); void mergeOne(MAP & map, const MergingManager::Entry & input, uint32_t partBits, uint32_t rowBits) { - PathMangler pathMangler(partBits, rowBits, input.partId, input.rowId, input.mld); + PathMangler pathMangler(partBits, rowBits, input.partId, input.rowId); vespalib::nbostream is(input.data, input.length); vespalib::NBOSerializer nis(is); uint32_t cnt = 0; diff --git a/searchcore/src/vespa/searchcore/grouping/mergingmanager.h b/searchcore/src/vespa/searchcore/grouping/mergingmanager.h index ea2c62909b9..08349e8629a 100644 --- a/searchcore/src/vespa/searchcore/grouping/mergingmanager.h +++ b/searchcore/src/vespa/searchcore/grouping/mergingmanager.h @@ -4,8 +4,7 @@ #include <memory> #include <vector> -namespace search { -namespace grouping { +namespace search::grouping { /** * Wrapper class used to handle merging of grouping results. All input @@ -16,17 +15,16 @@ class MergingManager public: /** * Simple wrapper for all the grouping results from a single - * search/fdispatch node. + * search node. **/ struct Entry { uint32_t partId; uint32_t rowId; - bool mld; const char *data; size_t length; - Entry(uint32_t part, uint32_t row, bool m, const char *pt, size_t len) - : partId(part), rowId(row), mld(m), data(pt), length(len) {} + Entry(uint32_t part, uint32_t row, const char *pt, size_t len) + : partId(part), rowId(row), data(pt), length(len) {} }; private: @@ -61,11 +59,10 @@ public: * * @param partId which partition these results came from * @param rowId which row these results came from - * @param mld true if the node below is a dispatch node * @param groupSpec group spec * @param groupSpecLen length of the group spec **/ - void addResult(uint32_t partId, uint32_t rowId, bool mld, + void addResult(uint32_t partId, uint32_t rowId, const char *groupResult, size_t groupResultLen); /** @@ -98,6 +95,4 @@ public: char *stealGroupResult(); }; -} // namespace search::grouping -} // namespace search - +} diff --git a/searchlib/CMakeLists.txt b/searchlib/CMakeLists.txt index b78f4fc89ac..e81d83ddefa 100644 --- a/searchlib/CMakeLists.txt +++ b/searchlib/CMakeLists.txt @@ -206,7 +206,6 @@ vespa_define_module( src/tests/sort src/tests/sortresults src/tests/sortspec - src/tests/stackdumpiterator src/tests/stringenum src/tests/tensor/dense_tensor_store src/tests/transactionlog diff --git a/searchlib/src/tests/stackdumpiterator/.gitignore b/searchlib/src/tests/stackdumpiterator/.gitignore deleted file mode 100644 index 6f8239c6cc1..00000000000 --- a/searchlib/src/tests/stackdumpiterator/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -*.core -.depend -Makefile -core -core.* -stackdumpiteratortest -searchlib_stackdumpiteratortest_app diff --git a/searchlib/src/tests/stackdumpiterator/CMakeLists.txt b/searchlib/src/tests/stackdumpiterator/CMakeLists.txt deleted file mode 100644 index 124373406f5..00000000000 --- a/searchlib/src/tests/stackdumpiterator/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(searchlib_stackdumpiteratortest_app TEST - SOURCES - stackdumpiteratortest.cpp - DEPENDS - searchlib -) -vespa_add_test(NAME searchlib_stackdumpiteratortest_app COMMAND searchlib_stackdumpiteratortest_app - *1000) diff --git a/searchlib/src/tests/stackdumpiterator/stackdumpiteratortest.cpp b/searchlib/src/tests/stackdumpiterator/stackdumpiteratortest.cpp deleted file mode 100644 index 479ec67813d..00000000000 --- a/searchlib/src/tests/stackdumpiterator/stackdumpiteratortest.cpp +++ /dev/null @@ -1,329 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - -#include "stackdumpiteratortest.h" -#include <vespa/searchlib/parsequery/simplequerystack.h> -#include <vespa/searchlib/parsequery/stackdumpiterator.h> -#include <vespa/fastos/time.h> - -#define NUMTESTS 6 - -int -StackDumpIteratorTest::Main() -{ - int doTest[NUMTESTS]; - int low, high, accnum, num; - int indicator; - bool verify = false; - int multiplier = 1; - bool failed = false; - - if (_argc == 1) { - Usage(_argv[0]); - return 1; - } - - // default initialize to not run any tests. - for (int n = 0; n < NUMTESTS; n++) - doTest[n] = 0; - - // parse the command line arguments - for (int i = 1; i < _argc; i++) { - low = 0; - high = NUMTESTS - 1; - char *p = _argv[i]; - - // Check if a multiplier is specified - if (*p == '*') { - p++; - accnum = 0; - while (*p != '\0') { - num = *p - '0'; - accnum = accnum * 10 + num; - p++; - } - multiplier = accnum; - continue; - } - - // Default is to run the tests specified, unless the first char is '/' - indicator = 1; - if (*p == '/') { - p++; - indicator = 0; - } - - // Find the first number - accnum = 0; - while (*p != '-' && *p != '\0') { - num = *p - '0'; - accnum = accnum * 10 + num; - p++; - } - if (accnum >= NUMTESTS) - continue; - low = accnum; - // Check for range operator - if (*p == '-') { - p++; - // Find the second number - accnum = 0; - while (*p != '\0') { - num = *p - '0'; - accnum = accnum * 10 + num; - p++; - } - if (accnum > 0) - high = accnum < NUMTESTS ? accnum : NUMTESTS-1; - } else - high = low; - - // Indicate the runrequest for the desired range. - for (int j = low; j <= high; j++) - doTest[j] = indicator; - } - - // Remove unused tests. - // doTest[1] = 0; - - // Remember time - if (multiplier > 1) { - printf("Running all tests %d times.\n", multiplier); - verify = false; - } else { - verify = true; - } - - int testCnt = 0; - - FastOS_Time timer; - timer.SetNow(); - - // Actually run the tests that we wanted. - for (int j = 0; j < multiplier; j++) - for (int k = 0; k < NUMTESTS; k++) - if (doTest[k] == 1) { - if (!RunTest(k, verify)) - failed = true; - testCnt++; - } - - // Print time taken - double timeTaken = timer.MilliSecsToNow(); - - printf("Time taken : %f ms\n", timeTaken); - printf("Number of tests run: %d\n", testCnt); - double avgTestPrMSec = static_cast<double>(testCnt) / timeTaken; - printf("Tests pr Sec: %f\n", avgTestPrMSec * 1000.0); - - return failed ? 1 : 0; -} - -#define ITERATOR_NOERROR 0x0 -#define ITERATOR_ERROR_WRONG_NUM 0x1 -#define ITERATOR_ERROR_WRONG_TYPE 0x2 -#define ITERATOR_ERROR_WRONG_ARITY 0x4 -#define ITERATOR_ERROR_WRONG_INDEX 0x10 -#define ITERATOR_ERROR_WRONG_TERM 0x20 -#define ITERATOR_ERROR_WRONG_GETINDEX 0x40 -#define ITERATOR_ERROR_WRONG_GETTERM 0x80 -#define ITERATOR_ERROR_WRONG_SIZE 0x100 - -bool -StackDumpIteratorTest::ShowResult(int testNo, - search::SimpleQueryStackDumpIterator &actual, - search::SimpleQueryStack &correct, - unsigned int expected) -{ - if (expected == ITERATOR_NOERROR) { - vespalib::string query = search::SimpleQueryStack::StackbufToString(actual.getStack()); - printf("query = %s\n", query.c_str()); - } - unsigned int results = 0; - - int num = 0; - - search::ParseItem *item; - - printf("%03d: ", testNo); - - while (actual.next()) { - vespalib::stringref idx = actual.getIndexName(); - vespalib::stringref term = actual.getTerm(); - -#if 0 - printf("StackItem #%d: %d %d '%.*s:%.*s'\n", - actual.getNum(), - actual.getType(), - actual.getArity(), - idx.size(), idx.c_str(), - term.size(), term.c_str()); -#endif - - item = correct.Pop(); - - if (num++ != actual.getNum()) { - results |= ITERATOR_ERROR_WRONG_NUM; - delete item; - break; - } - if (item->Type() != actual.getType()) { - results |= ITERATOR_ERROR_WRONG_TYPE; - delete item; - break; - } - if (item->_arity != actual.getArity()) { - results |= ITERATOR_ERROR_WRONG_ARITY; - delete item; - break; - } - if (strncmp(item->_indexName.c_str(), idx.data(), idx.size()) != 0) { - results |= ITERATOR_ERROR_WRONG_INDEX; - delete item; - break; - } - if (strncmp(item->_term.c_str(), term.data(), term.size()) != 0) { - results |= ITERATOR_ERROR_WRONG_TERM; - delete item; - break; - } - - delete item; - } - if (correct.GetSize() != 0) results |= ITERATOR_ERROR_WRONG_SIZE; - - if (results == expected) - printf("ok\n"); - else - printf("fail. exp: %x, result: %x\n", expected, results); - - return results == expected; -} - -/** - * - * @param testno The test to run. - * @param verify Verify the result of the test. - */ -bool -StackDumpIteratorTest::RunTest(int testno, bool verify) -{ - search::SimpleQueryStack stack; - search::RawBuf buf(32768); - - switch (testno) { - case 0: - { - // Simple term query - stack.Push(new search::ParseItem(search::ParseItem::ITEM_TERM, "foobar")); - - stack.AppendBuffer(&buf); - search::SimpleQueryStackDumpIterator si(vespalib::stringref(buf.GetDrainPos(), buf.GetUsedLen())); - - if (verify) - return ShowResult(testno, si, stack, ITERATOR_NOERROR); - break; - } - - case 1: - { - // multi term query - stack.Push(new search::ParseItem(search::ParseItem::ITEM_TERM, "foo", "foobar")); - stack.Push(new search::ParseItem(search::ParseItem::ITEM_TERM, "foo", "xyzzy")); - stack.Push(new search::ParseItem(search::ParseItem::ITEM_TERM, "bar", "baz")); - stack.Push(new search::ParseItem(search::ParseItem::ITEM_OR, 2)); - stack.Push(new search::ParseItem(search::ParseItem::ITEM_AND, 2)); - - stack.AppendBuffer(&buf); - search::SimpleQueryStackDumpIterator si(vespalib::stringref(buf.GetDrainPos(), buf.GetUsedLen())); - - if (verify) - return ShowResult(testno, si, stack, ITERATOR_NOERROR); - break; - } - - case 2: - { - // all stack items - stack.Push(new search::ParseItem(search::ParseItem::ITEM_TERM, "foo", "foobar")); - stack.Push(new search::ParseItem(search::ParseItem::ITEM_NUMTERM, "foo", "[0;22]")); - stack.Push(new search::ParseItem(search::ParseItem::ITEM_PREFIXTERM, "bar", "baz")); - stack.Push(new search::ParseItem(search::ParseItem::ITEM_PHRASE, 3, "bar")); - stack.Push(new search::ParseItem(search::ParseItem::ITEM_SAME_ELEMENT, 3, "bar")); - stack.Push(new search::ParseItem(search::ParseItem::ITEM_OR, 2)); - stack.Push(new search::ParseItem(search::ParseItem::ITEM_AND, 3)); - stack.Push(new search::ParseItem(search::ParseItem::ITEM_RANK, 5)); - stack.Push(new search::ParseItem(search::ParseItem::ITEM_NOT, 3)); - - stack.AppendBuffer(&buf); - search::SimpleQueryStackDumpIterator si(vespalib::stringref(buf.GetDrainPos(), buf.GetUsedLen())); - - if (verify) - return ShowResult(testno, si, stack, ITERATOR_NOERROR); - break; - } - - case 3: - { - // malicous type in buffer - stack.Push(new search::ParseItem(search::ParseItem::ITEM_TERM, "foo", "foobar")); - stack.AppendBuffer(&buf); - *buf.GetWritableDrainPos(0) = 0x1e; - search::SimpleQueryStackDumpIterator si(vespalib::stringref(buf.GetDrainPos(), buf.GetUsedLen())); - if (verify) - return ShowResult(testno, si, stack, ITERATOR_ERROR_WRONG_SIZE); - break; - } - - case 4: - { - // malicous length in buffer - stack.Push(new search::ParseItem(search::ParseItem::ITEM_TERM, "foo", "foobar")); - stack.AppendBuffer(&buf); - *buf.GetWritableDrainPos(1) = 0xba; - search::SimpleQueryStackDumpIterator si(vespalib::stringref(buf.GetDrainPos(), buf.GetUsedLen())); - if (verify) - return ShowResult(testno, si, stack, ITERATOR_ERROR_WRONG_SIZE); - break; - } - - case 5: { - stack.Push(new search::ParseItem(search::ParseItem::ITEM_TERM, "foo", "foobar")); - stack.Push(new search::ParseItem(search::ParseItem::ITEM_TERM, "foo1", "foobar1")); - stack.Push(new search::ParseItem(search::ParseItem::ITEM_TERM, "foo2", "foobar2")); - stack.Push(new search::ParseItem(search::ParseItem::ITEM_WORD_ALTERNATIVES, 3, "wa")); - - stack.AppendBuffer(&buf); - search::SimpleQueryStackDumpIterator si(vespalib::stringref(buf.GetDrainPos(), buf.GetUsedLen())); - - if (verify) - return ShowResult(testno, si, stack, ITERATOR_NOERROR); - break; - } - - - default: - { - printf("%03d: no such test\n", testno); - } - } - - return true; -} - -void -StackDumpIteratorTest::Usage(char *progname) -{ - printf("%s {testnospec}+\n\ - Where testnospec is:\n\ - num: single test\n\ - num-num: inclusive range (open range permitted)\n",progname); - printf("There are tests from %d to %d\n\n", 0, NUMTESTS-1); -} - -int -main(int argc, char** argv) -{ - StackDumpIteratorTest tester; - return tester.Entry(argc, argv); -} - diff --git a/searchlib/src/tests/stackdumpiterator/stackdumpiteratortest.h b/searchlib/src/tests/stackdumpiterator/stackdumpiteratortest.h deleted file mode 100644 index bca1dd45893..00000000000 --- a/searchlib/src/tests/stackdumpiterator/stackdumpiteratortest.h +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - -#pragma once - -#include <vespa/searchlib/parsequery/stackdumpiterator.h> -#include <vespa/fastos/app.h> - -namespace search { class SimpleQueryStack; } - -class StackDumpIteratorTest : public FastOS_Application -{ - int Main() override; - void Usage(char *progname); - bool ShowResult(int testNo, search::SimpleQueryStackDumpIterator &actual, search::SimpleQueryStack &correct, unsigned int expected); - bool RunTest(int i, bool verify); -}; diff --git a/searchlib/src/vespa/searchlib/common/docstamp.h b/searchlib/src/vespa/searchlib/common/docstamp.h index 41451ee052d..1b02e18795f 100644 --- a/searchlib/src/vespa/searchlib/common/docstamp.h +++ b/searchlib/src/vespa/searchlib/common/docstamp.h @@ -5,7 +5,7 @@ namespace search { // since everything is real-time, the docstamp does no longer change -// as before. The value 0 still means invalid in fdispatch, and the +// as before. The value 0 still means invalid , and the // value 42 was selected randomly to reflect a valid value. Defined // here for a single source of truth. diff --git a/searchlib/src/vespa/searchlib/parsequery/parse.cpp b/searchlib/src/vespa/searchlib/parsequery/parse.cpp index 0911459655c..c8fcce037ae 100644 --- a/searchlib/src/vespa/searchlib/parsequery/parse.cpp +++ b/searchlib/src/vespa/searchlib/parsequery/parse.cpp @@ -58,15 +58,6 @@ void assert_type(ParseItem::ItemType type) } -ParseItem::ParseItem(ItemType type, vespalib::stringref idx, const char *term) - : PARSEITEM_DEFAULT_CONSTRUCTOR_LIST -{ - assert_type(type); - SetType(type); - SetIndex(idx.data()); - SetTerm(term); -} - ParseItem::ParseItem(ItemType type, const char *term) : PARSEITEM_DEFAULT_CONSTRUCTOR_LIST { diff --git a/searchlib/src/vespa/searchlib/parsequery/parse.h b/searchlib/src/vespa/searchlib/parsequery/parse.h index 15fb0e316e8..9c0e76d2441 100644 --- a/searchlib/src/vespa/searchlib/parsequery/parse.h +++ b/searchlib/src/vespa/searchlib/parsequery/parse.h @@ -72,23 +72,19 @@ public: * (juniper/src/query.h) */ enum ItemCreator { - CREA_ORIG = 0, // Original user query - CREA_FILTER // Automatically applied filter (no specific type) + CREA_ORIG = 0 // Original user query }; enum ItemFeatures { - IF_MASK = 0xE0, // mask for item features IF_WEIGHT = 0x20, // item has rank weight IF_UNIQUEID = 0x40, // item has unique id IF_FLAGS = 0x80, // item has extra flags - IF_SUPPORTED_MASK = 0xE0 // mask for supported item features }; enum ItemFlags { IFLAG_NORANK = 0x00000001, // this term should not be ranked (not exposed to rank framework) IFLAG_SPECIALTOKEN = 0x00000002, IFLAG_NOPOSITIONDATA = 0x00000004, // we should not use position data when ranking this term - IFLAG_FILTER = 0x00000008 }; private: @@ -160,15 +156,6 @@ public: ParseItem(ItemType type, int arity, const char *index); /** - * Overloaded constructor for ParseItem. Used for TERMs. - * - * @param type The type of the ParseItem. - * @param idx The name of the index of the ParseItem. - * @param term The actual term string of the ParseItem. - */ - ParseItem(ItemType type, vespalib::stringref index, const char *term); - -/** * Overloaded constructor for ParseItem. Used for TERMs without index. * * @param type The type of the ParseItem. @@ -215,8 +202,6 @@ public: * @param buf Pointer to a buffer containing the encoded contents. */ void AppendBuffer(RawBuf *buf) const; - - size_t GetBufferLen() const; }; } diff --git a/searchlib/src/vespa/searchlib/parsequery/simplequerystack.cpp b/searchlib/src/vespa/searchlib/parsequery/simplequerystack.cpp index dac446df7d5..0908132aa87 100644 --- a/searchlib/src/vespa/searchlib/parsequery/simplequerystack.cpp +++ b/searchlib/src/vespa/searchlib/parsequery/simplequerystack.cpp @@ -14,8 +14,7 @@ namespace search { SimpleQueryStack::SimpleQueryStack() : _numItems(0), - _stack(nullptr), - _FP_queryOK(true) + _stack(nullptr) { } @@ -27,31 +26,12 @@ SimpleQueryStack::~SimpleQueryStack() void SimpleQueryStack::Push(ParseItem *item) { - // Check if query OK for FirstPage - _FP_queryOK &= - ( item->Type() != ParseItem::ITEM_UNDEF - && item->Type() != ParseItem::ITEM_PAREN - ); - - item->_next = _stack; _stack = item; _numItems++; } -ParseItem * -SimpleQueryStack::Pop() -{ - ParseItem *item = _stack; - if (_stack != nullptr) { - _numItems--; - _stack = _stack->_next; - item->_next = nullptr; - } - return item; -} - void SimpleQueryStack::AppendBuffer(RawBuf *buf) const { @@ -67,289 +47,4 @@ SimpleQueryStack::GetSize() return _numItems; } -bool -SimpleQueryStack::_FP_isAllowed() -{ - return _FP_queryOK; -} - -class ItemName { -public: - ItemName() { - memset(_name, 'X', sizeof(_name)); - _name[ParseItem::ITEM_OR] = '|'; - _name[ParseItem::ITEM_WEAK_AND] = 'w'; - _name[ParseItem::ITEM_EQUIV] = 'E'; - _name[ParseItem::ITEM_AND] = '&'; - _name[ParseItem::ITEM_NOT] = '-'; - _name[ParseItem::ITEM_ANY] = '?'; - _name[ParseItem::ITEM_RANK] = '%'; - _name[ParseItem::ITEM_NEAR] = 'N'; - _name[ParseItem::ITEM_ONEAR] = 'O'; - _name[ParseItem::ITEM_NUMTERM] = '#'; - _name[ParseItem::ITEM_TERM] = 't'; - _name[ParseItem::ITEM_PURE_WEIGHTED_STRING] = 'T'; - _name[ParseItem::ITEM_PURE_WEIGHTED_LONG] = 'L'; - _name[ParseItem::ITEM_PREFIXTERM] = '*'; - _name[ParseItem::ITEM_SUBSTRINGTERM] = 's'; - _name[ParseItem::ITEM_EXACTSTRINGTERM] = 'e'; - _name[ParseItem::ITEM_SUFFIXTERM] = 'S'; - _name[ParseItem::ITEM_PHRASE] = '"'; - _name[ParseItem::ITEM_SAME_ELEMENT] = 'M'; - _name[ParseItem::ITEM_WEIGHTED_SET] = 'W'; - _name[ParseItem::ITEM_DOT_PRODUCT] = 'D'; - _name[ParseItem::ITEM_WAND] = 'A'; - _name[ParseItem::ITEM_PREDICATE_QUERY] = 'P'; - _name[ParseItem::ITEM_REGEXP] = '^'; - _name[ParseItem::ITEM_WORD_ALTERNATIVES] = 'a'; - } - char operator[] (ParseItem::ItemType i) const { return _name[i]; } - char operator[] (size_t i) const { return _name[i]; } -private: - char _name[ParseItem::ITEM_MAX]; -}; - -static ItemName _G_ItemName; - -vespalib::string -SimpleQueryStack::StackbufToString(vespalib::stringref theBuf) -{ - vespalib::string result; - - /* - * This is a slightly bogus estimate of the size required. It should - * be enough in most cases, but it is possible to break it in rare and - * artificial circumstances. - * - * The simple operators use 8 bytes in the buffer. - * The string representation has 3 overhead chars, leaving 5 chars - * for the printed representation of the arity, i.e. < 10^5. - * - * The phrase operator uses 12 bytes + the length of the index string. - * The string representation has 5 overhead chars, leaving 7 chars - * for the total printed representation of the length of the index. - * If the index is 0, then the arity may use 6 chars, i.e. < 10^6. - * - * The term operator uses 12 bytes + the length of the index and term string. - * The string representation has 6 overhead chars, leaving 6 chars - * for the total printed representation of the index and term lengths. - * If for instance the index is 0, then the term must be shorter - * than 10^5 characters. - */ - - uint8_t rawtype = 0; - uint32_t type = 0, arity = 0, arg1 = 0; - const char *idxRef; - const char *termRef; - uint32_t idxRefLen; - uint32_t termRefLen; - - const char *p = theBuf.begin(); - const char *ep = theBuf.end(); - uint64_t tmp(0); - int64_t tmpI64(0); - uint8_t flags(0); - while (p < ep) { - vespalib::string metaStr; - rawtype = *p++; - type = ParseItem::GetType(rawtype); - if (ParseItem::GetFeature_Weight(rawtype)) { - int64_t tmpLong(0); - p += vespalib::compress::Integer::decompress(tmpLong, p); - metaStr.append("(w:"); - metaStr.append(make_string("%" PRId64, tmpLong)); - metaStr.append(")"); - } - if (ParseItem::getFeature_UniqueId(rawtype)) { - p += vespalib::compress::Integer::decompressPositive(tmp, p); - metaStr.append("(u:"); - metaStr.append(make_string("%" PRIu64, tmp)); - metaStr.append(")"); - } - if (ParseItem::getFeature_Flags(rawtype)) { - flags = *p++; - metaStr.append("(f:"); - metaStr.append(make_string("%d", flags)); - metaStr.append(")"); - } - if (ParseItem::GetCreator(flags) != ParseItem::CREA_ORIG) { - metaStr.append("(c:"); - metaStr.append(make_string("%d", ParseItem::GetCreator(flags))); - metaStr.append(")"); - } - - metaStr.append('/'); - result.append(metaStr); - - switch (type) { - case ParseItem::ITEM_OR: - case ParseItem::ITEM_AND: - case ParseItem::ITEM_EQUIV: - case ParseItem::ITEM_NOT: - case ParseItem::ITEM_RANK: - case ParseItem::ITEM_ANY: - p += vespalib::compress::Integer::decompressPositive(tmp, p); - arity = tmp; - result.append(make_string("%c/%d~", _G_ItemName[type], arity)); - break; - case ParseItem::ITEM_NEAR: - case ParseItem::ITEM_ONEAR: - p += vespalib::compress::Integer::decompressPositive(tmp, p); - arity = tmp; - p += vespalib::compress::Integer::decompressPositive(tmp, p); - arg1 = tmp; - result.append(make_string("%c/%d/%d~", _G_ItemName[type], arity, arg1)); - break; - case ParseItem::ITEM_WEAK_AND: - p += vespalib::compress::Integer::decompressPositive(tmp, p); - arity = tmp; - p += vespalib::compress::Integer::decompressPositive(tmp, p); - arg1 = tmp; - p += vespalib::compress::Integer::decompressPositive(tmp, p); - idxRefLen = tmp; - idxRef = p; - p += idxRefLen; - result.append( - make_string("%c/%d/%d/%d:%.*s~", _G_ItemName[type], arity, arg1, idxRefLen, idxRefLen, idxRef)); - break; - case ParseItem::ITEM_SAME_ELEMENT: - p += vespalib::compress::Integer::decompressPositive(tmp, p); - arity = tmp; - p += vespalib::compress::Integer::decompressPositive(tmp, p); - idxRefLen = tmp; - idxRef = p; - p += idxRefLen; - result.append(make_string("%c/%d/%d:%.*s~", _G_ItemName[type], arity, idxRefLen, idxRefLen, idxRef)); - break; - - case ParseItem::ITEM_NUMTERM: - case ParseItem::ITEM_TERM: - case ParseItem::ITEM_PREFIXTERM: - case ParseItem::ITEM_SUBSTRINGTERM: - case ParseItem::ITEM_EXACTSTRINGTERM: - case ParseItem::ITEM_SUFFIXTERM: - case ParseItem::ITEM_REGEXP: - p += vespalib::compress::Integer::decompressPositive(tmp, p); - idxRefLen = tmp; - idxRef = p; - p += idxRefLen; - p += vespalib::compress::Integer::decompressPositive(tmp, p); - termRefLen = tmp; - termRef = p; - p += termRefLen; - result.append(make_string("%c/%d:%.*s/%d:%.*s~", _G_ItemName[type], - idxRefLen, idxRefLen, idxRef, termRefLen, termRefLen, termRef)); - break; - case ParseItem::ITEM_PURE_WEIGHTED_STRING: - p += vespalib::compress::Integer::decompressPositive(tmp, p); - termRefLen = tmp; - termRef = p; - p += termRefLen; - result.append(make_string("%c/%d:%.*s~", _G_ItemName[type], termRefLen, termRefLen, termRef)); - break; - - case ParseItem::ITEM_PURE_WEIGHTED_LONG: - tmpI64 = vespalib::nbo::n2h(*reinterpret_cast<const int64_t *>(p)); - p += sizeof(uint64_t); - result.append(make_string("%c/%" PRId64, _G_ItemName[type], tmpI64)); - break; - - case ParseItem::ITEM_PHRASE: - case ParseItem::ITEM_WEIGHTED_SET: - case ParseItem::ITEM_DOT_PRODUCT: - case ParseItem::ITEM_WAND: - p += vespalib::compress::Integer::decompressPositive(tmp, p); - arity = tmp; - p += vespalib::compress::Integer::decompressPositive(tmp, p); - idxRefLen = tmp; - idxRef = p; - p += idxRefLen; - if (type == ParseItem::ITEM_WAND) { - p += vespalib::compress::Integer::decompressPositive(tmp, p); - uint32_t targetNumHits = tmp; - double scoreThreshold = vespalib::nbo::n2h(*reinterpret_cast<const double *>(p)); - p += sizeof(double); - double thresholdBoostFactor = vespalib::nbo::n2h(*reinterpret_cast<const double *>(p)); - p += sizeof(double); - result.append(make_string("%c/%d/%d:%.*s(%u,%f,%f)~", _G_ItemName[type], arity, idxRefLen, - idxRefLen, idxRef, targetNumHits, scoreThreshold, thresholdBoostFactor)); - } else { - result.append( - make_string("%c/%d/%d:%.*s~", _G_ItemName[type], arity, idxRefLen, idxRefLen, idxRef)); - } - break; - - case ParseItem::ITEM_PREDICATE_QUERY: { - idxRefLen = static_cast<uint32_t>(ReadCompressedPositiveInt(p)); - idxRef = p; - p += idxRefLen; - size_t feature_count = ReadCompressedPositiveInt(p); - result.append( - make_string("%c/%d:%.*s/%zu(", _G_ItemName[type], idxRefLen, idxRefLen, idxRef, feature_count)); - for (size_t i = 0; i < feature_count; ++i) { - vespalib::string key = ReadString(p); - vespalib::string value = ReadString(p); - uint64_t sub_queries = ReadUint64(p); - result.append(make_string("%s:%s:%" PRIx64, key.c_str(), value.c_str(), sub_queries)); - if (i < feature_count - 1) { - result.append(','); - } - } - - size_t range_feature_count = ReadCompressedPositiveInt(p); - result.append(make_string(")/%zu(", range_feature_count)); - for (size_t i = 0; i < range_feature_count; ++i) { - vespalib::string key = ReadString(p); - uint64_t value = ReadUint64(p); - uint64_t sub_queries = ReadUint64(p); - result.append(make_string("%s:%" PRIu64 ":%" PRIx64, key.c_str(), value, sub_queries)); - if (i < range_feature_count - 1) { - result.append(','); - } - } - result.append(")~"); - break; - } - case ParseItem::ITEM_WORD_ALTERNATIVES: { - idxRefLen = static_cast<uint32_t>(ReadCompressedPositiveInt(p)); - idxRef = p; - p += idxRefLen; - arity = ReadCompressedPositiveInt(p); - result.append(make_string("%c/%d:%.*s/%d(", _G_ItemName[type], idxRefLen, idxRefLen, idxRef, arity)); - break; - } - default: - LOG(error, "Unhandled type %d", type); - LOG_ABORT("should not be reached"); - } - } - return result; -} - -vespalib::string -SimpleQueryStack::ReadString(const char *&p) -{ - uint64_t tmp; - p += vespalib::compress::Integer::decompressPositive(tmp, p); - vespalib::string s(p, tmp); - p += s.size(); - return s; -} - -uint64_t -SimpleQueryStack::ReadUint64(const char *&p) -{ - uint64_t l = static_cast<uint64_t>(vespalib::nbo::n2h(*(const uint64_t *)(const void *)p)); - p += sizeof(uint64_t); - return l; -} - -uint64_t -SimpleQueryStack::ReadCompressedPositiveInt(const char *&p) -{ - uint64_t tmp; - p += vespalib::compress::Integer::decompressPositive(tmp, p); - return tmp; -} - } // namespace search diff --git a/searchlib/src/vespa/searchlib/parsequery/simplequerystack.h b/searchlib/src/vespa/searchlib/parsequery/simplequerystack.h index 27e85821cf1..3fff9103b2b 100644 --- a/searchlib/src/vespa/searchlib/parsequery/simplequerystack.h +++ b/searchlib/src/vespa/searchlib/parsequery/simplequerystack.h @@ -17,15 +17,7 @@ namespace search { */ class SimpleQueryStack { - private: - SimpleQueryStack(const SimpleQueryStack &); - SimpleQueryStack& operator=(const SimpleQueryStack &); - - static vespalib::string ReadString(const char *&p); - static uint64_t ReadUint64(const char *&p); - static uint64_t ReadCompressedPositiveInt(const char *&p); - /** The number of items on the stack. */ uint32_t _numItems; @@ -35,10 +27,9 @@ private: */ search::ParseItem *_stack; - /** Is this query OK for FirstPage? */ - bool _FP_queryOK; - public: + SimpleQueryStack(const SimpleQueryStack &) = delete; + SimpleQueryStack& operator=(const SimpleQueryStack &) = delete; /** * Constructor for SimpleQueryStack. */ @@ -52,16 +43,7 @@ public: * @param item The search::ParseItem to push. */ void Push(search::ParseItem *item); - /** - * Pop an item of the stack. - * @return Pointer to the search::ParseItem poped, or NULL if stack is empty. - */ - search::ParseItem *Pop(); - /** - * Top node of the stack. - * @return Pointer to the top search::ParseItem, or NULL if stack is empty. - */ - search::ParseItem *Top() { return _stack; } + /** * Encode the contents of the stack in a binary buffer. @@ -81,18 +63,6 @@ public: * @param numItems The number of items on the stack. */ void SetSize(uint32_t numItems) { _numItems = numItems; } - - /** - * Is it possible to run this query on FirstPage? - * @return true if ok - */ - bool _FP_isAllowed(); - /** - * Make a string representation of the search::RawBuf representing a querystack. - * @param theBuf The querystack encoded buffer. - * @return a fresh string - */ - static vespalib::string StackbufToString(vespalib::stringref theBuf); }; } // namespace search diff --git a/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.cpp b/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.cpp index 2f59bb30847..18cb2025425 100644 --- a/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.cpp +++ b/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.cpp @@ -29,8 +29,7 @@ SimpleQueryStackDumpIterator::SimpleQueryStackDumpIterator(vespalib::stringref b _currIndexNameLen(0), _currTerm(nullptr), _currTermLen(0), - _generatedTerm(), - _currNum(-1) + _generatedTerm() { } @@ -288,9 +287,7 @@ SimpleQueryStackDumpIterator::next() default: // Unknown item, so report that no more are available return false; - break; } - _currNum++; _currEnd = p; // We should not have passed the buffer diff --git a/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.h b/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.h index c1049aabc55..82e99b786d7 100644 --- a/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.h +++ b/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.h @@ -60,9 +60,6 @@ private: size_t _currTermLen; vespalib::asciistream _generatedTerm; - /** The number of the current item */ - int _currNum; - vespalib::string readString(const char *&p); uint64_t readUint64(const char *&p); uint64_t readCompressedPositiveInt(const char *&p); @@ -90,13 +87,6 @@ public: bool next(); /** - * Get the number of the current item. - * - * @return The ordinal of the current item. -1 if at the start. - */ - int getNum() const { return _currNum; } - - /** * Get the type of the current item. * @return the type. */ diff --git a/searchlib/src/vespa/searchlib/query/query.cpp b/searchlib/src/vespa/searchlib/query/query.cpp index 5887ba395eb..73ad9b5f458 100644 --- a/searchlib/src/vespa/searchlib/query/query.cpp +++ b/searchlib/src/vespa/searchlib/query/query.cpp @@ -1,5 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "query.h" +#include <vespa/searchlib/parsequery/stackdumpiterator.h> #include <vespa/vespalib/objects/visit.hpp> namespace search { diff --git a/searchlib/src/vespa/searchlib/query/query.h b/searchlib/src/vespa/searchlib/query/query.h index b9bcd76d869..f86e7861d06 100644 --- a/searchlib/src/vespa/searchlib/query/query.h +++ b/searchlib/src/vespa/searchlib/query/query.h @@ -3,7 +3,7 @@ #include "queryterm.h" #include "base.h" -#include <vespa/searchlib/parsequery/stackdumpiterator.h> +#include <vespa/searchlib/parsequery/parse.h> namespace search { diff --git a/searchlib/src/vespa/searchlib/query/querynode.cpp b/searchlib/src/vespa/searchlib/query/querynode.cpp index fcc539658d0..234e64b2718 100644 --- a/searchlib/src/vespa/searchlib/query/querynode.cpp +++ b/searchlib/src/vespa/searchlib/query/querynode.cpp @@ -1,6 +1,7 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "query.h" +#include <vespa/searchlib/parsequery/stackdumpiterator.h> #include <vespa/log/log.h> LOG_SETUP(".vsm.querynode"); diff --git a/searchlib/src/vespa/searchlib/query/tree/stackdumpquerycreator.h b/searchlib/src/vespa/searchlib/query/tree/stackdumpquerycreator.h index a208ae357fa..dfb0c75a695 100644 --- a/searchlib/src/vespa/searchlib/query/tree/stackdumpquerycreator.h +++ b/searchlib/src/vespa/searchlib/query/tree/stackdumpquerycreator.h @@ -42,10 +42,6 @@ public: LOG(error, "Unable to create query tree from stack dump. Failed at position %ld out of %ld bytes %s", queryStack.getPosition(), stack.size(), builder.error().c_str()); LOG(error, "Raw QueryStack = %s", vespalib::HexDump(stack.data(), stack.size()).toString().c_str()); - if (LOG_WOULD_LOG(debug)) { - vespalib::string query = SimpleQueryStack::StackbufToString(stack); - LOG(error, "Error = %s, QueryStack = %s", builder.error().c_str(), query.c_str()); - } } return builder.build(); } diff --git a/security-utils/CMakeLists.txt b/security-utils/CMakeLists.txt index 9f5bd1657df..a6fe917c322 100644 --- a/security-utils/CMakeLists.txt +++ b/security-utils/CMakeLists.txt @@ -1,3 +1,2 @@ # Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. install_fat_java_artifact(security-utils) -install_java_artifact_dependencies(security-utils) diff --git a/streamingvisitors/doc/SearchVisitorProtocol.html b/streamingvisitors/doc/SearchVisitorProtocol.html index 6a9ac02f0d0..aa2217444bf 100644 --- a/streamingvisitors/doc/SearchVisitorProtocol.html +++ b/streamingvisitors/doc/SearchVisitorProtocol.html @@ -33,7 +33,7 @@ binary. It processes queries and docsum requests and returns SearchResult and DocumentSummary objects to the client. It uses Vespa Streaming Matcher (VSM) to generate the search results and document summaries.</P> -<P>Since the distributors in VDS do not have fdispatch capability, +<P>Since the distributors in VDS do not have dispatch capability, that is implemented in the QRS(client). It must collect all messages received, merge them and present them to its liking.</P> <H2 CLASS="western">Initiation</H2> diff --git a/vespalog/README b/vespalog/README index 697e02c6dbc..a7366ffe9b1 100644 --- a/vespalog/README +++ b/vespalog/README @@ -112,12 +112,12 @@ useful for enabling debug output only in parts of a program. Some hypothetical examples: -In the application "fdispatch" there could be some files that have +In the application "dispatch" there could be some files that have code primarily for query parsing. It also links with the library "fnet" for communicating. in main.cpp the following is done: -LOG_SETUP("fdispatch"); +LOG_SETUP("dispatch"); LOG_RCSID("$Id$"); In the .cpp files that worry about query parsing, the following is done: diff --git a/vespalog/README.events b/vespalog/README.events index 7d9e70eae97..c3dfa3a9438 100644 --- a/vespalog/README.events +++ b/vespalog/README.events @@ -41,7 +41,7 @@ is not required to track processes, but is useful in cases where a sub-process may fail during startup. Example: -starting name=fdispatch +starting name=dispatch Event: started @@ -50,7 +50,7 @@ Payload: name=<name> The "started" event is sent by a process that just started up. Example: -started name=fdispatch +started name=dispatch Event: stopping @@ -59,7 +59,7 @@ Payload: name=<name> why=<why> The "stopping" event is sent by a process that is about to exit. Example: -stopping name=fdispatch why="clean exit" +stopping name=dispatch why="clean exit" Event: stopped @@ -69,7 +69,7 @@ Payload: name=<name> pid=<pid> exitcode=<exitcode> This event is sent by a process monitoring when a sub-process exits. Example: -stopped name=fdispatch pid=76512 +stopped name=dispatch pid=76512 Event: reloading diff --git a/vespalog/src/test/resources/event.txt b/vespalog/src/test/resources/event.txt index 0517a3f9f6d..874549de5e6 100644 --- a/vespalog/src/test/resources/event.txt +++ b/vespalog/src/test/resources/event.txt @@ -12,13 +12,10 @@ 1102982424.265538 tc3.trondheim.corp.yahoo.com 76277 rtx nc event stopped/1 name="rtx.validate" pid=77878 exitcode=0 1102982424.568381 old-14 85124 rtc nc event starting/1 name="rtc.search0" 1102982424.579411 old-14 85124 rtc nc event starting/1 name="rtc.dispatch0" -1102982424.692296 old-14 85730 rtc.dispatch0 fdispatch event started/1 name="fdispatch" 1102982425.173218 old-14 85710 rtc.search2 fsearch event stopping/1 name="fsearch" why="exit" 1102982425.230195 old-14 85726 rtc.search0 fsearch event started/1 name="fsearch" 1102982426.160344 old-14 85124 rtc nc event stopped/1 name="rtc.search2" pid=85706 exitcode=0 1102982445.460313 old-13 9793 rtc.search0 fsearch event stopping/1 name="fsearch" why="exit" -1102982445.688144 old-13 9794 rtc.dispatch0 fdispatch event stopping/1 name="fdispatch" why="exit" -1102982445.782239 old-15 4164 rtc.dispatch0 fdispatch event stopping/1 name="fdispatch" why="exit" 1102982446.443455 old-13 9277 rtc nc event stopped/1 name="rtc.search0" pid=9785 exitcode=0 1102982446.158143 old-15 3729 rtc nc event stopped/1 name="rtc.dispatch0" pid=4160 exitcode=0 1102982446.563421 old-13 9277 rtc nc event stopped/1 name="rtc.dispatch0" pid=9789 exitcode=0 @@ -49,13 +46,10 @@ 1102982585.518023 old-15 3729 rtc nc event starting/1 name="rtc.dispatch0" 1102982585.836419 old-13 9277 rtc nc event starting/1 name="rtc.search0" 1102982585.880747 old-13 9277 rtc nc event starting/1 name="rtc.dispatch0" -1102982585.613681 old-15 4310 rtc.dispatch0 fdispatch event started/1 name="fdispatch" 1102982585.958543 old-13 9923 rtc.search2 fsearch event stopping/1 name="fsearch" why="exit" -1102982586.029369 old-13 9961 rtc.dispatch0 fdispatch event started/1 name="fdispatch" 1102982586.486119 old-13 9960 rtc.search0 fsearch event started/1 name="fsearch" 1102982586.826370 old-13 9277 rtc nc event stopped/1 name="rtc.search2" pid=9919 exitcode=0 1102982610.719714 old-14 85726 rtc.search0 fsearch event stopping/1 name="fsearch" why="exit" -1102982610.727868 old-14 85730 rtc.dispatch0 fdispatch event stopping/1 name="fdispatch" why="exit" 1102982611.596130 old-14 85124 rtc nc event stopped/1 name="rtc.search0" pid=85721 exitcode=0 1102982611.601210 old-14 85124 rtc nc event stopped/1 name="rtc.dispatch0" pid=85722 exitcode=0 1102982673.173296 old-14 85124 rtc nc event starting/1 name="rtc.index0" @@ -81,7 +75,6 @@ 1102982701.608896 tc3.trondheim.corp.yahoo.com 76277 rtx nc event stopped/1 name="rtx.validate" pid=78142 exitcode=0 1102982701.918709 old-14 85124 rtc nc event starting/1 name="rtc.search0" 1102982701.927503 old-14 85124 rtc nc event starting/1 name="rtc.dispatch0" -1102982702.035645 old-14 85892 rtc.dispatch0 fdispatch event started/1 name="fdispatch" 1102982702.578492 old-14 85890 rtc.search0 fsearch event started/1 name="fsearch" 1102982702.747752 old-14 85856 rtc.search2 fsearch event stopping/1 name="fsearch" why="exit" 1102982703.728761 old-14 85124 rtc nc event stopped/1 name="rtc.search2" pid=85852 exitcode=0 @@ -95,11 +88,8 @@ 1102982719.336948 old-16 55674 rtc.rtc rtc event started/1 name="rtc" 1102982719.467483 old-16 55670 rtc nc event starting/1 name="rtc.dispatch0" 1102982719.570918 old-16 55670 rtc nc event stopped/1 name="rtc.rtc" pid=55674 exitcode=1 -1102982720.197551 old-16 55686 rtc.dispatch0 fdispatch event started/1 name="fdispatch" -1102982722.181453 old-15 4310 rtc.dispatch0 fdispatch event stopping/1 name="fdispatch" why="exit" 1102982723.056917 old-15 3729 rtc nc event stopped/1 name="rtc.dispatch0" pid=4306 exitcode=0 1102982722.405949 old-13 9960 rtc.search0 fsearch event stopping/1 name="fsearch" why="exit" -1102982722.634184 old-13 9961 rtc.dispatch0 fdispatch event stopping/1 name="fdispatch" why="exit" 1102982723.389279 old-13 9277 rtc nc event stopped/1 name="rtc.search0" pid=9952 exitcode=0 1102982723.509234 old-13 9277 rtc nc event stopped/1 name="rtc.dispatch0" pid=9956 exitcode=0 1102982724.863213 old-16 55670 rtc nc event starting/1 name="rtc.rtc" @@ -137,7 +127,6 @@ 1102982813.999915 old-16 55879 rtc.rtc rtc event started/1 name="rtc" 1102982814.135036 old-16 55875 rtc nc event starting/1 name="rtc.dispatch0" 1102982814.233205 old-16 55875 rtc nc event stopped/1 name="rtc.rtc" pid=55879 exitcode=1 -1102982814.234523 old-16 55889 rtc.dispatch0 fdispatch event started/1 name="fdispatch" 1102982819.966141 old-16 55875 rtc nc event starting/1 name="rtc.rtc" 1102982820.076415 old-16 55903 rtc.rtc rtc event started/1 name="rtc" 1102982820.306584 old-16 55875 rtc nc event stopped/1 name="rtc.rtc" pid=55903 exitcode=1 @@ -177,10 +166,8 @@ 1102982859.925635 tc3.trondheim.corp.yahoo.com 76277 rtx nc event starting/1 name="rtx.validate" 1102982860.100099 tc3.trondheim.corp.yahoo.com 76277 rtx nc event stopped/1 name="rtx.validate" pid=78345 exitcode=0 1102982860.175193 old-15 3729 rtc nc event starting/1 name="rtc.dispatch0" -1102982860.270961 old-15 4448 rtc.dispatch0 fdispatch event started/1 name="fdispatch" 1102982860.490413 old-13 9277 rtc nc event starting/1 name="rtc.search0" 1102982860.532069 old-13 9277 rtc nc event starting/1 name="rtc.dispatch0" -1102982860.656080 old-13 10102 rtc.dispatch0 fdispatch event started/1 name="fdispatch" 1102982860.716739 old-13 10085 rtc.search2 fsearch event stopping/1 name="fsearch" why="exit" 1102982861.091956 old-13 10101 rtc.search0 fsearch event started/1 name="fsearch" 1102982861.592103 old-13 9277 rtc nc event stopped/1 name="rtc.search2" pid=10081 exitcode=0 @@ -197,7 +184,6 @@ 1102982881.460052 old-16 56036 rtc.rtc rtc event started/1 name="rtc" 1102982881.694862 old-16 55875 rtc nc event stopped/1 name="rtc.rtc" pid=56036 exitcode=1 1102982884.649620 old-14 85890 rtc.search0 fsearch event stopping/1 name="fsearch" why="exit" -1102982884.759568 old-14 85892 rtc.dispatch0 fdispatch event stopping/1 name="fdispatch" why="exit" 1102982885.634538 old-14 85124 rtc nc event stopped/1 name="rtc.dispatch0" pid=85884 exitcode=0 1102982885.639725 old-14 85124 rtc nc event stopped/1 name="rtc.search0" pid=85883 exitcode=0 1102982887.538177 old-16 55875 rtc nc event starting/1 name="rtc.rtc" @@ -221,7 +207,6 @@ 1102982924.459348 old-16 55875 rtc nc event starting/1 name="rtc.rtc" 1102982924.567161 old-16 56111 rtc.rtc rtc event started/1 name="rtc" 1102982924.801296 old-16 55875 rtc nc event stopped/1 name="rtc.rtc" pid=56111 exitcode=1 -1102982925.443676 old-16 55889 rtc.dispatch0 fdispatch event stopping/1 name="fdispatch" why="exit" 1102982926.429705 old-16 55875 rtc nc event stopped/1 name="rtc.dispatch0" pid=55885 exitcode=0 1102982930.629580 old-16 55875 rtc nc event starting/1 name="rtc.rtc" 1102982930.760908 old-16 56122 rtc.rtc rtc event started/1 name="rtc" @@ -252,16 +237,12 @@ 1102984777.735043 old-13 9277 rtc nc event starting/1 name="rtc.search0" 1102984777.781644 old-13 9277 rtc nc event starting/1 name="rtc.dispatch0" 1102984777.402397 old-15 6902 rtc nc event starting/1 name="rtc.dispatch0" -1102984777.498183 old-15 7190 rtc.dispatch0 fdispatch event started/1 name="fdispatch" -1102984777.913693 old-13 11182 rtc.dispatch0 fdispatch event started/1 name="fdispatch" 1102984778.059907 old-13 11160 rtc.search2 fsearch event stopping/1 name="fsearch" why="exit" 1102984778.351858 old-13 11181 rtc.search0 fsearch event started/1 name="fsearch" 1102984779.042265 old-13 9277 rtc nc event stopped/1 name="rtc.search2" pid=11156 exitcode=0 1102984801.999193 old-14 86959 rtc.search0 fsearch event stopping/1 name="fsearch" why="exit" -1102984802.008047 old-14 86963 rtc.dispatch0 fdispatch event stopping/1 name="fdispatch" why="exit" 1102984802.872560 old-14 85124 rtc nc event stopped/1 name="rtc.search0" pid=86954 exitcode=0 1102984802.882530 old-14 85124 rtc nc event stopped/1 name="rtc.dispatch0" pid=86955 exitcode=0 -1102984805.631482 old-16 59311 rtc.dispatch0 fdispatch event stopping/1 name="fdispatch" why="exit" 1102984806.087444 old-16 59141 rtc nc event stopped/1 name="rtc.dispatch0" pid=59307 exitcode=0 1102984870.706385 old-14 85124 rtc nc event starting/1 name="rtc.index0" 1102984870.790934 old-14 87051 rtc.index0 flexindexer event started/1 name="flexindexer.init" @@ -287,16 +268,12 @@ 1102984913.401871 tc3.trondheim.corp.yahoo.com 76277 rtx nc event stopped/1 name="rtx.validate" pid=80829 exitcode=0 1102984913.670821 old-14 85124 rtc nc event starting/1 name="rtc.search0" 1102984913.683526 old-14 85124 rtc nc event starting/1 name="rtc.dispatch0" -1102984913.797198 old-14 87116 rtc.dispatch0 fdispatch event started/1 name="fdispatch" 1102984913.979101 old-14 87099 rtc.search2 fsearch event stopping/1 name="fsearch" why="exit" 1102984913.989465 old-14 87112 rtc.search0 fsearch event started/1 name="fsearch" -1102984913.613733 old-16 59443 rtc.dispatch0 fdispatch event started/1 name="fdispatch" 1102984914.965980 old-14 85124 rtc nc event stopped/1 name="rtc.search2" pid=87095 exitcode=0 1102984937.512157 old-13 11181 rtc.search0 fsearch event stopping/1 name="fsearch" why="exit" -1102984937.528481 old-13 11182 rtc.dispatch0 fdispatch event stopping/1 name="fdispatch" why="exit" 1102984938.385574 old-13 9277 rtc nc event stopped/1 name="rtc.search0" pid=11173 exitcode=0 1102984938.423498 old-13 9277 rtc nc event stopped/1 name="rtc.dispatch0" pid=11177 exitcode=0 -1102984946.290883 old-15 7190 rtc.dispatch0 fdispatch event stopping/1 name="fdispatch" why="exit" 1102984946.836599 old-15 6902 rtc nc event stopped/1 name="rtc.dispatch0" pid=7186 exitcode=0 1102985007.942647 old-14 85124 rtc nc event starting/1 name="rtc.indexremove0" 1102985008.088765 old-14 85124 rtc nc event stopped/1 name="rtc.indexremove0" pid=87160 exitcode=0 @@ -318,20 +295,16 @@ 1102985039.737230 old-13 9277 rtc nc event starting/1 name="rtc.search2" 1102985040.277473 old-13 11318 rtc.search2 fsearch event started/1 name="fsearch" 1102985052.439380 old-15 6902 rtc nc event starting/1 name="rtc.dispatch0" -1102985052.535221 old-15 7300 rtc.dispatch0 fdispatch event started/1 name="fdispatch" 1102985052.185871 tc3.trondheim.corp.yahoo.com 76277 rtx nc event starting/1 name="rtx.validate" 1102985052.365617 tc3.trondheim.corp.yahoo.com 76277 rtx nc event stopped/1 name="rtx.validate" pid=80930 exitcode=0 1102985052.750320 old-13 9277 rtc nc event starting/1 name="rtc.search0" 1102985052.778439 old-13 9277 rtc nc event starting/1 name="rtc.dispatch0" -1102985052.903049 old-13 11338 rtc.dispatch0 fdispatch event started/1 name="fdispatch" 1102985053.081624 old-13 11318 rtc.search2 fsearch event stopping/1 name="fsearch" why="exit" 1102985053.347641 old-13 11337 rtc.search0 fsearch event started/1 name="fsearch" 1102985054.068022 old-13 9277 rtc nc event stopped/1 name="rtc.search2" pid=11314 exitcode=0 1102985076.567887 old-14 87112 rtc.search0 fsearch event stopping/1 name="fsearch" why="exit" -1102985076.593279 old-14 87116 rtc.dispatch0 fdispatch event stopping/1 name="fdispatch" why="exit" 1102985077.550922 old-14 85124 rtc nc event stopped/1 name="rtc.search0" pid=87107 exitcode=0 1102985077.570977 old-14 85124 rtc nc event stopped/1 name="rtc.dispatch0" pid=87108 exitcode=0 -1102985081.929791 old-16 59443 rtc.dispatch0 fdispatch event stopping/1 name="fdispatch" why="exit" 1102985082.946038 old-16 59141 rtc nc event stopped/1 name="rtc.dispatch0" pid=59439 exitcode=0 1102985145.952973 old-14 85124 rtc nc event starting/1 name="rtc.index0" 1102985146.038260 old-14 87206 rtc.index0 flexindexer event started/1 name="flexindexer.init" @@ -356,17 +329,13 @@ 1102985188.204403 tc3.trondheim.corp.yahoo.com 76277 rtx nc event stopped/1 name="rtx.validate" pid=81171 exitcode=0 1102985188.494004 old-14 85124 rtc nc event starting/1 name="rtc.search0" 1102985188.508392 old-14 85124 rtc nc event starting/1 name="rtc.dispatch0" -1102985188.618695 old-14 87274 rtc.dispatch0 fdispatch event started/1 name="fdispatch" 1102985188.780877 old-14 87257 rtc.search2 fsearch event stopping/1 name="fsearch" why="exit" 1102985188.313370 old-16 59141 rtc nc event starting/1 name="rtc.dispatch0" -1102985188.419471 old-16 59566 rtc.dispatch0 fdispatch event started/1 name="fdispatch" 1102985189.143927 old-14 87270 rtc.search0 fsearch event started/1 name="fsearch" 1102985189.764318 old-14 85124 rtc nc event stopped/1 name="rtc.search2" pid=87253 exitcode=0 1102985212.527157 old-13 11337 rtc.search0 fsearch event stopping/1 name="fsearch" why="exit" -1102985212.543364 old-13 11338 rtc.dispatch0 fdispatch event stopping/1 name="fdispatch" why="exit" 1102985213.401420 old-13 9277 rtc nc event stopped/1 name="rtc.search0" pid=11329 exitcode=0 1102985213.426389 old-13 9277 rtc nc event stopped/1 name="rtc.dispatch0" pid=11333 exitcode=0 -1102985221.549425 old-15 7300 rtc.dispatch0 fdispatch event stopping/1 name="fdispatch" why="exit" 1102985221.865258 old-15 6902 rtc nc event stopped/1 name="rtc.dispatch0" pid=7296 exitcode=0 1102985283.672312 old-14 85124 rtc nc event starting/1 name="rtc.indexremove0" 1102985283.817178 old-14 85124 rtc nc event stopped/1 name="rtc.indexremove0" pid=87311 exitcode=0 @@ -388,20 +357,16 @@ 1102985325.425581 old-13 9277 rtc nc event starting/1 name="rtc.search2" 1102985325.963456 old-13 11476 rtc.search2 fsearch event started/1 name="fsearch" 1102985338.258960 old-15 6902 rtc nc event starting/1 name="rtc.dispatch0" -1102985338.354738 old-15 7432 rtc.dispatch0 fdispatch event started/1 name="fdispatch" 1102985338.599275 old-13 9277 rtc nc event starting/1 name="rtc.search0" 1102985338.645855 old-13 9277 rtc nc event starting/1 name="rtc.dispatch0" -1102985338.776413 old-13 11493 rtc.dispatch0 fdispatch event started/1 name="fdispatch" 1102985338.007689 tc3.trondheim.corp.yahoo.com 76277 rtx nc event starting/1 name="rtx.validate" 1102985338.186794 tc3.trondheim.corp.yahoo.com 76277 rtx nc event stopped/1 name="rtx.validate" pid=81272 exitcode=0 1102985338.819496 old-13 11476 rtc.search2 fsearch event stopping/1 name="fsearch" why="exit" 1102985339.203747 old-13 11492 rtc.search0 fsearch event started/1 name="fsearch" 1102985339.804418 old-13 9277 rtc nc event stopped/1 name="rtc.search2" pid=11472 exitcode=0 1102985362.416626 old-14 87270 rtc.search0 fsearch event stopping/1 name="fsearch" why="exit" -1102985362.524282 old-14 87274 rtc.dispatch0 fdispatch event stopping/1 name="fdispatch" why="exit" 1102985363.399656 old-14 85124 rtc nc event stopped/1 name="rtc.search0" pid=87265 exitcode=0 1102985363.509611 old-14 85124 rtc nc event stopped/1 name="rtc.dispatch0" pid=87266 exitcode=0 -1102985368.448703 old-16 59566 rtc.dispatch0 fdispatch event stopping/1 name="fdispatch" why="exit" 1102985368.694694 old-16 59141 rtc nc event stopped/1 name="rtc.dispatch0" pid=59562 exitcode=0 1102985422.540132 old-14 85124 rtc nc event starting/1 name="rtc.index0" 1102985422.648022 old-14 87362 rtc.index0 flexindexer event started/1 name="flexindexer.init" @@ -423,20 +388,16 @@ 1102985450.905111 old-14 85124 rtc nc event starting/1 name="rtc.search2" 1102985451.411910 old-14 87402 rtc.search2 fsearch event started/1 name="fsearch" 1102985463.886153 old-16 59141 rtc nc event starting/1 name="rtc.dispatch0" -1102985463.992395 old-16 59696 rtc.dispatch0 fdispatch event started/1 name="fdispatch" 1102985463.602049 tc3.trondheim.corp.yahoo.com 76277 rtx nc event starting/1 name="rtx.validate" 1102985463.777789 tc3.trondheim.corp.yahoo.com 76277 rtx nc event stopped/1 name="rtx.validate" pid=81510 exitcode=0 1102985464.051579 old-14 85124 rtc nc event starting/1 name="rtc.search0" 1102985464.061606 old-14 85124 rtc nc event starting/1 name="rtc.dispatch0" -1102985464.180789 old-14 87422 rtc.dispatch0 fdispatch event started/1 name="fdispatch" 1102985464.278631 old-14 87402 rtc.search2 fsearch event stopping/1 name="fsearch" why="exit" 1102985464.612377 old-14 87418 rtc.search0 fsearch event started/1 name="fsearch" 1102985465.252739 old-14 85124 rtc nc event stopped/1 name="rtc.search2" pid=87398 exitcode=0 1102985488.331150 old-13 11492 rtc.search0 fsearch event stopping/1 name="fsearch" why="exit" -1102985488.339190 old-13 11493 rtc.dispatch0 fdispatch event stopping/1 name="fdispatch" why="exit" 1102985489.317280 old-13 9277 rtc nc event stopped/1 name="rtc.search0" pid=11484 exitcode=0 1102985489.351467 old-13 9277 rtc nc event stopped/1 name="rtc.dispatch0" pid=11488 exitcode=0 -1102985495.337998 old-15 7432 rtc.dispatch0 fdispatch event stopping/1 name="fdispatch" why="exit" 1102985495.583781 old-15 6902 rtc nc event stopped/1 name="rtc.dispatch0" pid=7428 exitcode=0 1102985559.980099 old-14 85124 rtc nc event starting/1 name="rtc.indexremove0" 1102985560.125488 old-14 85124 rtc nc event stopped/1 name="rtc.indexremove0" pid=87451 exitcode=0 @@ -459,19 +420,15 @@ 1102985592.769319 old-13 11633 rtc.search2 fsearch event started/1 name="fsearch" 1102985604.499469 tc3.trondheim.corp.yahoo.com 76277 rtx nc event starting/1 name="rtx.validate" 1102985604.759895 old-15 6902 rtc nc event starting/1 name="rtc.dispatch0" -1102985604.861837 old-15 7559 rtc.dispatch0 fdispatch event started/1 name="fdispatch" 1102985604.679525 tc3.trondheim.corp.yahoo.com 76277 rtx nc event stopped/1 name="rtx.validate" pid=81615 exitcode=0 1102985605.093908 old-13 9277 rtc nc event starting/1 name="rtc.search0" 1102985605.140522 old-13 9277 rtc nc event starting/1 name="rtc.dispatch0" -1102985605.272289 old-13 11650 rtc.dispatch0 fdispatch event started/1 name="fdispatch" 1102985605.636678 old-13 11633 rtc.search2 fsearch event stopping/1 name="fsearch" why="exit" 1102985605.699630 old-13 11649 rtc.search0 fsearch event started/1 name="fsearch" 1102985606.509778 old-13 9277 rtc nc event stopped/1 name="rtc.search2" pid=11629 exitcode=0 1102985629.241620 old-14 87418 rtc.search0 fsearch event stopping/1 name="fsearch" why="exit" -1102985629.247103 old-14 87422 rtc.dispatch0 fdispatch event stopping/1 name="fdispatch" why="exit" 1102985630.117778 old-14 85124 rtc nc event stopped/1 name="rtc.search0" pid=87413 exitcode=0 1102985630.227676 old-14 85124 rtc nc event stopped/1 name="rtc.dispatch0" pid=87414 exitcode=0 -1102985632.886825 old-16 59696 rtc.dispatch0 fdispatch event stopping/1 name="fdispatch" why="exit" 1102985633.322757 old-16 59141 rtc nc event stopped/1 name="rtc.dispatch0" pid=59692 exitcode=0 1102985697.173221 old-14 85124 rtc nc event starting/1 name="rtc.index0" 1102985697.256604 old-14 87500 rtc.index0 flexindexer event started/1 name="flexindexer.init" @@ -493,20 +450,16 @@ 1102985727.572242 old-14 85124 rtc nc event starting/1 name="rtc.search2" 1102985728.080322 old-14 87561 rtc.search2 fsearch event started/1 name="fsearch" 1102985740.452074 old-16 59141 rtc nc event starting/1 name="rtc.dispatch0" -1102985740.558202 old-16 59825 rtc.dispatch0 fdispatch event started/1 name="fdispatch" 1102985740.161408 tc3.trondheim.corp.yahoo.com 76277 rtx nc event starting/1 name="rtx.validate" 1102985740.340832 tc3.trondheim.corp.yahoo.com 76277 rtx nc event stopped/1 name="rtx.validate" pid=81861 exitcode=0 1102985740.597833 old-14 85124 rtc nc event starting/1 name="rtc.search0" 1102985740.608385 old-14 85124 rtc nc event starting/1 name="rtc.dispatch0" -1102985740.734989 old-14 87578 rtc.dispatch0 fdispatch event started/1 name="fdispatch" 1102985740.914042 old-14 87561 rtc.search2 fsearch event stopping/1 name="fsearch" why="exit" 1102985741.160724 old-14 87574 rtc.search0 fsearch event started/1 name="fsearch" 1102985741.901075 old-14 85124 rtc nc event stopped/1 name="rtc.search2" pid=87557 exitcode=0 1102985764.916422 old-13 11649 rtc.search0 fsearch event stopping/1 name="fsearch" why="exit" -1102985764.924985 old-13 11650 rtc.dispatch0 fdispatch event stopping/1 name="fdispatch" why="exit" 1102985765.793179 old-13 9277 rtc nc event stopped/1 name="rtc.search0" pid=11641 exitcode=0 1102985765.830252 old-13 9277 rtc nc event stopped/1 name="rtc.dispatch0" pid=11645 exitcode=0 -1102985772.886691 old-15 7559 rtc.dispatch0 fdispatch event stopping/1 name="fdispatch" why="exit" 1102985773.162542 old-15 6902 rtc nc event stopped/1 name="rtc.dispatch0" pid=7555 exitcode=0 1102985834.098801 old-14 85124 rtc nc event starting/1 name="rtc.indexremove0" 1102985834.243854 old-14 85124 rtc nc event stopped/1 name="rtc.indexremove0" pid=87608 exitcode=0 @@ -530,18 +483,14 @@ 1102985878.804002 tc3.trondheim.corp.yahoo.com 76277 rtx nc event starting/1 name="rtx.validate" 1102985878.992074 tc3.trondheim.corp.yahoo.com 76277 rtx nc event stopped/1 name="rtx.validate" pid=81960 exitcode=0 1102985879.082822 old-15 6902 rtc nc event starting/1 name="rtc.dispatch0" -1102985879.178672 old-15 7688 rtc.dispatch0 fdispatch event started/1 name="fdispatch" 1102985879.459680 old-13 11769 rtc.search2 fsearch event stopping/1 name="fsearch" why="exit" 1102985879.479439 old-13 9277 rtc nc event starting/1 name="rtc.search0" 1102985879.515248 old-13 9277 rtc nc event starting/1 name="rtc.dispatch0" -1102985879.641363 old-13 11805 rtc.dispatch0 fdispatch event started/1 name="fdispatch" 1102985880.105424 old-13 11804 rtc.search0 fsearch event started/1 name="fsearch" 1102985880.445670 old-13 9277 rtc nc event stopped/1 name="rtc.search2" pid=11765 exitcode=0 -1102985903.567758 old-14 87578 rtc.dispatch0 fdispatch event stopping/1 name="fdispatch" why="exit" 1102985904.556172 old-14 85124 rtc nc event stopped/1 name="rtc.dispatch0" pid=87570 exitcode=0 1102985904.560190 old-14 87574 rtc.search0 fsearch event stopping/1 name="fsearch" why="exit" 1102985905.546045 old-14 85124 rtc nc event stopped/1 name="rtc.search0" pid=87569 exitcode=0 -1102985908.625243 old-16 59825 rtc.dispatch0 fdispatch event stopping/1 name="fdispatch" why="exit" 1102985908.761216 old-16 59141 rtc nc event stopped/1 name="rtc.dispatch0" pid=59821 exitcode=0 1102985971.929848 old-14 85124 rtc nc event starting/1 name="rtc.index0" 1102985972.015182 old-14 87656 rtc.index0 flexindexer event started/1 name="flexindexer.init" @@ -590,12 +539,9 @@ 1102982974.580826 old-14 86014 rtc.search2 fsearch event stopping/1 name="fsearch" why="exit" 1102982974.791879 old-14 85124 rtc nc event starting/1 name="rtc.search0" 1102982974.869852 old-14 85124 rtc nc event starting/1 name="rtc.dispatch0" -1102982974.986256 old-14 86031 rtc.dispatch0 fdispatch event started/1 name="fdispatch" 1102982975.272076 old-14 86030 rtc.search0 fsearch event started/1 name="fsearch" 1102982975.457015 old-14 85124 rtc nc event stopped/1 name="rtc.search2" pid=86010 exitcode=0 1102982994.921631 old-13 10101 rtc.search0 fsearch event stopping/1 name="fsearch" why="exit" -1102982994.929122 old-13 10102 rtc.dispatch0 fdispatch event stopping/1 name="fdispatch" why="exit" -1102982995.790031 old-15 4448 rtc.dispatch0 fdispatch event stopping/1 name="fdispatch" why="exit" 1102982995.794897 old-13 9277 rtc nc event stopped/1 name="rtc.search0" pid=10093 exitcode=0 1102982995.915047 old-13 9277 rtc nc event stopped/1 name="rtc.dispatch0" pid=10097 exitcode=0 1102982996.665560 old-15 3729 rtc nc event stopped/1 name="rtc.dispatch0" pid=4444 exitcode=0 @@ -662,7 +608,6 @@ 1102983111.464977 old-16 56815 rtc.rtc rtc event started/1 name="rtc" 1102983111.624631 old-16 56769 rtc nc event starting/1 name="rtc.dispatch0" 1102983111.694912 old-16 56769 rtc nc event stopped/1 name="rtc.rtc" pid=56815 exitcode=1 -1102983111.718760 old-16 56825 rtc.dispatch0 fdispatch event started/1 name="fdispatch" 1102983117.535240 old-16 56769 rtc nc event starting/1 name="rtc.rtc" 1102983117.644597 old-16 56837 rtc.rtc rtc event started/1 name="rtc" 1102983117.872760 old-16 56769 rtc nc event stopped/1 name="rtc.rtc" pid=56837 exitcode=1 @@ -680,10 +625,8 @@ 1102983136.195702 tc3.trondheim.corp.yahoo.com 76277 rtx nc event starting/1 name="rtx.validate" 1102983136.372805 tc3.trondheim.corp.yahoo.com 76277 rtx nc event stopped/1 name="rtx.validate" pid=78699 exitcode=0 1102983136.446910 old-15 3729 rtc nc event starting/1 name="rtc.dispatch0" -1102983136.542716 old-15 4602 rtc.dispatch0 fdispatch event started/1 name="fdispatch" 1102983136.816766 old-13 9277 rtc nc event starting/1 name="rtc.search0" 1102983136.857452 old-13 9277 rtc nc event starting/1 name="rtc.dispatch0" -1102983136.985730 old-13 10261 rtc.dispatch0 fdispatch event started/1 name="fdispatch" 1102983137.044120 old-13 10242 rtc.search2 fsearch event stopping/1 name="fsearch" why="exit" 1102983137.447497 old-13 10260 rtc.search0 fsearch event started/1 name="fsearch" 1102983138.027972 old-13 9277 rtc nc event stopped/1 name="rtc.search2" pid=10238 exitcode=0 @@ -700,7 +643,6 @@ 1102983160.058334 old-16 56939 rtc.rtc rtc event started/1 name="rtc" 1102983160.304685 old-16 56769 rtc nc event stopped/1 name="rtc.rtc" pid=56939 exitcode=1 1102983161.016507 old-14 86030 rtc.search0 fsearch event stopping/1 name="fsearch" why="exit" -1102983161.021332 old-14 86031 rtc.dispatch0 fdispatch event stopping/1 name="fdispatch" why="exit" 1102983161.892728 old-14 85124 rtc nc event stopped/1 name="rtc.search0" pid=86022 exitcode=0 1102983162.002790 old-14 85124 rtc nc event stopped/1 name="rtc.dispatch0" pid=86026 exitcode=0 1102983166.146748 old-16 56769 rtc nc event starting/1 name="rtc.rtc" @@ -768,7 +710,6 @@ 1102983248.944256 tc3.trondheim.corp.yahoo.com 76277 rtx nc event stopped/1 name="rtx.validate" pid=78766 exitcode=0 1102983249.227183 old-14 85124 rtc nc event starting/1 name="rtc.search0" 1102983249.237161 old-14 85124 rtc nc event starting/1 name="rtc.dispatch0" -1102983249.348837 old-14 86188 rtc.dispatch0 fdispatch event started/1 name="fdispatch" 1102983249.785138 old-14 86184 rtc.search0 fsearch event started/1 name="fsearch" 1102983249.851043 old-14 86167 rtc.search2 fsearch event stopping/1 name="fsearch" why="exit" 1102983250.725373 old-14 85124 rtc nc event stopped/1 name="rtc.search2" pid=86163 exitcode=0 @@ -779,10 +720,8 @@ 1102983258.028820 old-16 57127 rtc.rtc rtc event started/1 name="rtc" 1102983258.257644 old-16 56769 rtc nc event stopped/1 name="rtc.rtc" pid=57127 exitcode=1 1102983269.137311 old-13 10260 rtc.search0 fsearch event stopping/1 name="fsearch" why="exit" -1102983269.144791 old-13 10261 rtc.dispatch0 fdispatch event stopping/1 name="fdispatch" why="exit" 1102983270.010666 old-13 9277 rtc nc event stopped/1 name="rtc.search0" pid=10252 exitcode=0 1102983270.042184 old-13 9277 rtc nc event stopped/1 name="rtc.dispatch0" pid=10256 exitcode=0 -1102983272.118338 old-15 4602 rtc.dispatch0 fdispatch event stopping/1 name="fdispatch" why="exit" 1102983272.854135 old-15 3729 rtc nc event stopped/1 name="rtc.dispatch0" pid=4598 exitcode=0 1102983362.503050 old-14 85124 rtc nc event starting/1 name="rtc.indexremove0" 1102983362.649049 old-14 85124 rtc nc event stopped/1 name="rtc.indexremove0" pid=86230 exitcode=0 @@ -808,13 +747,10 @@ 1102983411.938135 tc3.trondheim.corp.yahoo.com 76277 rtx nc event stopped/1 name="rtx.validate" pid=79018 exitcode=0 1102983412.352170 old-13 9277 rtc nc event starting/1 name="rtc.search0" 1102983412.392827 old-13 9277 rtc nc event starting/1 name="rtc.dispatch0" -1102983412.555009 old-13 10413 rtc.dispatch0 fdispatch event started/1 name="fdispatch" 1102983412.666661 old-13 10396 rtc.search2 fsearch event stopping/1 name="fsearch" why="exit" -1102983412.115149 old-15 4729 rtc.dispatch0 fdispatch event started/1 name="fdispatch" 1102983412.953280 old-13 10412 rtc.search0 fsearch event started/1 name="fsearch" 1102983413.543584 old-13 9277 rtc nc event stopped/1 name="rtc.search2" pid=10392 exitcode=0 1102983434.184986 old-14 86184 rtc.search0 fsearch event stopping/1 name="fsearch" why="exit" -1102983434.189809 old-14 86188 rtc.dispatch0 fdispatch event stopping/1 name="fdispatch" why="exit" 1102983435.171112 old-14 85124 rtc nc event stopped/1 name="rtc.dispatch0" pid=86180 exitcode=0 1102983435.176508 old-14 85124 rtc nc event stopped/1 name="rtc.search0" pid=86179 exitcode=0 1102983499.729687 old-14 85124 rtc nc event starting/1 name="rtc.index0" @@ -840,11 +776,9 @@ 1102983524.277311 tc3.trondheim.corp.yahoo.com 76277 rtx nc event stopped/1 name="rtx.validate" pid=79105 exitcode=0 1102983524.618894 old-14 85124 rtc nc event starting/1 name="rtc.search0" 1102983524.626268 old-14 85124 rtc nc event starting/1 name="rtc.dispatch0" -1102983524.735847 old-14 86343 rtc.dispatch0 fdispatch event started/1 name="fdispatch" 1102983525.150609 old-14 86326 rtc.search2 fsearch event stopping/1 name="fsearch" why="exit" 1102983525.183478 old-14 86342 rtc.search0 fsearch event started/1 name="fsearch" 1102983526.023732 old-14 85124 rtc nc event stopped/1 name="rtc.search2" pid=86322 exitcode=0 -1102983544.521213 old-13 10413 rtc.dispatch0 fdispatch event stopping/1 name="fdispatch" why="exit" 1102983544.621272 old-13 10412 rtc.search0 fsearch event stopping/1 name="fsearch" why="exit" 1102983545.486398 old-13 9277 rtc nc event stopped/1 name="rtc.search0" pid=10404 exitcode=0 1102983545.518155 old-13 9277 rtc nc event stopped/1 name="rtc.dispatch0" pid=10408 exitcode=0 @@ -871,12 +805,10 @@ 1102983663.408294 tc3.trondheim.corp.yahoo.com 76277 rtx nc event stopped/1 name="rtx.validate" pid=79347 exitcode=0 1102983663.802410 old-13 9277 rtc nc event starting/1 name="rtc.search0" 1102983663.847086 old-13 9277 rtc nc event starting/1 name="rtc.dispatch0" -1102983663.970470 old-13 10569 rtc.dispatch0 fdispatch event started/1 name="fdispatch" 1102983664.245161 old-13 10549 rtc.search2 fsearch event stopping/1 name="fsearch" why="exit" 1102983664.418499 old-13 10568 rtc.search0 fsearch event started/1 name="fsearch" 1102983665.228936 old-13 9277 rtc nc event stopped/1 name="rtc.search2" pid=10545 exitcode=0 1102983684.194271 old-14 86342 rtc.search0 fsearch event stopping/1 name="fsearch" why="exit" -1102983684.413550 old-14 86343 rtc.dispatch0 fdispatch event stopping/1 name="fdispatch" why="exit" 1102983685.178577 old-14 85124 rtc nc event stopped/1 name="rtc.search0" pid=86334 exitcode=0 1102983685.288749 old-14 85124 rtc nc event stopped/1 name="rtc.dispatch0" pid=86335 exitcode=0 1102983775.331147 old-14 85124 rtc nc event starting/1 name="rtc.index0" @@ -902,11 +834,9 @@ 1102983799.550019 tc3.trondheim.corp.yahoo.com 76277 rtx nc event stopped/1 name="rtx.validate" pid=79445 exitcode=0 1102983799.815919 old-14 85124 rtc nc event starting/1 name="rtc.search0" 1102983799.825466 old-14 85124 rtc nc event starting/1 name="rtc.dispatch0" -1102983799.933088 old-14 86499 rtc.dispatch0 fdispatch event started/1 name="fdispatch" 1102983800.124646 old-14 86495 rtc.search0 fsearch event started/1 name="fsearch" 1102983800.349296 old-14 86478 rtc.search2 fsearch event stopping/1 name="fsearch" why="exit" 1102983801.222147 old-14 85124 rtc nc event stopped/1 name="rtc.search2" pid=86474 exitcode=0 -1102983820.147150 old-13 10569 rtc.dispatch0 fdispatch event stopping/1 name="fdispatch" why="exit" 1102983820.248595 old-13 10568 rtc.search0 fsearch event stopping/1 name="fsearch" why="exit" 1102983821.122118 old-13 9277 rtc nc event stopped/1 name="rtc.search0" pid=10560 exitcode=0 1102983821.155033 old-13 9277 rtc nc event stopped/1 name="rtc.dispatch0" pid=10564 exitcode=0 @@ -934,11 +864,9 @@ 1102983938.571920 tc3.trondheim.corp.yahoo.com 76277 rtx nc event stopped/1 name="rtx.validate" pid=79691 exitcode=0 1102983939.111733 old-13 9277 rtc nc event starting/1 name="rtc.search0" 1102983939.146855 old-13 9277 rtc nc event starting/1 name="rtc.dispatch0" -1102983939.269781 old-13 10716 rtc.dispatch0 fdispatch event started/1 name="fdispatch" 1102983939.714359 old-13 10715 rtc.search0 fsearch event started/1 name="fsearch" 1102983939.914719 old-13 9277 rtc nc event stopped/1 name="rtc.search2" pid=10695 exitcode=0 1102983959.590654 old-14 86495 rtc.search0 fsearch event stopping/1 name="fsearch" why="exit" -1102983959.598406 old-14 86499 rtc.dispatch0 fdispatch event stopping/1 name="fdispatch" why="exit" 1102983960.467110 old-14 85124 rtc nc event stopped/1 name="rtc.search0" pid=86490 exitcode=0 1102983960.472296 old-14 85124 rtc nc event stopped/1 name="rtc.dispatch0" pid=86491 exitcode=0 1102984050.398552 old-14 85124 rtc nc event starting/1 name="rtc.index0" @@ -966,7 +894,6 @@ 1102984075.655564 old-14 85124 rtc nc event stopped/1 name="rtc.search2" pid=86613 exitcode=0 1102984075.660995 old-14 85124 rtc nc event starting/1 name="rtc.search0" 1102984075.670714 old-14 85124 rtc nc event starting/1 name="rtc.dispatch0" -1102984075.780693 old-14 86634 rtc.dispatch0 fdispatch event started/1 name="fdispatch" 1102984076.220183 old-14 86630 rtc.search0 fsearch event started/1 name="fsearch" 1102983417.075842 old-15 3726 logd logdemon event stopping/1 name="logdemon" why="done ok." 1102983417.084537 old-15 3725 config-sentinel config-sentinel.service event stopped/1 name="logd" pid=3726 exitcode=0 @@ -985,14 +912,12 @@ 1102984083.556253 old-15 6648 rtc nc event starting/1 name="rtc.rtc" 1102984083.718924 old-15 6652 rtc.rtc rtc event started/1 name="rtc" 1102984083.897858 old-15 6648 rtc nc event starting/1 name="rtc.dispatch0" -1102984084.017068 old-15 6663 rtc.dispatch0 fdispatch event started/1 name="fdispatch" 1102984085.385198 old-15 6648 rtc nc event stopped/1 name="rtc.rtc" pid=6652 exitcode=1 1102984089.589460 old-15 6648 rtc nc event starting/1 name="rtc.rtc" 1102984089.731154 old-15 6676 rtc.rtc rtc event started/1 name="rtc" 1102984090.244728 old-15 6648 rtc nc event stopped/1 name="rtc.rtc" pid=6676 exitcode=1 1102984095.669627 old-15 6648 rtc nc event starting/1 name="rtc.rtc" 1102984095.494894 old-13 10715 rtc.search0 fsearch event stopping/1 name="fsearch" why="exit" -1102984095.639737 old-13 10716 rtc.dispatch0 fdispatch event stopping/1 name="fdispatch" why="exit" 1102984095.807128 old-15 6688 rtc.rtc rtc event started/1 name="rtc" 1102984096.335289 old-15 6648 rtc nc event stopped/1 name="rtc.rtc" pid=6688 exitcode=1 1102984096.477880 old-13 9277 rtc nc event stopped/1 name="rtc.search0" pid=10707 exitcode=0 diff --git a/vespalog/src/vespa-logfmt/vespa-logfmt.1 b/vespalog/src/vespa-logfmt/vespa-logfmt.1 index b6a5ec0164d..b2023816694 100644 --- a/vespalog/src/vespa-logfmt/vespa-logfmt.1 +++ b/vespalog/src/vespa-logfmt/vespa-logfmt.1 @@ -193,9 +193,7 @@ component name, and the message text, possibly somewhat like this: 1102441573.148211 WARNING : logdemon stopping on signal 15 1102441887.158000 WARNING : com.yahoo.fs4.m read exception 1102441935.569567 WARNING : rtc Dispatch inherited job failed for dir dispatch0 -1102442115.746001 WARNING : fdispatch Search node 172.24.94.75:10124 down 1102442474.205920 WARNING : rtx RTC (tcp/172.24.94.75:10161) : DOWN -1102442474.515877 WARNING : fdispatch Search node localhost:10128 down 1102442983.075669 ERROR : flexindexer.std Unable to find cluster map defaultcluster .Ed .Sh FILES diff --git a/vsm/src/vespa/vsm/vsm/fieldsearchspec.cpp b/vsm/src/vespa/vsm/vsm/fieldsearchspec.cpp index 8bb047beb24..e56df354d2a 100644 --- a/vsm/src/vespa/vsm/vsm/fieldsearchspec.cpp +++ b/vsm/src/vespa/vsm/vsm/fieldsearchspec.cpp @@ -10,6 +10,7 @@ #include <vespa/vsm/searcher/intfieldsearcher.h> #include <vespa/vsm/searcher/boolfieldsearcher.h> #include <vespa/vsm/searcher/floatfieldsearcher.h> +#include <vespa/vespalib/stllike/asciistream.h> #include <regex> #include <vespa/log/log.h> @@ -148,13 +149,9 @@ vespalib::asciistream & operator <<(vespalib::asciistream & os, const FieldSearc return os; } -FieldSearchSpecMap::FieldSearchSpecMap() : - _specMap(), - _documentTypeMap(), - _nameIdMap() -{ } +FieldSearchSpecMap::FieldSearchSpecMap() = default; -FieldSearchSpecMap::~FieldSearchSpecMap() {} +FieldSearchSpecMap::~FieldSearchSpecMap() = default; namespace { const std::string _G_empty(""); |