summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* render maps with string keys as JSON objectsArne Juul2018-06-152-4/+90
| | | | | | | | * if structured data is an array of <key,value> objects, we prefer to render it as a JSON object since it is most likely a map in the document definition. * makes docsum rendering a closer match with document rendering and feed input format.
* Merge pull request #6209 from ↵Jon Bratseth2018-06-151-11/+11
|\ | | | | | | | | vespa-engine/hakonhall/only-count-time-with-no-threads-available Only count time with no threads available
| * Change field nameJon Bratseth2018-06-151-3/+3
| |
| * Only count time with no threads availableHåkon Hallingstad2018-06-141-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Found this edge-case with logAndDie in ThreadPoolProvider: - A Runnable executes and finishes at time T0 - No Runnables execute for a long time t > maxThreadExecutionTimeSeconds - At time T1 = T0 + t, a bursts of Runnables N > maxthreads arrives such that the (maxthreads+1) Runnable will be tried executed and rejected before any of the first maxthreads Runnables finish. - Then, logOrDie will be called immediately. That is, a sufficiently silent period followed by a burst of Runnables cause the process to die. This PR will make sure that the process dies only if maxThreadExecutionTimeSeconds seconds pass with no available threads, like the documentation says. I found this as I was looking for reasons why the Cluster Controller have had logAndDie problems. The CC has maxthreads of 10, and was getting bursts of 6-8 of a particular request type (reduced in PR 6207).
* | Merge pull request #6202 from ↵Henning Baldersheim2018-06-1430-273/+141
|\ \ | | | | | | | | | | | | vespa-engine/balder/remove-version-and-avoid-going-between-nbostrea-and-bytebuffer Balder/remove version and avoid going between nbostrea and bytebuffer
| * | Update commentsHenning Baldersheim2018-06-145-17/+7
| | |
| * | Update after comments from @vekterliHenning Baldersheim2018-06-1415-65/+26
| | |
| * | ByteBuffer -> nbostreamHenning Baldersheim2018-06-149-36/+30
| | |
| * | Remove unused versionHenning Baldersheim2018-06-1411-32/+19
| | |
| * | Remove unused version from apiHenning Baldersheim2018-06-1418-50/+34
| | |
| * | ByteBuffer -> nbostreamHenning Baldersheim2018-06-1418-120/+72
| | |
* | | Merge pull request #6213 from ↵Henning Baldersheim2018-06-147-70/+356
|\ \ \ | | | | | | | | | | | | | | | | vespa-engine/geirst/validate-complex-attribute-fields-in-config-model Geirst/validate complex attribute fields in config model
| * | | Validate that complex fields that have struct field attributes are supported.Geir Storli2018-06-144-0/+160
| | | | | | | | | | | | | | | | This only applies for indexed search clusters.
| * | | Use document type to resolve struct data types when checking whether a ↵Geir Storli2018-06-144-70/+196
| | | | | | | | | | | | | | | | complex field supports being represented as struct field attributes.
* | | | Merge pull request #6212 from vespa-engine/bjorncs/fix-keystore-passwordBjørn Christian Seime2018-06-141-2/+3
|\ \ \ \ | | | | | | | | | | Set password when creating key entry
| * | | | Set password when creating key entryBjørn Christian Seime2018-06-141-2/+3
| | | | |
* | | | | Merge pull request #6211 from vespa-engine/bjorncs/enable-write-access-var-vespaBjørn Christian Seime2018-06-141-0/+1
|\ \ \ \ \ | |/ / / / |/| | | | Allow container to write to var/vespa
| * | | | Allow container to write to var/vespaBjørn Christian Seime2018-06-141-0/+1
| | |_|/ | |/| |
* | | | Merge pull request #6210 from vespa-engine/bjorncs/node-identifier-filter-fixBjørn Christian Seime2018-06-142-0/+23
|\ \ \ \ | |/ / / |/| | | Allow bare metal tenant nodes with Calypso certificate
| * | | Allow bare metal tenant nodes with Calypso certificateBjørn Christian Seime2018-06-142-0/+23
|/ / /
* | | Merge pull request #6207 from vespa-engine/hakonhall/avoid-set-node-state-retryHåkon Hallingstad2018-06-144-15/+43
|\ \ \ | | | | | | | | Avoid set-node-state retry
| * | | Avoid set-node-state retryHåkon Hallingstad2018-06-144-15/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Today, the Orchestrator will call each cluster controller twice, e.g. indices 1, 2, 0, 1, 2, 0, if each time out. This is unnecessary. The minimum number of calls is 2: - Either the first CC is up and will redirect to master if necessary, or - the second is up and will redirect to master if necessary, or - the third won't have quorum. This PR changes the current strategy to call all CCs once, e.g. indices 1, 2, and 0.
* | | | Merge pull request #6208 from vespa-engine/bjorncs/fixMorten Tokle2018-06-141-1/+1
|\ \ \ \ | | | | | | | | | | Specify scheme and port for configserver endpoint
| * | | | Specify scheme and port for configserver endpointBjørn Christian Seime2018-06-141-1/+1
|/ / / /
* | | | Merge pull request #6133 from vespa-engine/bjorncs/improve-error-messagesBjørn Christian Seime2018-06-142-21/+69
|\ \ \ \ | | | | | | | | | | Try to extract error message from non-2xx responses
| * | | | Remove unnecessary latchBjørn Christian Seime2018-06-141-30/+2
| | | | |
| * | | | Try to extract error message from non-2xx responsesBjørn Christian Seime2018-06-082-3/+79
| | | | |
* | | | | Merge pull request #6198 from ↵Håkon Hallingstad2018-06-145-6/+82
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/hakonhall/do-not-wait-for-version-ack-for-failed-set-node-state Do not wait for version ack for failed set-node-state
| * | | | | Do not wait for version ack for failed set-node-stateHåkon Hallingstad2018-06-135-6/+82
| | | | | |
* | | | | | Merge pull request #6203 from vespa-engine/mpolden/remove-unused-codeMartin Polden2018-06-145-78/+0
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Remove unused code
| * | | | | Remove unused BrooklynStatusResourceMartin Polden2018-06-141-23/+0
| | | | | |
| * | | | | Remove unused common packageMartin Polden2018-06-143-41/+0
| | | | | |
| * | | | | Remove unused HeaderFieldsMartin Polden2018-06-141-14/+0
| | | | | |
* | | | | | Merge pull request #6205 from vespa-engine/balder/return-correct-errorcodeHenning Baldersheim2018-06-142-26/+39
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Catch explicit known exceptions and return correct error code.
| * | | | | Catch explicit known exceptions and return correct error code.Henning Baldersheim2018-06-142-26/+39
|/ / / / /
* | | | | Merge pull request #6204 from ↵Bjørn Christian Seime2018-06-142-75/+78
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/ovirtanen/convert-leftover-test-in-container-jersey2 Container-jersey2: Leftover scala test converted to java
| * | | | | Leftover scala test converted to javaOlli Virtanen2018-06-142-75/+78
| | | | | |
* | | | | | Merge pull request #6196 from vespa-engine/bjorncs/certificate-to-diskMorten Tokle2018-06-1410-203/+261
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Bjorncs/certificate to disk
| * | | | | Store configserver certificate to VESPA_HOME/var/vespa/siaBjørn Christian Seime2018-06-131-58/+39
| | | | | |
| * | | | | Cache tenant certificate and private key to diskBjørn Christian Seime2018-06-132-25/+71
| | | | | |
| * | | | | Add utility methods for reading/writing SIA credentialsBjørn Christian Seime2018-06-131-0/+73
| | | | | |
| * | | | | Remove support for ntokensBjørn Christian Seime2018-06-133-16/+9
| | | | | |
| * | | | | Remove deprecated ZtsClientBjørn Christian Seime2018-06-135-106/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Replace use of old ZtsClient with DefaultZtsClient - Add caching of role tokens - Add constructor to AthenzRole taking only strings - Change new ZtsClient interface to use AthenzRole for getRoleToken
| * | | | | Use pascal case for constantsBjørn Christian Seime2018-06-131-3/+3
| | | | | |
* | | | | | Merge pull request #6192 from ↵Olli Virtanen2018-06-1473-1962/+3057
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/ovirtanen/convert-scala-to-java-in-bundle-plugin Bundle-plugin: Scala code converted to Java
| * | | | | | Bundle-plugin Scala code converted to JavaOlli Virtanen2018-06-1373-1962/+3057
| |/ / / / /
* | | | | | Merge pull request #6197 from vespa-engine/gjoranv/felix-5.6.10Bjørn Christian Seime2018-06-141-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Upgrade felix to 5.6.10
| * | | | | | Upgrade felix to 5.6.10gjoranv2018-06-131-1/+1
| | | | | | |
* | | | | | | Merge pull request #6199 from vespa-engine/gjoranv/shade-pluginBjørn Christian Seime2018-06-141-6/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use shade plugin instead of assembly.
| * | | | | | | Use shade plugin instead of assembly.gjoranv2018-06-141-6/+15
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | NOTE: the fat jar will no longer be attached to the artifact.