From 945c122ddaaae2d842b8073b430ecb98f8711e13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 29 Jul 2019 19:14:27 +0200 Subject: [PATCH 1/3] Update windshaft devel branch --- lib/cartodb/api/api-router.js | 3 ++- package-lock.json | 12 +++++------- package.json | 2 +- .../ported/support/ported_server_options.js | 1 + 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/cartodb/api/api-router.js b/lib/cartodb/api/api-router.js index af82a3b8..c4124ac8 100644 --- a/lib/cartodb/api/api-router.js +++ b/lib/cartodb/api/api-router.js @@ -100,7 +100,8 @@ module.exports = class ApiRouter { const tileBackend = new windshaft.backend.Tile(rendererCache); const attributesBackend = new windshaft.backend.Attributes(); - const previewBackend = new windshaft.backend.Preview(rendererCache); + const concurrency = serverOptions.renderer.mapnik.poolSize + serverOptions.renderer.mapnik.poolMaxWaitingClients; + const previewBackend = new windshaft.backend.Preview(rendererCache, { concurrency }); const mapValidatorBackend = new windshaft.backend.MapValidator(tileBackend, attributesBackend); const mapBackend = new windshaft.backend.Map(rendererCache, mapStore, mapValidatorBackend); diff --git a/package-lock.json b/package-lock.json index 498aad19..90ce19a4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,9 +5,8 @@ "requires": true, "dependencies": { "@carto/cartonik": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/@carto/cartonik/-/cartonik-0.6.1.tgz", - "integrity": "sha512-7tRnEe8JTGzbYxBcsXhneWzK2HVP/Fc4KcI0PNIgMAUsu3q2Yz3tikA9/OoT9PtGvcOmqNn6CwfVibBKwYO23Q==", + "version": "github:cartodb/cartonik#c91fa13562a1fbda30d55405e86ed72bae503eda", + "from": "github:cartodb/cartonik#19-preview-batch-fetchs", "requires": { "@carto/mapnik": "3.6.2-carto.16", "@mapbox/sphericalmercator": "^1.1.0", @@ -4040,11 +4039,10 @@ "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=" }, "windshaft": { - "version": "5.5.1", - "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-5.5.1.tgz", - "integrity": "sha512-Z8ChaxzBThnYCaSQsJJ5uWdNlTQRBndXvefn8DCaU8pikGfG1kcUD6IGE306MziljNDikKJC5XKf5Dmx6Awt5g==", + "version": "github:cartodb/windshaft#29b0c44e8d74eec8658460eb16b940f02ee157ec", + "from": "github:cartodb/windshaft#update-cartonik-0.7.0", "requires": { - "@carto/cartonik": "^0.6.1", + "@carto/cartonik": "github:cartodb/cartonik#19-preview-batch-fetchs", "@carto/mapnik": "3.6.2-carto.16", "canvas": "^2.4.1", "carto": "github:cartodb/carto#0.15.1-cdb5", diff --git a/package.json b/package.json index 0bd04ffe..608f90bf 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "step-profiler": "0.3.0", "turbo-carto": "0.21.2", "underscore": "1.6.0", - "windshaft": "^5.5.1", + "windshaft": "github:cartodb/windshaft#update-cartonik-0.7.0", "yargs": "11.1.0" }, "devDependencies": { diff --git a/test/acceptance/ported/support/ported_server_options.js b/test/acceptance/ported/support/ported_server_options.js index b0fddbe2..cf040a48 100644 --- a/test/acceptance/ported/support/ported_server_options.js +++ b/test/acceptance/ported/support/ported_server_options.js @@ -50,6 +50,7 @@ module.exports = _.extend({}, serverOptions, { renderer: { mapnik: { poolSize: 4,//require('os').cpus().length, + poolMaxWaitingClients: 32, metatile: 1, bufferSize: 64, snapToGrid: false, From a220af4fadb428e3e3c456c99e66125890d30ca2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 29 Jul 2019 19:20:38 +0200 Subject: [PATCH 2/3] Please jshint --- lib/cartodb/api/api-router.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/cartodb/api/api-router.js b/lib/cartodb/api/api-router.js index c4124ac8..14c7acec 100644 --- a/lib/cartodb/api/api-router.js +++ b/lib/cartodb/api/api-router.js @@ -100,7 +100,8 @@ module.exports = class ApiRouter { const tileBackend = new windshaft.backend.Tile(rendererCache); const attributesBackend = new windshaft.backend.Attributes(); - const concurrency = serverOptions.renderer.mapnik.poolSize + serverOptions.renderer.mapnik.poolMaxWaitingClients; + const concurrency = serverOptions.renderer.mapnik.poolSize + + serverOptions.renderer.mapnik.poolMaxWaitingClients; const previewBackend = new windshaft.backend.Preview(rendererCache, { concurrency }); const mapValidatorBackend = new windshaft.backend.MapValidator(tileBackend, attributesBackend); const mapBackend = new windshaft.backend.Map(rendererCache, mapStore, mapValidatorBackend); From 61883b13ef99adc28284bde131c0d2bc6edfa875 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Tue, 30 Jul 2019 12:00:28 +0200 Subject: [PATCH 3/3] Update windshaft to version 5.6.0 --- NEWS.md | 4 ++-- package-lock.json | 12 +++++++----- package.json | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/NEWS.md b/NEWS.md index 3a76dce8..2190f597 100644 --- a/NEWS.md +++ b/NEWS.md @@ -8,11 +8,11 @@ Announcements: - Cache control header fine tuning. Set a shorter value for "max-age" directive if there is no way to know when to trigger the invalidation. - Update deps: - Update `cartodb-query-tables` to version [`0.5.0`](https://github.com/CartoDB/node-cartodb-query-tables/releases/tag/0.5.0) - - Upgrade `windshaft` to [`5.5.1`](https://github.com/CartoDB/Windshaft/blob/5.5.1/NEWS.md#version-551): + - Upgrade `windshaft` to [`5.6.0`](https://github.com/CartoDB/Windshaft/blob/5.6.0/NEWS.md#version-560): - Upgrade grainstore to [`2.0.1`](https://github.com/CartoDB/grainstore/releases/tag/2.0.1) - Update @carto/mapnik to [`3.6.2-carto.16`](https://github.com/CartoDB/node-mapnik/blob/v3.6.2-carto.16/CHANGELOG.carto.md#362-carto16). - Update turbo-carto to [`0.21.2`](https://github.com/CartoDB/turbo-carto/releases/tag/0.21.2) - - Upgrade `@carto/cartonik` to version [0.6.1](https://github.com/CartoDB/cartonik/blob/master/CHANGELOG.md#v061-2019-07-10). + - Upgrade `@carto/cartonik` to version [`0.7.0`](https://github.com/CartoDB/cartonik/blob/v0.7.0/CHANGELOG.md#cartonik-changelog). ## 7.1.0 Released 2019-05-06 diff --git a/package-lock.json b/package-lock.json index 90ce19a4..b8f8c7f0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,8 +5,9 @@ "requires": true, "dependencies": { "@carto/cartonik": { - "version": "github:cartodb/cartonik#c91fa13562a1fbda30d55405e86ed72bae503eda", - "from": "github:cartodb/cartonik#19-preview-batch-fetchs", + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/@carto/cartonik/-/cartonik-0.7.0.tgz", + "integrity": "sha512-LD5HBx3/hUL4492I++rspGJh2bcoOjLAHBE8cOLi2fyqIK0NS5bekXrz9mEWY/Ie9xLDeKn9s89FTbl7IhrLrw==", "requires": { "@carto/mapnik": "3.6.2-carto.16", "@mapbox/sphericalmercator": "^1.1.0", @@ -4039,10 +4040,11 @@ "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=" }, "windshaft": { - "version": "github:cartodb/windshaft#29b0c44e8d74eec8658460eb16b940f02ee157ec", - "from": "github:cartodb/windshaft#update-cartonik-0.7.0", + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-5.6.0.tgz", + "integrity": "sha512-yXEdmrbOChYnL6VQBLW/uX6kfc68+dd26z3KCAG8X/VMnhhyXBqYOsttnMYO5SNqCyzuj5gu/pG06jRXwtN23g==", "requires": { - "@carto/cartonik": "github:cartodb/cartonik#19-preview-batch-fetchs", + "@carto/cartonik": "^0.7.0", "@carto/mapnik": "3.6.2-carto.16", "canvas": "^2.4.1", "carto": "github:cartodb/carto#0.15.1-cdb5", diff --git a/package.json b/package.json index 608f90bf..fdd3e0b6 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "step-profiler": "0.3.0", "turbo-carto": "0.21.2", "underscore": "1.6.0", - "windshaft": "github:cartodb/windshaft#update-cartonik-0.7.0", + "windshaft": "^5.6.0", "yargs": "11.1.0" }, "devDependencies": {