Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Jvenstad/zone cleanup 4" | Jon Marius Venstad | 2018-01-02 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into jvenstad/zone-cleanup-4 | Jon Marius Venstad | 2018-01-02 | 35 | -127/+147 |
|\ | |||||
| * | use new LoggingRequestHandler constructor | Arne Juul | 2017-12-27 | 31 | -121/+131 |
| | | |||||
| * | Remove container-clustercontroller from list of services to check | Harald Musum | 2017-12-19 | 1 | -2/+0 |
| | | | | | | | | | | container loads the same bundles, so it should be safe to remove clustercontroller completely | ||||
| * | Skip checking config convergence for clustercontroller | Harald Musum | 2017-12-19 | 1 | -1/+2 |
| | | |||||
| * | Use one supervisor and transport and shut it down once it not needed anymore. | Henning Baldersheim | 2017-12-18 | 3 | -5/+16 |
| | | |||||
* | | Conflicts | Jon Marius Venstad | 2017-12-15 | 5 | -18/+19 |
|\| | |||||
| * | Do async file distribution (when preparing application) when file ↵ | Harald Musum | 2017-12-14 | 5 | -18/+19 |
| | | | | | | | | | | | | distributor disable Also: Don't cancel future when getting dile references started by async file distribution | ||||
* | | Conflict resolved | Jon Marius Venstad | 2017-12-14 | 7 | -15/+69 |
|\| | |||||
| * | Set timeout for internal deployment in one place | Harald Musum | 2017-12-13 | 3 | -3/+19 |
| | | | | | | | | | | Use barrier timeout as basis for timeout, in the same way we do for external deployments. | ||||
| * | Notify config proxy about starting downloads while preparing | Harald Musum | 2017-12-13 | 4 | -12/+50 |
| | | | | | | | | Code not activated yet | ||||
* | | Moved ZoneId to controller-api and added Zones | Jon Marius Venstad | 2017-12-14 | 1 | -1/+1 |
|/ | |||||
* | Remove duplicate unused code. | Henning Baldersheim | 2017-12-11 | 1 | -10/+0 |
| | |||||
* | Need to change new code as well | Jon Marius Venstad | 2017-12-11 | 6 | -19/+129 |
|\ | |||||
| * | Merge pull request #4397 from ↵ | Harald Musum | 2017-12-09 | 3 | -3/+17 |
| |\ | | | | | | | | | | | | | vespa-engine/hmusum/settable-status-value-in-state-API Make it possible to configure and change status code in /state/v1/hea… | ||||
| | * | Log when changing status and set status to 'down' when RPC server is shutdown | Harald Musum | 2017-12-09 | 1 | -0/+1 |
| | | | |||||
| | * | Make it possible to configure and change status code in /state/v1/health API | Harald Musum | 2017-12-08 | 3 | -3/+16 |
| | | | | | | | | | | | | | | | Make inital value configurable and make it possible to get and set it in StateMonitor | ||||
| * | | Fix some issues related to RPC methods for file distribution | Harald Musum | 2017-12-09 | 1 | -7/+4 |
| | | | |||||
| * | | Let transfer method be config until it works fine. | Henning Baldersheim | 2017-12-08 | 1 | -1/+6 |
| | | | |||||
| * | | Use the LazyFileReferenceData to avoid filling memory. | Henning Baldersheim | 2017-12-08 | 1 | -9/+5 |
| | | | |||||
| * | | Implement the chunked transfer. | Henning Baldersheim | 2017-12-08 | 1 | -4/+101 |
| | | | |||||
| * | | Use a ByteChannel interface instead. | Henning Baldersheim | 2017-12-08 | 2 | -2/+2 |
| | | | |||||
| * | | Make a abstract FileReferenceData so it can cater for both whole files and ↵ | Henning Baldersheim | 2017-12-08 | 1 | -2/+3 |
| |/ | | | | | | | chunked files. | ||||
* | | Replaced inheritance with delegation | Jon Marius Venstad | 2017-12-08 | 1 | -1/+1 |
| | | |||||
* | | Revert "Factory constructor with region/env" | Jon Marius Venstad | 2017-12-08 | 2 | -4/+4 |
| | | | | | | | | This reverts commit e5f2b434d614b49bef40038ec1fe1d391db62e1e. | ||||
* | | Factory constructor with region/env | Jon Marius Venstad | 2017-12-08 | 2 | -4/+4 |
|/ | |||||
* | Make sure to return detached request | Harald Musum | 2017-12-07 | 1 | -0/+1 |
| | |||||
* | Use different threadsPools for push and pull. | Henning Baldersheim | 2017-12-07 | 1 | -4/+6 |
| | |||||
* | Detach and serve from separate thread. | Henning Baldersheim | 2017-12-07 | 2 | -33/+44 |
| | |||||
* | Handle that a file reference is a directory with many files | Harald Musum | 2017-12-07 | 5 | -44/+139 |
| | | | | Compress on the fly if asked for such a file reference | ||||
* | Split parent + container-dependency-versions from root pom. | gjoranv | 2017-12-01 | 1 | -0/+1 |
| | | | | | | - Add missing dependencies so that all provided non-yahoo jars are listed in container-dependency-versions. - Add relativePath for all child poms of parent. | ||||
* | Revert "Gjoranv/split parent2" | gjoranv | 2017-11-30 | 1 | -1/+0 |
| | |||||
* | Split parent + container-dependency-versions from root pom. | gjoranv | 2017-11-30 | 1 | -0/+1 |
| | | | | | | - Add missing dependencies so that all provided non-yahoo jars are listed in container-dependency-versions. - Add relativePath for all child poms of parent. | ||||
* | Do not assume anything about the default teanant, it is no longer | Harald Musum | 2017-11-29 | 1 | -3/+0 |
| | | | | created when using the Tenants test constructor | ||||
* | Revert "Remove zone from DeployProperties" | Harald Musum | 2017-11-29 | 1 | -2/+5 |
| | |||||
* | Merge pull request #4300 from ↵ | Valerij Fredriksen | 2017-11-29 | 5 | -39/+36 |
|\ | | | | | | | | | vespa-engine/hmusum/set-sessions-path-correctly-in-test-constructor Set sessions path correctly in test constructor | ||||
| * | Set sessions path correctly in test constructor | Harald Musum | 2017-11-29 | 5 | -39/+36 |
| | | | | | | | | No functional changes, some other minor refactorings | ||||
* | | Remove zone from DeployProperties | Harald Musum | 2017-11-28 | 1 | -5/+2 |
|/ | | | | zone is already present in DeployState, no need to duplicate | ||||
* | Merge pull request #4286 from ↵ | Henning Baldersheim | 2017-11-28 | 4 | -9/+16 |
|\ | | | | | | | | | vespa-engine/hmusum/more-wiring-for-disabling-filedistributor More wiring for making it possible to disable filedistributor | ||||
| * | More wiring for making it possible to disable filedistributor | Harald Musum | 2017-11-27 | 4 | -9/+16 |
| | | |||||
* | | Merge pull request #4288 from ↵ | Henning Baldersheim | 2017-11-28 | 3 | -12/+14 |
|\ \ | | | | | | | | | | | | | vespa-engine/hmusum/make-tenants-handling-more-robust Do not create system tenants in constructor. Do not put into map of t… | ||||
| * | | Do not create system tenants in constructor. Do not put into map of tenants ↵ | Harald Musum | 2017-11-27 | 3 | -12/+14 |
| |/ | | | | | | | unless absent | ||||
* | | Merge pull request #4287 from vespa-engine/freva/add-https-bindings | Morten Tokle | 2017-11-28 | 1 | -1/+33 |
|\ \ | |/ |/| | Add HTTPS bindings in configserver-app services.xml | ||||
| * | Add HTTPS bindings in configserver-app services.xml | Valerij Fredriksen | 2017-11-27 | 1 | -1/+33 |
| | | |||||
* | | Make sure file distributor is started when disable_filedistributor is unset | Harald Musum | 2017-11-27 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #4280 from ↵ | Henning Baldersheim | 2017-11-27 | 1 | -1/+1 |
|\ | | | | | | | | | vespa-engine/hmusum/add-setting-for-disabling-filedsitributor Add setting for turning off file distributor | ||||
| * | Add setting for turning off file distributor | Harald Musum | 2017-11-27 | 1 | -1/+1 |
| | | | | | | | | | | | | If set, will not start file distributor on config server host and on tenant nodes, will instead use config proxy and file distribution will be done with RPC calls between config proxy and config server | ||||
* | | Copy file in a way that preserves the content | Harald Musum | 2017-11-25 | 1 | -1/+21 |
|/ | | | | | IOUtils.copy(File, File) copies by using readers and default character set, does not work for binary files). | ||||
* | Implement chained download of file references | Harald Musum | 2017-11-23 | 3 | -6/+86 |
| | | | | | | | * A config server will download from another one (if possible) if it does not have the file itself. * Set error in connection pool when request fails * Use an empty connection pool if only one server | ||||
* | Revert "Hmusum/choose new connection if file reference not found" | Harald Musum | 2017-11-23 | 2 | -27/+5 |
| |