bugfix: ZENKO-616 Use local cache for metrics

scality · Jun 30, 2018 · 7bbf951 · 7bbf951
1 parent d25af17
commit 7bbf951
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 14 deletions.
diff --git a/bin/queuePopulator.js b/bin/queuePopulator.js
@@ -9,7 +9,7 @@ const kafkaConfig = config.kafka;
 const extConfigs = config.extensions;
 const qpConfig = config.queuePopulator;
 const mConfig = config.metrics;
-const rConfig = config.redis;
+const rLocalCacheConfig = config.localCache;
 const QueuePopulator = require('../lib/queuePopulator/QueuePopulator');
 const zookeeper = require('node-zookeeper-client');
 
@@ -48,8 +48,7 @@ function queueBatch(queuePopulator, taskState) {
 /* eslint-enable no-param-reassign */
 
 const queuePopulator = new QueuePopulator(zkConfig, kafkaConfig,
-    qpConfig, mConfig,
-    rConfig, extConfigs);
+    qpConfig, mConfig, rLocalCacheConfig, extConfigs);
 
 const healthServer = new HealthProbeServer({
     bindAddress: config.healthcheckServer.bindAddress,

diff --git a/conf/Config.js b/conf/Config.js
@@ -85,6 +85,14 @@ class Config extends EventEmitter {
                 { host: '127.0.0.1', port: 6379 });
         }
 
+        if (parsedConfig.localCache) {
+            this.localCache = {
+                host: config.localCache.host,
+                port: config.localCache.port,
+                password: config.localCache.password,
+            };
+        }
+
         // config is validated, safe to assign directly to the config object
         Object.assign(this, parsedConfig);
 

diff --git a/conf/config.joi.js b/conf/config.joi.js
@@ -64,6 +64,11 @@ const joiSchema = {
             })
         ),
     },
+    localCache: {
+        host: joi.string().default('localhost'),
+        port: joi.number().default(6379),
+        password: joi.string(),
+    },
     healthcheckServer: joi.object({
         bindAddress: joi.string().default('127.0.0.1'),
         port: joi.number().default(4042),

diff --git a/conf/config.json b/conf/config.json
@@ -174,5 +174,9 @@
     "healthcheckServer": {
         "bindAddress": "0.0.0.0",
         "port": 4042
+    },
+    "localCache": {
+        "host": "127.0.0.1",
+        "port": 6379
     }
 }
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -35,6 +35,15 @@ if [[ "$REDIS_PORT" ]]; then
     JQ_FILTERS_CONFIG="$JQ_FILTERS_CONFIG | .redis.port=\"$REDIS_PORT\""
 fi
 
+if [[ "$REDIS_LOCALCACHE_HOST" ]]; then
+    JQ_FILTERS_CONFIG="$JQ_FILTERS_CONFIG | .localCache.host=\"$REDIS_LOCALCACHE_HOST\""
+    JQ_FILTERS_CONFIG="$JQ_FILTERS_CONFIG | .localCache.port=6379"
+fi
+
+if [[ "$REDIS_LOCALCACHE_PORT" ]]; then
+    JQ_FILTERS_CONFIG="$JQ_FILTERS_CONFIG | .localCache.port=$REDIS_LOCALCACHE_PORT"
+fi
+
 if [[ "$QUEUE_POPULATOR_DMD_HOST" ]]; then
     JQ_FILTERS_CONFIG="$JQ_FILTERS_CONFIG | .queuePopulator.dmd.host=\"$QUEUE_POPULATOR_DMD_HOST\""
 fi

diff --git a/lib/MetricsConsumer.js b/lib/MetricsConsumer.js
@@ -17,22 +17,21 @@ const CONCURRENCY = 10;
 class MetricsConsumer {
     /**
      * @constructor
-     * @param {object} rConfig - redis configurations
-     * @param {string} rConfig.host - redis host
-     * @param {number} rConfig.port - redis port
+     * @param {object} rLocalCacheConfig - redis local cache configuration
+     * @param {string} rLocalCacheConfig.host - redis local cache host
+     * @param {number} rLocalCacheConfig.port - redis local cache port
      * @param {object} mConfig - metrics configurations
      * @param {string} mConfig.topic - metrics topic name
      * @param {object} kafkaConfig - kafka configurations
      * @param {string} kafkaConfig.hosts - kafka hosts
      *   as "host:port[/chroot]"
      */
-    constructor(rConfig, mConfig, kafkaConfig) {
+    constructor(rLocalCacheConfig, mConfig, kafkaConfig) {
         this.mConfig = mConfig;
         this.kafkaConfig = kafkaConfig;
 
         this.logger = new Logger('Backbeat:MetricsConsumer');
-
-        const redisClient = new RedisClient(rConfig, this.logger);
+        const redisClient = new RedisClient(rLocalCacheConfig, this.logger);
         this._statsClient = new StatsModel(redisClient, INTERVAL,
             (EXPIRY + INTERVAL));
     }

diff --git a/lib/queuePopulator/QueuePopulator.js b/lib/queuePopulator/QueuePopulator.js
@@ -37,17 +37,18 @@ class QueuePopulator {
      *   configuration (mandatory if logSource is "mongo")
      * @param {Object} mConfig - metrics configuration object
      * @param {string} mConfig.topic - metrics topic
-     * @param {Object} rConfig - redis configuration object
+     * @param {Object} rLocalCacheConfig - redis local cache configuration
      * @param {Object} extConfigs - configuration of extensions: keys
      *   are extension names and values are extension's config object.
+     * object
      */
-    constructor(zkConfig, kafkaConfig, qpConfig, mConfig, rConfig,
+    constructor(zkConfig, kafkaConfig, qpConfig, mConfig, rLocalCacheConfig,
                 extConfigs) {
         this.zkConfig = zkConfig;
         this.kafkaConfig = kafkaConfig;
         this.qpConfig = qpConfig;
         this.mConfig = mConfig;
-        this.rConfig = rConfig;
+        this.rLocalCacheConfig = rLocalCacheConfig;
         this.extConfigs = extConfigs;
 
         this.log = new Logger('Backbeat:QueuePopulator');
@@ -111,8 +112,8 @@ class QueuePopulator {
 
     _setupMetricsClients(cb) {
         // Metrics Consumer
-        this._mConsumer = new MetricsConsumer(this.rConfig, this.mConfig,
-            this.kafkaConfig);
+        this._mConsumer = new MetricsConsumer(this.rLocalCacheConfig,
+            this.mConfig, this.kafkaConfig);
         this._mConsumer.start();
 
         // Metrics Producer