aboutsummaryrefslogtreecommitdiffstats
path: root/configserver
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Jvenstad/zone cleanup 4"Jon Marius Venstad2018-01-021-1/+1
|
* Merge branch 'master' into jvenstad/zone-cleanup-4Jon Marius Venstad2018-01-0235-127/+147
|\
| * use new LoggingRequestHandler constructorArne Juul2017-12-2731-121/+131
| |
| * Remove container-clustercontroller from list of services to checkHarald Musum2017-12-191-2/+0
| | | | | | | | | | container loads the same bundles, so it should be safe to remove clustercontroller completely
| * Skip checking config convergence for clustercontrollerHarald Musum2017-12-191-1/+2
| |
| * Use one supervisor and transport and shut it down once it not needed anymore.Henning Baldersheim2017-12-183-5/+16
| |
* | ConflictsJon Marius Venstad2017-12-155-18/+19
|\|
| * Do async file distribution (when preparing application) when file ↵Harald Musum2017-12-145-18/+19
| | | | | | | | | | | | distributor disable Also: Don't cancel future when getting dile references started by async file distribution
* | Conflict resolvedJon Marius Venstad2017-12-147-15/+69
|\|
| * Set timeout for internal deployment in one placeHarald Musum2017-12-133-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 preparingHarald Musum2017-12-134-12/+50
| | | | | | | | Code not activated yet
* | Moved ZoneId to controller-api and added ZonesJon Marius Venstad2017-12-141-1/+1
|/
* Remove duplicate unused code.Henning Baldersheim2017-12-111-10/+0
|
* Need to change new code as wellJon Marius Venstad2017-12-116-19/+129
|\
| * Merge pull request #4397 from ↵Harald Musum2017-12-093-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 shutdownHarald Musum2017-12-091-0/+1
| | |
| | * Make it possible to configure and change status code in /state/v1/health APIHarald Musum2017-12-083-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 distributionHarald Musum2017-12-091-7/+4
| | |
| * | Let transfer method be config until it works fine.Henning Baldersheim2017-12-081-1/+6
| | |
| * | Use the LazyFileReferenceData to avoid filling memory.Henning Baldersheim2017-12-081-9/+5
| | |
| * | Implement the chunked transfer.Henning Baldersheim2017-12-081-4/+101
| | |
| * | Use a ByteChannel interface instead.Henning Baldersheim2017-12-082-2/+2
| | |
| * | Make a abstract FileReferenceData so it can cater for both whole files and ↵Henning Baldersheim2017-12-081-2/+3
| |/ | | | | | | chunked files.
* | Replaced inheritance with delegationJon Marius Venstad2017-12-081-1/+1
| |
* | Revert "Factory constructor with region/env"Jon Marius Venstad2017-12-082-4/+4
| | | | | | | | This reverts commit e5f2b434d614b49bef40038ec1fe1d391db62e1e.
* | Factory constructor with region/envJon Marius Venstad2017-12-082-4/+4
|/
* Make sure to return detached requestHarald Musum2017-12-071-0/+1
|
* Use different threadsPools for push and pull.Henning Baldersheim2017-12-071-4/+6
|
* Detach and serve from separate thread.Henning Baldersheim2017-12-072-33/+44
|
* Handle that a file reference is a directory with many filesHarald Musum2017-12-075-44/+139
| | | | Compress on the fly if asked for such a file reference
* Split parent + container-dependency-versions from root pom.gjoranv2017-12-011-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"gjoranv2017-11-301-1/+0
|
* Split parent + container-dependency-versions from root pom.gjoranv2017-11-301-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 longerHarald Musum2017-11-291-3/+0
| | | | created when using the Tenants test constructor
* Revert "Remove zone from DeployProperties"Harald Musum2017-11-291-2/+5
|
* Merge pull request #4300 from ↵Valerij Fredriksen2017-11-295-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 constructorHarald Musum2017-11-295-39/+36
| | | | | | | | No functional changes, some other minor refactorings
* | Remove zone from DeployPropertiesHarald Musum2017-11-281-5/+2
|/ | | | zone is already present in DeployState, no need to duplicate
* Merge pull request #4286 from ↵Henning Baldersheim2017-11-284-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 filedistributorHarald Musum2017-11-274-9/+16
| |
* | Merge pull request #4288 from ↵Henning Baldersheim2017-11-283-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 Musum2017-11-273-12/+14
| |/ | | | | | | unless absent
* | Merge pull request #4287 from vespa-engine/freva/add-https-bindingsMorten Tokle2017-11-281-1/+33
|\ \ | |/ |/| Add HTTPS bindings in configserver-app services.xml
| * Add HTTPS bindings in configserver-app services.xmlValerij Fredriksen2017-11-271-1/+33
| |
* | Make sure file distributor is started when disable_filedistributor is unsetHarald Musum2017-11-271-1/+1
|/
* Merge pull request #4280 from ↵Henning Baldersheim2017-11-271-1/+1
|\ | | | | | | | | vespa-engine/hmusum/add-setting-for-disabling-filedsitributor Add setting for turning off file distributor
| * Add setting for turning off file distributorHarald Musum2017-11-271-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 contentHarald Musum2017-11-251-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 referencesHarald Musum2017-11-233-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 Musum2017-11-232-27/+5
|