summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [7.161.1-1].vespa-7.161.1-1sd-buildbot2020-01-204-1/+2
| | | | | | Created by command: /usr/bin/tito tag --use-version=7.161.1 --no-auto-changelog
* Merge pull request #11779 from ↵Jon Marius Venstad2020-01-151-1/+2
|\ | | | | | | | | vespa-engine/jvenstad/decouple-systemtest-framework-and-vespa-versions-again Decouple test-framework.version from vespaversion for tenant-cd
| * Decouple test-framework.version from vespaversion for tenant-cdJon Marius Venstad2020-01-141-1/+2
| |
* | Merge pull request #11787 from vespa-engine/bratseth/tag-dependency-cleanupJon Bratseth2020-01-143-11/+14
|\ \ | | | | | | Make tag name dependency static
| * | Make tag name dependency staticJon Bratseth2020-01-143-11/+14
| |/
* | Merge pull request #11761 from ↵Jon Bratseth2020-01-145-21/+105
|\ \ | | | | | | | | | | | | vespa-engine/vekterli/avoid-inconsistent-auto-created-document-versions-taking-precedence Avoid inconsistent auto-created document versions taking precedence
| * | Avoid inconsistent auto-created document versions taking precedenceTor Brede Vekterli2020-01-135-21/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create-if-missing updates have a rather finicky behavior in the backend, wherein they'll set the timestamp of the previous document to that of the _new_ document timestamp if the update ended up creating a document from scratch. This particular behavior confuses the "after the fact" timestamp consistency checks, since it will seem like the document that was created from scratch is a better candidate to force convergence towards rather than the ones that actually updated an existing document. With this change we therefore detect this case specially and treat the received timestamps as if the document updated had a timestamp of zero. This matches the behavior of regular (non auto-create) updates. Note that another venue for solving this would be to alter the returned timestamp in the backend to be zero instead, but this would cause issues during rolling upgrades since some of the content nodes would be returning zero timestamps while others would be returning non-zero. This would in turn trigger false positives for the inconsistency sanity checks. Also note that this is a fallback path that should not be hit unless the a-priori inconsistency checks in the two-phase update operation somehow fails to recognize that the document versions may be out of sync. This relates to issue #11686
* | | Merge pull request #11773 from ↵Jon Bratseth2020-01-145-3/+22
|\ \ \ | | | | | | | | | | | | | | | | vespa-engine/hmusum/add-close-methods-to-shutdown-executor Make sure to shutdown executor
| * | | Make sure to shutdown executorHarald Musum2020-01-145-3/+22
| | | |
* | | | Merge pull request #11780 from ↵Jon Bratseth2020-01-141-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | vespa-engine/toregge/fix-format-string-docstore-compacter Fix format string
| * | | | Fix format string.Tor Egge2020-01-141-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #11778 from vespa-engine/mpolden/test-jdisc-clusterJon Bratseth2020-01-141-25/+28
|\ \ \ \ | | | | | | | | | | Test combined with jdisc tag
| * | | | Test combined with jdisc tagMartin Polden2020-01-141-25/+28
| | | | |
* | | | | Merge pull request #11781 from vespa-engine/bratseth/add-a-testJon Bratseth2020-01-145-8/+14
|\ \ \ \ \ | |_|/ / / |/| | | | Unit test 1-d map short form modify update
| * | | | Unit test 1-d map short form modify updateJon Bratseth2020-01-145-8/+14
| | | | |
* | | | | Merge pull request #11775 from ↵Harald Musum2020-01-1412-296/+53
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/revert-11771-bjorncs/access-control-validation Revert "Bjorncs/access control validation" MERGEOK
| * | | | | Revert "Bjorncs/access control validation"Bjørn Christian Seime2020-01-1412-296/+53
|/ / / / /
* | | | | Merge pull request #11771 from vespa-engine/bjorncs/access-control-validationBjørn Christian Seime2020-01-1412-53/+296
|\ \ \ \ \ | |_|/ / / |/| | | | Bjorncs/access control validation
| * | | | Validate presence of http filter when 'access-control' is enabledBjørn Christian Seime2020-01-1310-41/+284
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add AccessControlFilterValidator that verifies precense of http filter. Remove use of 'access-control' in ImplicitIndexingClusterTest. Introduce HostedConfigModelRegistry for hosted specific tests using 'access-control'.
| * | | | Rename 'AccessControlValidator' to 'AccessControlOnFirstDeploymentValidator'Bjørn Christian Seime2020-01-103-12/+12
| | | | |
* | | | | Merge pull request #11772 from vespa-engine/havardpe/tensor-mergeArne H Juul2020-01-1436-17/+403
|\ \ \ \ \ | | | | | | | | | | | | tensor merge
| * | | | | tensor mergeHåvard Pettersen2020-01-1336-17/+403
| | | | | |
* | | | | | Merge pull request #11774 from ↵Martin Polden2020-01-144-35/+4
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | vespa-engine/bratseth/combined-also-with-jdisk-tag Bratseth/combined also with jdisc tag MERGEOK
| * | | | | Correct spellingJon Bratseth2020-01-141-1/+1
| | | | | |
| * | | | | Allow referencing conternt clusters also from 'jdisk' tagsJon Bratseth2020-01-141-1/+1
| | | | | |
| * | | | | Revert "Merge pull request #11770 from ↵Jon Bratseth2020-01-143-34/+3
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/mpolden/restore-content-combined-substition" This reverts commit 7250e7a5cfafaa8e52a56c7990437be740761093, reversing changes made to d220c3dd187e908afa015d5990e6dbbeb2e9876b.
* | | | | Merge pull request #11767 from ↵Jon Marius Venstad2020-01-141-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/bratseth/allow-multiple-testers-on-one-parent Allow multiple testers on the same parent
| * | | | | Allow multiple testers on the same parentJon Bratseth2020-01-131-1/+1
| | | | | |
* | | | | | Merge pull request #11769 from ↵Jon Bratseth2020-01-139-38/+49
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | vespa-engine/revert-11750-revert-11745-bratseth/require-equal-sizes-in-join-2 Revert "Revert "Revert "Revert "Require equal sizes in join""""
| * | | | | Revert "Revert "Revert "Revert "Require equal sizes in join""""Jon Bratseth2020-01-139-38/+49
| | | | | |
* | | | | | Merge pull request #11770 from ↵Martin Polden2020-01-133-3/+34
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | vespa-engine/mpolden/restore-content-combined-substition Revert "Remove unnecessary content/combined substitution"
| * | | | | Revert "Remove unnecessary content/combined substitution"Martin Polden2020-01-133-3/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0e3637dfdd8c7301cefe986c889971efad1f3781. Removed too early. Need to wait until old config models disappear.
* | | | | | Merge pull request #11768 from vespa-engine/bratseth/crude-public-quotaJon Bratseth2020-01-131-1/+5
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Crude public quota check
| * | | | | Crude public quota checkJon Bratseth2020-01-131-1/+5
| | |/ / / | |/| | |
* | | | | Merge pull request #11766 from ↵Jon Bratseth2020-01-137-17/+55
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | vespa-engine/bratseth/convert-tensor-update-to-sparse Convert tensor update to sparse
| * | | | Convert tensor update to sparseJon Bratseth2020-01-137-17/+55
| | | | |
* | | | | Merge pull request #11764 from ↵Henning Baldersheim2020-01-1311-38/+48
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/balder/log-max-bucketizerguard-holdtime-in-us Balder/log max bucketizerguard holdtime in us
| * | | | | General code health in the vicinity.Henning Baldersheim2020-01-139-34/+32
| | | | | |
| * | | | | Track how long bucketizer guard is held during compaction.Henning Baldersheim2020-01-132-4/+16
| | | | | |
* | | | | | Merge pull request #11765 from ↵Jon Bratseth2020-01-132-6/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/lesters/revert-revert-resolving-input-types Lesters/revert revert resolving input types
| * | | | | | Fix expected output type of mnist model testLester Solbakken2020-01-131-1/+1
| | | | | | |
| * | | | | | Revert "Revert "Lesters/resolve input types for stateless model evaluation 2""Lester Solbakken2020-01-131-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1449f771fbbcfc235d88a7b73b51f8b88ebc53cb.
* | | | | | | Merge pull request #11758 from vespa-engine/hmusum/try-to-stabilize-testJon Bratseth2020-01-131-115/+116
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Hmusum/try to stabilize test
| * | | | | | Shutdown search cluster monitoring after useHarald Musum2020-01-131-92/+105
| | | | | | |
| * | | | | | Remove unused executor, log if we get InterruptedExceptionHarald Musum2020-01-131-24/+12
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #11757 from vespa-engine/mpolden/system-upgrader-targetMartin Polden2020-01-1311-86/+126
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Avoid checking every node when setting upgrade target
| * | | | | Do not deploy routing application if no nodes are allocatedMartin Polden2020-01-132-11/+25
| | | | | |
| * | | | | Rename fieldMartin Polden2020-01-131-4/+6
| | | | | |
| * | | | | Rename methodMartin Polden2020-01-133-4/+4
| | | | | |
| * | | | | Avoid checking every node when setting upgrade targetMartin Polden2020-01-139-71/+95
| |/ / / /