Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #8670 from vespa-engine/gjoranv/use-container-service-type_2 | gjoranv | 2019-03-05 | 10 | -18/+34 |
|\ | | | | | Gjoranv/use container service type 2 | ||||
| * | Use ContainerServiceType in configserver. | gjoranv | 2019-03-04 | 10 | -18/+34 |
| | | |||||
* | | Merge pull request #8676 from ↵ | Håkon Hallingstad | 2019-03-04 | 1 | -2/+2 |
|\ \ | | | | | | | | | | | | | vespa-engine/hakonhall/use-list-instead-of-set-for-flags-rulesconditionsvalues Use List instead of Set for flags rules.conditions.values | ||||
| * | | Use List instead of Set for flags rules.conditions.values | Håkon Hallingstad | 2019-03-04 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #8667 from vespa-engine/hmusum/cleanup-config-server-tests | Harald Musum | 2019-03-04 | 2 | -96/+24 |
|\ \ \ | |_|/ |/| | | Move the one useful test, remove the rest | ||||
| * | | Fix assert | Harald Musum | 2019-03-04 | 1 | -1/+1 |
| | | | |||||
| * | | Move the one useful test, remove the rest | Harald Musum | 2019-03-04 | 3 | -97/+24 |
| | | | |||||
* | | | Revert "Gjoranv/use container service type" | gjoranv | 2019-03-04 | 10 | -34/+18 |
|/ / | |||||
* | | Merge pull request #8657 from vespa-engine/gjoranv/use-container-service-type | gjoranv | 2019-03-04 | 10 | -18/+34 |
|\ \ | |/ |/| | Gjoranv/use container service type | ||||
| * | Use ContainerServiceType in configserver. | gjoranv | 2019-03-01 | 10 | -18/+34 |
| | | |||||
* | | Treat empty nodes as non-existent | Jon Marius Venstad | 2019-03-02 | 1 | -1/+3 |
| | | |||||
* | | Revert "Revert "Revert "Jvenstad/fix config model inconsitency""" | Jon Marius Venstad | 2019-03-01 | 28 | -363/+276 |
| | | |||||
* | | Revert "Revert "Jvenstad/fix config model inconsitency"" | Jon Marius Venstad | 2019-03-01 | 28 | -276/+363 |
|/ | |||||
* | Revert "Jvenstad/fix config model inconsitency" | Harald Musum | 2019-03-01 | 28 | -363/+276 |
| | |||||
* | Merge pull request #8645 from ↵ | Jon Marius Venstad | 2019-03-01 | 28 | -276/+363 |
|\ | | | | | | | | | vespa-engine/jvenstad/fix-config-model-inconsitency Jvenstad/fix config model inconsitency | ||||
| * | Avoid exception in getDeployTime | Jon Marius Venstad | 2019-03-01 | 2 | -3/+6 |
| | | |||||
| * | Create applications only during deployment, and abort activation of ↵ | Jon Marius Venstad | 2019-03-01 | 3 | -1/+4 |
| | | | | | | | | non-existing apps | ||||
| * | Synchronise access to session status of an application, and eliminate some races | Jon Marius Venstad | 2019-03-01 | 9 | -79/+140 |
| | | |||||
| * | Synchronise accesses to applicationSet in RemoteSession to avoid concurrent ↵ | Jon Marius Venstad | 2019-03-01 | 1 | -3/+3 |
| | | | | | | | | loading | ||||
| * | Let TenantRequestHandler own a TenantApplications | Jon Marius Venstad | 2019-02-28 | 3 | -9/+17 |
| | | |||||
| * | Optimise imports | Jon Marius Venstad | 2019-02-28 | 3 | -33/+48 |
| | | |||||
| * | Various cleanup, non-functional | Jon Marius Venstad | 2019-02-28 | 9 | -31/+13 |
| | | |||||
| * | Register applications in TenantApplications before activating their sessions | Jon Marius Venstad | 2019-02-28 | 9 | -29/+44 |
| | | |||||
| * | Minor refactoring, and some renaming | Jon Marius Venstad | 2019-02-28 | 14 | -68/+74 |
| | | |||||
| * | Minor cleanup | Jon Marius Venstad | 2019-02-28 | 5 | -51/+45 |
| | | |||||
* | | Don't do request parsing on jrt transport thread | Bjørn Christian Seime | 2019-02-28 | 2 | -3/+5 |
|/ | | | | | Parsing the slime request body should not be performed on the jrt transport thread as this will reduce max throughput. | ||||
* | Revert "Revert "Reduce heterogeneity by inlining TenantApplications, and ↵ | Harald Musum | 2019-02-27 | 19 | -381/+204 |
| | | | | some small f…"" | ||||
* | Revert "Reduce heterogeneity by inlining TenantApplications, and some small ↵ | Bjørn Christian Seime | 2019-02-27 | 19 | -204/+381 |
| | | | | f…" | ||||
* | Merge pull request #8620 from ↵ | Jon Marius Venstad | 2019-02-27 | 19 | -381/+204 |
|\ | | | | | | | | | vespa-engine/jvenstad/fix-config-model-inconsitency Reduce heterogeneity by inlining TenantApplications, and some small f… | ||||
| * | Clean up imports | Jon Marius Venstad | 2019-02-26 | 2 | -4/+0 |
| | | |||||
| * | Reduce heterogeneity by inlining TenantApplications, and some small fixes | Jon Marius Venstad | 2019-02-26 | 20 | -379/+206 |
| | | |||||
* | | Merge pull request #8609 from ↵ | Jon Marius Venstad | 2019-02-26 | 13 | -108/+54 |
|\| | | | | | | | | | vespa-engine/jvenstad/fix-config-model-inconsitency Jvenstad/fix config model inconsitency | ||||
| * | Make some things thread-safe | Jon Marius Venstad | 2019-02-26 | 1 | -2/+4 |
| | | |||||
| * | Print info about error (think I saw some ConcurrentModEx) | Jon Marius Venstad | 2019-02-26 | 1 | -1/+1 |
| | | |||||
| * | Fix imports and linting | Jon Marius Venstad | 2019-02-26 | 2 | -4/+14 |
| | | |||||
| * | Remove unused parameter | Jon Marius Venstad | 2019-02-26 | 7 | -31/+16 |
| | | |||||
| * | Replace CuratorLock with Lock | Jon Marius Venstad | 2019-02-26 | 3 | -70/+19 |
| | | |||||
* | | Set healt status to down when we decide to go out of rotation | Jon Bratseth | 2019-02-25 | 2 | -14/+17 |
| | | |||||
* | | Remove initiallyInRotation=false option: Not used | Jon Bratseth | 2019-02-22 | 1 | -10/+5 |
|/ | |||||
* | unit test network ports storage | Arne Juul | 2019-02-20 | 1 | -1/+13 |
| | |||||
* | add list of network port allocations | Arne Juul | 2019-02-20 | 1 | -0/+1 |
| | | | | | * add port suffixes to identify individual ports for a service * stash port reservations from current config model | ||||
* | Revert "Revert "Use VIP status file for config server (and controller) in ↵ | Harald Musum | 2019-02-14 | 3 | -26/+70 |
| | | | | hosted"" | ||||
* | Revert "Use VIP status file for config server (and controller) in hosted" | Harald Musum | 2019-02-14 | 3 | -70/+26 |
| | |||||
* | Merge pull request #8480 from ↵ | Harald Musum | 2019-02-14 | 3 | -26/+70 |
|\ | | | | | | | | | vespa-engine/hmusum/use-vip-status-file-for-config-server-in-hosted-vespa Use VIP status file for config server (and controller) in hosted | ||||
| * | Fixes after code review | Harald Musum | 2019-02-13 | 1 | -1/+1 |
| | | |||||
| * | Use VIP status file for config server (and controller) in hosted | Harald Musum | 2019-02-13 | 3 | -27/+71 |
| | | | | | | | | | | | | | | | | The code for setting up VIP status is already in place in config model, but depends on value of hostedVespa() in ModelContext.Properties, so have to make sure that is set for standalone container as well. Removing config override for vip status, as setting VIP in or out of rotation when not using a VIP status file is handled when bootstrapping now. | ||||
* | | Move one test, remove a redundant one | Harald Musum | 2019-02-13 | 2 | -54/+27 |
|/ | |||||
* | Make sure to deconstruct component at end of test | Harald Musum | 2019-02-12 | 1 | -0/+1 |
| | |||||
* | Merge pull request #8449 from ↵ | Jon Marius Venstad | 2019-02-11 | 1 | -0/+7 |
|\ | | | | | | | | | vespa-engine/jvenstad/cache-orchestrator-host-statuses-for-reads Jvenstad/cache orchestrator host statuses for reads | ||||
| * | Expose host status cache, and use it for all bulk operations | Jon Marius Venstad | 2019-02-08 | 1 | -0/+7 |
| | |