Merge pull request #225 from CartoDB/upgrade-windshaft

Upgrades Windshaft to report redis/renderers/mapnik pool metrics

NEWS.md

@@ -1,8 +1,9 @@
-1.19.1 -- 2014-mm-dd
+1.20.0 -- 2014-mm-dd
 --------------------
 
 New features:
  - Report to statsd the status of redis pools
+ - Upgrades Windshaft to start reporting redis/renderers/mapnik pool metrics
 
 Enhancements:
  - Share one redis-mpool across the application

config/environments/development.js.example

@@ -86,7 +86,8 @@ var config = {
       // Milliseconds since last access before renderer cache item expires
       cache_ttl: 60000,
       metatile: 4,
-      bufferSize: 64
+      bufferSize: 64,
+      statsInterval: 5000 // milliseconds between each report to statsd about number of renderers and mapnik pool status
     }
     ,millstone: {
         // Needs to be writable by server user

config/environments/production.js.example

@@ -80,7 +80,8 @@ var config = {
       // Milliseconds since last access before renderer cache item expires
       cache_ttl: 60000,
       metatile: 4,
-      bufferSize: 64
+      bufferSize: 64,
+      statsInterval: 5000 // milliseconds between each report to statsd about number of renderers and mapnik pool status
     }
     ,millstone: {
         // Needs to be writable by server user

config/environments/staging.js.example

@@ -80,7 +80,8 @@ var config = {
       // Milliseconds since last access before renderer cache item expires
       cache_ttl: 60000,
       metatile: 4,
-      bufferSize: 64
+      bufferSize: 64,
+      statsInterval: 5000 // milliseconds between each report to statsd about number of renderers and mapnik pool status
     }
     ,millstone: {
         // Needs to be writable by server user

config/environments/test.js.example

@@ -80,7 +80,8 @@ var config = {
       // Milliseconds since last access before renderer cache item expires
       cache_ttl: 60000,
       metatile: 4,
-      bufferSize: 64
+      bufferSize: 64,
+      statsInterval: 5000 // milliseconds between each report to statsd about number of renderers and mapnik pool status
     }
     ,millstone: {
         // Needs to be writable by server user

lib/cartodb/server_options.js

@@ -22,9 +22,10 @@ module.exports = function(redisPool) {
         queryTablesApi = new QueryTablesApi();
 
     var rendererConfig = _.defaults(global.environment.renderer || {}, {
-      cache_ttl: 60000, // milliseconds
-      metatile: 4,
-      bufferSize: 64
+        cache_ttl: 60000, // milliseconds
+        metatile: 4,
+        bufferSize: 64,
+        statsInterval: 60000
     });
 
     var me = {
@@ -60,7 +61,8 @@ module.exports = function(redisPool) {
         },
         statsd: global.environment.statsd,
         renderCache: {
-          ttl: rendererConfig.cache_ttl
+            ttl: rendererConfig.cache_ttl,
+            statsInterval: rendererConfig.statsInterval
         },
         redis: global.environment.redis,
         enable_cors: global.environment.enable_cors,

npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "1.19.1",
+  "version": "1.20.0",
   "dependencies": {
     "cartodb-psql": {
       "version": "0.4.0",
@@ -167,9 +167,9 @@
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
     },
     "windshaft": {
-      "version": "0.29.0",
-      "from": "https://github.com/CartoDB/Windshaft/tarball/0.29.0",
-      "resolved": "https://github.com/CartoDB/Windshaft/tarball/0.29.0",
+      "version": "0.30.0",
+      "from": "https://github.com/CartoDB/Windshaft/tarball/0.30.0",
+      "resolved": "https://github.com/CartoDB/Windshaft/tarball/0.30.0",
       "dependencies": {
         "chronograph": {
           "version": "0.1.0",

package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "windshaft-cartodb",
-    "version": "1.19.1",
+    "version": "1.20.0",
     "description": "A map tile server for CartoDB",
     "keywords": [
       "cartodb"
@@ -25,7 +25,7 @@
         "node-varnish": "https://github.com/Vizzuality/node-varnish/tarball/0.3.0",
         "underscore"  : "~1.6.0",
         "dot": "~1.0.2",
-        "windshaft": "https://github.com/CartoDB/Windshaft/tarball/0.29.0",
+        "windshaft": "https://github.com/CartoDB/Windshaft/tarball/0.30.0",
         "step": "~0.0.5",
         "request": "~2.9.203",
         "cartodb-redis": "https://github.com/CartoDB/node-cartodb-redis/tarball/0.11.0",