summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5389 from ↵Harald Musum2018-03-219-39/+33
|\ | | | | | | | | vespa-engine/hmusum/remove-zone-from-DeployProperties Remove zone from DeployProperties, it's already present in DeployState
| * Fix testHarald Musum2018-03-201-1/+2
| |
| * Remove zone from DeployProperties, it's already present in DeployStateHarald Musum2018-03-208-38/+31
| |
* | Merge pull request #5390 from ↵Jon Bratseth2018-03-219-45/+57
|\ \ | | | | | | | | | | | | vespa-engine/mpolden/always-enforce-node-count-requirement Ensure prod node count requirement is respected
| * | Ensure prod node count requirement is respectedMartin Polden2018-03-204-22/+52
| | |
| * | Remove dead codeMartin Polden2018-03-204-11/+5
| | |
| * | Remove ignored fieldsMartin Polden2018-03-202-12/+0
| |/
* | Merge pull request #5397 from vespa-engine/freva/add-new-node-typesValerij Fredriksen2018-03-211-3/+9
|\ \ | | | | | | Add new node types
| * | Add new node typesValerij Fredriksen2018-03-201-3/+9
| | |
* | | Merge pull request #5391 from vespa-engine/hmusum/set-jvmargs-in-EnvironmentHarald Musum2018-03-214-41/+92
|\ \ \ | | | | | | | | Set jvm args for config server in environment
| * | | Add container environment resolverHarald Musum2018-03-205-47/+91
| | | |
| * | | Set jvm args for config server in environmentHarald Musum2018-03-203-0/+7
| |/ /
* | | Merge pull request #5395 from ↵Tor Brede Vekterli2018-03-202-22/+4
|\ \ \ | | | | | | | | | | | | | | | | vespa-engine/geirst/cleanup-metrics-consumed-by-clustercontroller Remove "vds.filestor.*" metrics from consumer fleetcontroller (cluste…
| * | | Remove "vds.filestor.*" metrics from consumer fleetcontroller ↵Geir Storli2018-03-202-22/+4
| | | | | | | | | | | | | | | | (clustercontroller) that are not used.
* | | | Merge pull request #5392 from ↵Tor Brede Vekterli2018-03-2016-51/+133
|\ \ \ \ | |/ / / |/| | | | | | | | | | | vespa-engine/geirst/clustercontroller-config-for-min-merge-completion-ratio Geirst/clustercontroller config for min merge completion ratio
| * | | Add buckets total to per bucket space stats on html status page.Geir Storli2018-03-203-13/+33
| | | |
| * | | Add config to clustercontroller for the min merge completion ratio of ↵Geir Storli2018-03-2013-38/+100
| | | | | | | | | | | | | | | | buckets in a bucket space before it is considered complete.
* | | | Merge pull request #5394 from vespa-engine/havardpe/add-dimension-optimizerArne H Juul2018-03-208-0/+206
|\ \ \ \ | | | | | | | | | | added dense 'add dimension' optimizer
| * | | | added dense 'add dimension' optimizerHåvard Pettersen2018-03-208-0/+206
| | |_|/ | |/| |
* | | | Merge pull request #5393 from vespa-engine/toregge/simplify-matchengineTor Brede Vekterli2018-03-207-117/+3
|\ \ \ \ | |_|_|/ |/| | | Remove unused methods for turning off matchengine.
| * | | Remove unused methods for turning off matchengine.Tor Egge2018-03-207-117/+3
|/ / /
* | | Merge pull request #5387 from ↵Tor Brede Vekterli2018-03-204-27/+98
|\ \ \ | | | | | | | | | | | | | | | | vespa-engine/toregge/abort-operations-to-storage-node-going-down Toregge/abort operations to storage node going down
| * | | Use std::move to avoid unneeded atomic ops.Tor Egge2018-03-201-3/+6
| | | | | | | | | | | | | | | | Add method to check if content node is up.
| * | | Check that queued command will be aborted when storage node goes down.Tor Egge2018-03-201-0/+42
| | | |
| * | | Abort queued operations if storage node is down in new cluster state bundle.Tor Egge2018-03-193-4/+21
| | | |
| * | | Use ClusterStateBundle instead of ClusterState inTor Egge2018-03-192-23/+32
| | | | | | | | | | | | | | | | ChangedBucketOwnershipHandler::OwnershipState.
* | | | Merge pull request #5378 from vespa-engine/balder/no-more-thread-prioritiesTor Brede Vekterli2018-03-2023-1614/+377
|\ \ \ \ | |_|/ / |/| | | Balder/no more thread priorities
| * | | - Use num_threads directly as it has a sane default.Henning Baldersheim2018-03-191-105/+55
| | | | | | | | | | | | | | | | | | | | - Use std::make_ insteda of explicit new. - std::shared_ptr can be assigned from std::unque_ptr. Avoid using release().
| * | | Reduce vertical bloatHenning Baldersheim2018-03-191-67/+32
| | | |
| * | | Use new way of specifying threads.Henning Baldersheim2018-03-191-2/+1
| | | |
| * | | std::make_ instead of 'new'.Henning Baldersheim2018-03-193-239/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: storage/src/vespa/storage/persistence/persistencethread.cpp Resolve merge conflict with removed code.
| * | | Use simple num_threads.Henning Baldersheim2018-03-191-1/+1
| | | |
| * | | No need for an array when you just need a countHenning Baldersheim2018-03-194-80/+19
| | | |
| * | | Clean out priority blocking stuff in PersistenceThreadHenning Baldersheim2018-03-1917-957/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: storage/src/tests/persistence/filestorage/filestormanagertest.cpp Resolve merge conflict.
| * | | Remove thread priority concept, has not added anything but complexity for a ↵Henning Baldersheim2018-03-1912-182/+94
| | | | | | | | | | | | | | | | very long time.
* | | | Merge pull request #5388 from vespa-engine/mpolden/improve-json-matchingJon Marius Venstad2018-03-202-4/+8
|\ \ \ \ | |_|_|/ |/| | | Less greedy matching
| * | | Less greedy matchingMartin Polden2018-03-202-4/+8
| | |/ | |/|
* | | Merge pull request #5381 from vespa-engine/bratseth/dont-exclude-tf-jniJon Bratseth2018-03-191-7/+0
|\ \ \ | | | | | | | | Don't exclude TensorFlow JNI
| * | | Don't exclude TensorFlow JNIJon Bratseth2018-03-191-7/+0
| | | | | | | | | | | | | | | | It is not necessarily installed on the machine in open source environments.
* | | | Merge pull request #5377 from vespa-engine/bratseth/reduce-old-junit-usageJon Bratseth2018-03-1949-333/+545
|\ \ \ \ | | | | | | | | | | Nonfunctional changes only
| * | | | Make publicJon Bratseth2018-03-192-2/+2
| | | | |
| * | | | Nonfunctional changes onlyJon Bratseth2018-03-1949-331/+543
| | | | |
* | | | | Merge pull request #5384 from vespa-engine/havardpe/remove-dimension-optimizerArne H Juul2018-03-1911-5/+200
|\ \ \ \ \ | | | | | | | | | | | | added dense remove dimension optimizer
| * | | | | added dense remove dimension optimizerHåvard Pettersen2018-03-1911-5/+200
| | | | | |
* | | | | | Merge pull request #5383 from ↵Tor Brede Vekterli2018-03-193-6/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/geirst/fix-cluster-stats-change-tracker-in-clustercontroller Fix ClusterStatsChangeTracker to handle case where current node is no…
| * | | | | | Fix ClusterStatsChangeTracker to handle case where current node is not found ↵Geir Storli2018-03-193-6/+15
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | in previous state. Cluster stats may have changed in this case.
* | | | | | Merge pull request #5385 from ↵Jon Bratseth2018-03-191-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/musum/add-guard-for-tenant-not-existing Add guard for tenant not existing
| * | | | | | Add guard for tenant not existingHarald Musum2018-03-191-1/+1
|/ / / / / /
* | | | | | Merge pull request #5382 from ↵Geir Storli2018-03-195-15/+128
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | vespa-engine/vekterli/immediately-send-getnodestate-reply-on-no-pending-merges-edge-rebased Immediately send GetNodeState reply on "no more merges" pending edge (rebased)
| * | | | | Immediately send GetNodeState reply on "no more merges" pending edgeTor Brede Vekterli2018-03-195-15/+128
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Lets the cluster controller update the derived bucket space states as quickly as possible when merges are done for the global space, without having to wait for the normal reply timeout period.