wip

scality · Nov 6, 2024 · 8d8381a · 8d8381a
1 parent 7f5a553
commit 8d8381a
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 15 deletions.
diff --git a/lib/queuePopulator/IngestionReader.js b/lib/queuePopulator/IngestionReader.js
@@ -15,9 +15,9 @@ function _isVersionedLogKey(key) {
 class IngestionReader extends LogReader {
     constructor(params) {
         const { zkClient, ingestionConfig, kafkaConfig, bucketdConfig, qpConfig,
-            logger, extensions, producer, metricsProducer, s3Config } = params;
+            logger, extensions, producer, s3Config } = params;
         super({ zkClient, kafkaConfig, logConsumer: {}, logId: '', logger,
-            extensions, metricsProducer, zkMetricsHandler: IngestionPopulatorMetrics });
+            extensions, zkMetricsHandler: IngestionPopulatorMetrics });
         this._ingestionConfig = ingestionConfig;
         this.qpConfig = qpConfig;
         this.s3Config = s3Config;

diff --git a/lib/queuePopulator/KafkaLogReader.js b/lib/queuePopulator/KafkaLogReader.js
@@ -12,14 +12,12 @@ class KafkaLogReader extends LogReader {
      * @param {Object} params.qpKafkaConfig - queue populator kafka configuration
      * @param {QueuePopulatorExtension[]} params.extensions - array of
      *   queue populator extension modules
-     * @param {MetricsProducer} params.metricsProducer - instance of metrics
-     *   producer
      * @param {MetricsHandler} params.metricsHandler - instance of metrics
      *   handler
      */
     constructor(params) {
         const { zkClient, kafkaConfig, zkConfig, qpKafkaConfig,
-            logger, extensions, metricsProducer, metricsHandler } = params;
+            logger, extensions, metricsHandler } = params;
         // conf contains global kafka and queuePoplator kafka configs
         const conf = {
             hosts: kafkaConfig.hosts,
@@ -31,7 +29,7 @@ class KafkaLogReader extends LogReader {
         const logConsumer = new LogConsumer(conf, logger);
         super({ zkClient, kafkaConfig, zkConfig, logConsumer,
                 logId: `kafka_${qpKafkaConfig.logName}`, logger, extensions,
-                metricsProducer, metricsHandler });
+                metricsHandler });
         this._kafkaConfig = conf;
     }
 

diff --git a/lib/queuePopulator/LogReader.js b/lib/queuePopulator/LogReader.js
@@ -23,8 +23,6 @@ class LogReader {
      * @param {Logger} params.logger - logger object
      * @param {QueuePopulatorExtension[]} params.extensions - array of
      *   queue populator extension modules
-     * @param {MetricsProducer} params.metricsProducer - instance of metrics
-     *   producer
      * @param {MetricsHandler} params.metricsHandler - instance of metrics
      *   handler
      * @param {ZkMetricsHandler} params.zkMetricsHandler - instance of zookeeper

diff --git a/lib/queuePopulator/MongoLogReader.js b/lib/queuePopulator/MongoLogReader.js
@@ -5,14 +5,14 @@ const LogReader = require('./LogReader');
 class MongoLogReader extends LogReader {
     constructor(params) {
         const { zkClient, kafkaConfig, zkConfig, mongoConfig,
-                logger, extensions, metricsProducer, metricsHandler } = params;
+                logger, extensions, metricsHandler } = params;
         logger.info('initializing mongo log reader',
             { method: 'MongoLogReader.constructor',
                 mongoConfig });
         const logConsumer = new LogConsumer(mongoConfig, logger);
         super({ zkClient, kafkaConfig, zkConfig, logConsumer,
                 logId: `mongo_${mongoConfig.logName}`, logger, extensions,
-                metricsProducer, metricsHandler });
+                metricsHandler });
         this._mongoConfig = mongoConfig;
     }
 

diff --git a/lib/queuePopulator/RaftLogReader.js b/lib/queuePopulator/RaftLogReader.js
@@ -7,7 +7,7 @@ const LogReader = require('./LogReader');
 class RaftLogReader extends LogReader {
     constructor(params) {
         const { zkClient, kafkaConfig, bucketdConfig, httpsConfig,
-                raftId, logger, extensions, metricsProducer, metricsHandler } = params;
+                raftId, logger, extensions, metricsHandler } = params;
         const { host, port } = bucketdConfig;
         logger.info('initializing raft log reader',
             { method: 'RaftLogReader.constructor',
@@ -25,7 +25,7 @@ class RaftLogReader extends LogReader {
             raftSession: raftId,
             logger });
         super({ zkClient, kafkaConfig, logConsumer, logId: `raft_${raftId}`,
-                logger, extensions, metricsProducer, metricsHandler });
+                logger, extensions, metricsHandler });
         this.raftId = raftId;
     }
 

diff --git a/tests/functional/ingestion/IngestionReader.js b/tests/functional/ingestion/IngestionReader.js
@@ -238,7 +238,6 @@ describe('ingestion reader tests with mock', function fD() {
                 qpConfig: testConfig.queuePopulator,
                 logger: dummyLogger,
                 extensions: [ingestionQP],
-                metricsProducer: { publishMetrics: () => { } },
                 s3Config: testConfig.s3,
                 producer,
             });
@@ -404,7 +403,6 @@ describe('ingestion reader tests with mock', function fD() {
                 qpConfig: testConfig.queuePopulator,
                 logger: dummyLogger,
                 extensions: [ingestionQP],
-                metricsProducer: { publishMetrics: () => { } },
                 s3Config: testConfig.s3,
                 producer,
             });

diff --git a/tests/functional/replication/queueProcessor.js b/tests/functional/replication/queueProcessor.js
@@ -882,7 +882,7 @@ describe('queue processor functional tests with mocking', () => {
         async.parallel([
             done => queueProcessorSF.stop(done),
             done => queueProcessorAzure.stop(done),
-            // done => replicationStatusProcessor.stop(done),
+            done => replicationStatusProcessor.stop(done),
             done => copyLocationResultsConsumer.close(done),
         ], done);
     });