Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Temporarily ignore unstable orchestrator test" | Bjørn Christian Seime | 2017-11-16 | 1 | -1/+0 |
| | |||||
* | Merge pull request #4172 from ↵ | Geir Storli | 2017-11-16 | 4 | -62/+1 |
|\ | | | | | | | | | vespa-engine/toregge/remove-unused-maintenance-bucket Remove unused class MaintenanceBucket. | ||||
| * | Remove unused class MaintenanceBucket. | Tor Egge | 2017-11-16 | 4 | -62/+1 |
| | | |||||
* | | Merge pull request #4169 from ↵ | gjoranv | 2017-11-16 | 1 | -5/+0 |
|\ \ | | | | | | | | | | | | | vespa-engine/hmusum/dont-depend-on-filedistribution Don't depend on filedistribution | ||||
| * | | Don't depend on filedistribution | Harald Musum | 2017-11-16 | 1 | -5/+0 |
| | | | | | | | | | | | | No need to depend on filedistribution anymore, config defs are now in configdefinitions module | ||||
* | | | Merge pull request #4168 from ↵ | Tor Brede Vekterli | 2017-11-16 | 2 | -5/+5 |
|\ \ \ | | | | | | | | | | | | | | | | | vespa-engine/vekterli/flip-internal-priorities-of-gc-and-move-only-merge Flip internal priorities of GC and move-only merge | ||||
| * | | | Flip internal priorities of GC and move-only merge | Tor Brede Vekterli | 2017-11-16 | 2 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having GC be higher priority than move-only merges meant that slow GC could effectively inhibit node retirement. Furthermore, move-only merges are finite while GC happens indefinitely, so it makes sense to give merging higher priority overall. This fixes #4165 | ||||
* | | | | Merge pull request #4167 from ↵ | Tor Brede Vekterli | 2017-11-16 | 5 | -60/+77 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | vespa-engine/geirst/prepare-storageapi-protocol-serialization-for-new-version-with-bucket-space Geirst/prepare storageapi protocol serialization for new version with bucket space | ||||
| * | | | Add API function to encode a bucket space. | Geir Storli | 2017-11-16 | 5 | -0/+10 |
| | | | | |||||
| * | | | Add API function to encode a bucket. | Geir Storli | 2017-11-16 | 5 | -19/+27 |
| | | | | |||||
| * | | | Add API function to decode a bucket space to reduce direct use of ↵ | Geir Storli | 2017-11-16 | 5 | -3/+11 |
| | | | | | | | | | | | | | | | | placeholder bucket space. | ||||
| * | | | Add API function to decode a bucket to reduce direct use of placeholder ↵ | Geir Storli | 2017-11-16 | 5 | -38/+29 |
| | | | | | | | | | | | | | | | | bucket space. | ||||
* | | | | Merge pull request #4163 from ↵ | Jon Bratseth | 2017-11-16 | 3 | -36/+50 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | vespa-engine/lesters/enable-tensor-conformance-test Enable Java tensor conformance test | ||||
| * | | | | Enable Java tensor conformance test | Lester Solbakken | 2017-11-16 | 3 | -36/+50 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #4164 from ↵ | Geir Storli | 2017-11-16 | 6 | -0/+21 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | vespa-engine/toregge/add-getbucket-method-to-storage-commands Add getBucket() method to storage commands/replies. | ||||
| * | | | Add getBucket() method to storage commands/replies that have | Tor Egge | 2017-11-16 | 6 | -0/+21 |
| |/ / | | | | | | | | | | | | | bucket space but no specific bucket id. Returns bucket with proper bucket space and unset (aka null) bucket id. | ||||
* | | | Merge pull request #4162 from ↵ | Arnstein Ressem | 2017-11-16 | 10 | -156/+15 |
|\ \ \ | | | | | | | | | | | | | | | | | vespa-engine/revert-4140-hmusum/move-new-filedistribution-classes Revert "Hmusum/move new filedistribution classes" | ||||
| * | | | Revert "Hmusum/move new filedistribution classes" | Harald Musum | 2017-11-16 | 10 | -156/+15 |
| |/ / | |||||
* | | | Merge pull request #4161 from vespa-engine/bjorncs/fix | gjoranv | 2017-11-16 | 1 | -0/+2 |
|\ \ \ | |/ / |/| | | Assert that there is only a single injected component | ||||
| * | | Assert that there is only a single injected component | Bjørn Christian Seime | 2017-11-16 | 1 | -0/+2 |
|/ / | |||||
* | | Merge pull request #4157 from ↵ | Jon Bratseth | 2017-11-16 | 2 | -9/+2 |
|\ \ | | | | | | | | | | | | | vespa-engine/lesters/java-concat-tensors-unequal-size Java tensors: support unequal size when concatenating | ||||
| * | | Java tensors: support unequal size when concatenating | Lester Solbakken | 2017-11-16 | 2 | -9/+2 |
| | | | |||||
* | | | Merge pull request #4160 from ↵ | Geir Storli | 2017-11-16 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | vespa-engine/toregge/use-make-bucket-space-in-make-document-bucket Use makeBucketSpace() in makeDocumentBucket(). | ||||
| * | | | Use makeBucketSpace() in makeDocumentBucket(). | Tor Egge | 2017-11-16 | 1 | -1/+2 |
| | | | | |||||
* | | | | Merge pull request #4131 from ↵ | Geir Storli | 2017-11-16 | 5 | -27/+22 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | vespa-engine/vekterli/make-merge-throttler-bucket-space-aware Make merge throttler bucket space aware | ||||
| * | | | | Add std::ostream operator<< overload to Bucket | Tor Brede Vekterli | 2017-11-14 | 2 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | Lets test assertion macros print bucket value transparently. | ||||
| * | | | | Track merges by Bucket instead of BucketId in MergeThrottler | Tor Brede Vekterli | 2017-11-14 | 3 | -27/+16 |
| | | | | | |||||
* | | | | | Merge pull request #4158 from vespa-engine/mpolden/remove-unused-class | Harald Musum | 2017-11-16 | 2 | -70/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | Remove unused ControllerCuratorDb | ||||
| * | | | | | Remove unused include | Martin Polden | 2017-11-16 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | Remove unused ControllerCuratorDb | Martin Polden | 2017-11-16 | 1 | -69/+0 |
| | | | | | | |||||
* | | | | | | Merge pull request #4141 from ↵ | Henning Baldersheim | 2017-11-16 | 1 | -0/+1 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | vespa-engine/balder/do-not-allow-libc-allocator-to-excess Do not allow the default libc allocator under linux to excess in memo… | ||||
| * | | | | | Do not allow the default libc allocator under linux to excess in memory ↵ | Henning Baldersheim | 2017-11-15 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | footprint with many threads. | ||||
* | | | | | | Merge pull request #4159 from ↵ | Bjørn Christian Seime | 2017-11-16 | 2 | -1/+6 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | vespa-engine/bjorncs/inject-ssl-keystore-configurator Setup injection of SslKeyStoreConfigurator in config-model | ||||
| * | | | | | Setup injection of SslKeyStoreConfigurator in config-model | Bjørn Christian Seime | 2017-11-16 | 2 | -1/+6 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #4140 from ↵ | Harald Musum | 2017-11-16 | 10 | -15/+156 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | vespa-engine/hmusum/move-new-filedistribution-classes Hmusum/move new filedistribution classes | ||||
| * | | | | Fix | Harald Musum | 2017-11-15 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Use project version for vespa dependencies | Harald Musum | 2017-11-15 | 2 | -15/+15 |
| | | | | | |||||
| * | | | | Move classes to filedistribution module | Harald Musum | 2017-11-15 | 10 | -11/+152 |
| | | | | | |||||
* | | | | | Merge pull request #4144 from ↵ | Geir Storli | 2017-11-16 | 7 | -28/+87 |
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | vespa-engine/toregge/scan-all-bucket-dbs-in-distributor-simple-maintenance-scanner Scan all bucket dbs in storage::distributor::SimpleMaintenanceScanner. | ||||
| * | | | | Correct macro argument order when checking for equality, first argument is | Tor Egge | 2017-11-15 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | expected value. | ||||
| * | | | | Scan all bucket dbs in storage::distributor::SimpleMaintenanceScanner. | Tor Egge | 2017-11-15 | 7 | -28/+87 |
| | | | | | |||||
* | | | | | Merge pull request #4147 from ↵ | Tor Brede Vekterli | 2017-11-16 | 4 | -11/+77 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/geirst/make-modified-bucket-checker-bucket-space-aware Make ModifiedBucketChecker bucket space aware. | ||||
| * | | | | | Make ModifiedBucketChecker bucket space aware. | Geir Storli | 2017-11-15 | 4 | -11/+77 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #4155 from ↵ | Håkon Hallingstad | 2017-11-16 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/hmusum/log-when-application-is-removed Log when application is removed | ||||
| * | | | | | Log when applications is removed | Harald Musum | 2017-11-16 | 1 | -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 #4132 from vespa-engine/bjorncs/custom-ssl-context | Bjørn Christian Seime | 2017-11-16 | 19 | -128/+301 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Bjorncs/custom ssl context | ||||
| * | | | | | | SslKeyStoreConfigurator components must have unique id spec | Bjørn Christian Seime | 2017-11-15 | 1 | -2/+3 |
| | | | | | | | |||||
| * | | | | | | Cleanup ConnectorFactory | Bjørn Christian Seime | 2017-11-15 | 1 | -19/+18 |
| | | | | | | | |||||
| * | | | | | | Configure default SslKeyStoreConfigurator in config-model's ConnectorFactory | Bjørn Christian Seime | 2017-11-15 | 4 | -49/+30 |
| | | | | | | | |||||
| * | | | | | | Code cleanup: remove 'final' on local variables, less whitespace | Bjørn Christian Seime | 2017-11-15 | 1 | -9/+2 |
| | | | | | | |