summaryrefslogtreecommitdiffstats
path: root/configserver
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* Merge pull request #4261 from ↵Harald Musum2017-11-231-1/+1
|\ | | | | | | | | vespa-engine/hmusum/handle-activeRotationProperty-missing Handle activaRotation property not being set
| * Handle activaRotation property not being setHarald Musum2017-11-231-1/+1
| | | | | | | | | | Note that it might not be set in older config models too, so this will handle that case also
* | Merge pull request #4260 from ↵Henning Baldersheim2017-11-232-5/+27
|\ \ | | | | | | | | | | | | vespa-engine/hmusum/choose-new-connection-if-file-reference-not-found Hmusum/choose new connection if file reference not found
| * | Create connection pool for file server correctlyHarald Musum2017-11-232-5/+27
| | | | | | | | | | | | Use all other config servers than this one.
* | | Print warning with stack trace when NoSuchElementException tooHarald Musum2017-11-231-1/+2
| |/ |/|
* | Merge pull request #4203 from vespa-engine/mortent/identity-in-deploymentMorten Tokle2017-11-236-23/+39
|\ \ | |/ |/| Move identity configuration services.xml -> deployment.xml
| * Fix failing testsMorten Tokle2017-11-236-23/+39
| |
* | Add support for downloading from another config serverHarald Musum2017-11-233-2/+15
| | | | | | | | | | | | | | If a request for a file reference cannot be fulfilled, ask another config server for the file. Handle connection errors when downloading files. Fixed bundle issues.
* | Revert "Revert "Revert "Add support for downloading from another config ↵Harald Musum2017-11-223-15/+2
| | | | | | | | server"""
* | Use correct versionHarald Musum2017-11-211-1/+1
| |
* | Revert "Revert "Add support for downloading from another config server""Harald Musum2017-11-213-2/+15
| |
* | Revert "Add support for downloading from another config server"Harald Musum2017-11-213-15/+2
| |
* | Merge pull request #4221 from ↵Henning Baldersheim2017-11-213-2/+15
|\ \ | | | | | | | | | | | | vespa-engine/hmusum/download-from-another-config-server Add support for downloading from another config server
| * | Add support for downloading from another config serverHarald Musum2017-11-213-2/+15
| | | | | | | | | | | | | | | | | | If a request for a file reference cannot be fulfilled, ask another config server for the file. Handle connection errors when downloading files.
* | | Do not remove from queue when cancellingHarald Musum2017-11-212-9/+12
|/ / | | | | | | | | We have already drained the queue before cancelling a delayed response, so it is a bug to try to remove anything from it
* | Merge pull request #4196 from ↵Jon Bratseth2017-11-212-2/+23
|\ \ | | | | | | | | | | | | vespa-engine/hmusum/return-internal-server-error-when-nullpointerexception Return status code 500 and print stack trace if NullPointerException …
| * | Log properlyHarald Musum2017-11-201-1/+2
| | |
| * | Return status code 500 and print stack trace if NullPointerException is thrownHarald Musum2017-11-182-2/+22
| |/ | | | | | | | | When building a model, return 500 (as opposed to 400 now) and print stack trace when a NullPointerException is thrown
* | Use scheduleWithFixedDelay and log at debug levelHarald Musum2017-11-191-3/+5
| |
* | Periodically check for removed applicationsHarald Musum2017-11-181-4/+14
|/
* Remove PaathProviderHarald Musum2017-11-178-88/+40
| | | | This is a bad neighbourhood, so try to get rid of deceptive and cheating code
* Merge pull request #4145 from vespa-engine/mortent/add-lbaddress-nameMorten Tokle2017-11-163-12/+16
|\ | | | | Add new field for loadbalancername, deprecate loadbalanceraddress
| * Add new field for loadbalancername, deprecate loadbalanceraddressMorten Tokle2017-11-153-12/+16
| |
* | Remove unused includeMartin Polden2017-11-161-1/+0
| |
* | Merge pull request #4155 from ↵Håkon Hallingstad2017-11-161-1/+1
|\ \ | | | | | | | | | | | | vespa-engine/hmusum/log-when-application-is-removed Log when application is removed
| * | Log when applications is removedHarald Musum2017-11-161-1/+1
| |/ | | | | | | | | Want to log here to see if this is actually called when we have issues with config model not being removed when an application is deleted.
* | Merge pull request #4151 from vespa-engine/hmusum/cleanup-zk-paths-for-tenantJon Bratseth2017-11-1611-111/+153
|\ \ | | | | | | Hmusum/cleanup zk paths for tenant
| * | Make naming consistentHarald Musum2017-11-151-3/+3
| | |
| * | Cleanup and simplify code related to zk paths for tenantsHarald Musum2017-11-1511-111/+153
| |/ | | | | | | No functional changes
* / Include optional file access-logging.xml on configserver startupMorten Tokle2017-11-161-0/+1
|/