summaryrefslogtreecommitdiffstats
path: root/configserver
Commit message (Collapse)AuthorAgeFilesLines
* Log at debug level time used in prepare stepsHarald Musum2017-09-291-0/+2
|
* Merge pull request #3572 from vespa-engine/hmusum/set-timeout-for-prepareMartin Polden2017-09-282-2/+7
|\ | | | | Set correct timeout for prepare requests
| * Set correct timeout for prepare requestsHarald Musum2017-09-282-2/+7
| |
* | Merge pull request #3562 from ↵Arnstein Ressem2017-09-282-0/+13
|\ \ | |/ |/| | | | | vespa-engine/revert-3561-revert-3554-aressem/remove-post-install-script Revert "Revert "Aressem/remove post install script""
| * Revert "Revert "Aressem/remove post install script""Arnstein Ressem2017-09-272-0/+13
| |
* | Merge pull request #3496 from ↵Harald Musum2017-09-281-1/+2
|\ \ | | | | | | | | | | | | vespa-engine/hmusum/dont-rethrow-application-lock-exception-as-illegal-argument-exception Do not rethrow ApplicationLockException as IllegalArgumentException
| * | Do not rethrow ApplicationLockException as IllegalArgumentExceptionHarald Musum2017-09-221-1/+2
| | |
* | | Merge pull request #3549 from vespa-engine/balder/preserve-framepointerHenning Baldersheim2017-09-271-0/+1
|\ \ \ | |_|/ |/| | The cost of preserving the framepointer is small enough to allow it b…
| * | The cost of preserving the framepointer is small enough to allow it being ↵Henning Baldersheim2017-09-271-0/+1
| | | | | | | | | | | | | | | | | | | | | default. Performance information benefits is significant and will over time counter the cost. Observed cost has been below the noise level in the 1% range.
* | | Revert "Aressem/remove post install script"Arnstein Ressem2017-09-272-13/+0
| | |
* | | Merge pull request #3554 from vespa-engine/aressem/remove-post-install-scriptArnstein Ressem2017-09-272-0/+13
|\ \ \ | | | | | | | | Aressem/remove post install script
| * | | Create zookeeper dir.Arnstein Ressem2017-09-261-0/+1
| | | |
| * | | Fix directories.Arnstein Ressem2017-09-261-0/+9
| | | |
| * | | Remove global install of files and put this in the modules that owns them.Arnstein Ressem2017-09-251-0/+3
| | | |
* | | | Merge branch 'master' into hakon/move-supermodel-to-config-model-apiHåkon Hallingstad2017-09-261-2/+4
|\ \ \ \ | | |/ / | |/| |
| * | | Check for sessions changed after reconnectingHarald Musum2017-09-261-2/+4
| |/ /
* / / Move SuperModel to config-model-apiHåkon Hallingstad2017-09-2510-156/+143
|/ / | | | | | | This avoids duplication of datastructures in service monitor
* | Remove unnecessary sleepHarald Musum2017-09-211-2/+0
| |
* | Add proper test of prugin of old inactive sessionsHarald Musum2017-09-2116-110/+183
|/ | | | | | * Add support for injecting a clock to make it possible to test time-related scenarios * Add test
* Merge pull request #3473 from vespa-engine/hmusum/non-functional-changesHarald Musum2017-09-218-78/+72
|\ | | | | Document and rename to make code easier to understand
| * Add missing slashHarald Musum2017-09-211-1/+1
| |
| * Document and rename to make code easier to understandHarald Musum2017-09-208-78/+72
| |
* | Merge pull request #3466 from ↵hakonhall2017-09-206-69/+39
|\ \ | |/ |/| | | | | vespa-engine/hakon/move-supermodel-api-to-config-model-api Move SuperModel API to config-model-api
| * Move SuperModel API to config-model-apiHåkon Hallingstad2017-09-206-69/+39
| |
* | Clarify test intentHarald Musum2017-09-201-0/+5
|/
* Remove unused directory used only in previous versionsHarald Musum2017-09-181-2/+0
|
* Merge branch 'master' into hmusum/only-create-hosted-vespa-tenant-on-hostedHarald Musum2017-09-1743-148/+273
|\
| * Merge pull request #3382 from vespa-engine/bratseth/support-error-removalArne H Juul2017-09-136-13/+11
| |\ | | | | | | Bratseth/support error removal
| | * Nonfunctional changes onlyJon Bratseth2017-09-116-13/+11
| | |
| * | Merge pull request #3389 from ↵hakonhall2017-09-1215-98/+209
| |\ \ | | |/ | |/| | | | | | | vespa-engine/hakon/add-component-managing-the-supermodel Add component managing the SuperModel
| | * Add component managing the SuperModelHåkon Hallingstad2017-09-1115-98/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is the prerequisite step for having the Orchestrator depend on the SuperModel component, getting notified via SuperModelListener about newly activated or removed applications. The Orchestrator will then register for Slobrok as necessary, and also update its data structures of the model.
| * | Throw exception when not getting activate lock within timeoutHarald Musum2017-09-111-1/+1
| |/
| * Fix deployment spec cast in container cluster modelMartin Polden2017-09-082-2/+2
| |
| * Avoid creating strings unless necessaryHarald Musum2017-09-071-2/+2
| |
| * Add request to log lineHarald Musum2017-09-071-2/+2
| |
| * Add debug log line for config generation for supermodel configsHarald Musum2017-09-071-1/+4
| |
| * Use a more specific error codeHarald Musum2017-09-072-3/+3
| |
| * Merge pull request #3327 from ↵Harald Musum2017-09-065-15/+44
| |\ | | | | | | | | | | | | vespa-engine/revert-3308-revert-2934-hmusum/use-409-response-code-for-failing-activation Revert "Revert "Return 409 if there is a conflict when activating""
| | * Revert "Revert "Return 409 if there is a conflict when activating""Harald Musum2017-09-055-15/+44
| | |
| * | Merge pull request #3287 from ↵gjoranv2017-09-0515-16/+0
| |\ \ | | |/ | |/| | | | | | | vespa-engine/revert-3275-revert-3260-hmusum/remove-version-from-def-files Revert 3275 revert 3260 hmusum/remove version from def files
| | * Merge branch 'master' into ↵Harald Musum2017-08-311-4/+2
| | |\ | | | | | | | | | | | | revert-3275-revert-3260-hmusum/remove-version-from-def-files
| | * | Revert "Revert "version in def files are deprecated""Harald Musum2017-08-3015-16/+0
| | | |
| * | | Catch ThrowableHarald Musum2017-09-041-1/+1
| | | |
| * | | Catch Error and log at a place where thread will otherwise die silentlyHarald Musum2017-09-041-1/+1
| | | |
* | | | Only create hosted-vespa tenant on hosted installationsHarald Musum2017-09-042-10/+11
|/ / /
* | | Revert "Return 409 if there is a conflict when activating"gjoranv2017-09-015-44/+15
| | |
* | | Merge pull request #2934 from ↵Jon Bratseth2017-08-315-15/+44
|\ \ \ | | | | | | | | | | | | | | | | vespa-engine/hmusum/use-409-response-code-for-failing-activation Return 409 if there is a conflict when activating
| * | | Rename exceptionHarald Musum2017-08-313-7/+7
| | | |
| * | | Return 409 if there is a conflict when activatingHarald Musum2017-07-105-15/+44
| | | |
* | | | Merge pull request #3251 from vespa-engine/bjorncs/reduce-mem-usage-configserverBjørn Christian Seime2017-08-311-0/+4
|\ \ \ \ | |_|_|/ |/| | | Reduce number of config server worker threads from default (500)