Merge branch 'w/8.5/bugfix/BB-624-connection-retry' into w/8.6/bugfix/B…

…B-624-connection-retry
scality · Nov 6, 2024 · d76c0af · d76c0af
2 parents 0a32e66 + 16abf3c
commit d76c0af
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 9 deletions.
diff --git a/bin/queuePopulator.js b/bin/queuePopulator.js
@@ -50,6 +50,7 @@ const queuePopulator = new QueuePopulator(zkConfig, kafkaConfig,
     qpConfig, httpsConfig, mConfig, rConfig, vConfig, extConfigs);
 
 async.waterfall([
+    done => queuePopulator.open(done),
     done => startProbeServer(qpConfig.probeServer, (err, probeServer) => {
         if (err) {
             log.error('error starting probe server', {
@@ -69,7 +70,6 @@ async.waterfall([
         }
         done();
     }),
-    done => queuePopulator.open(done),
     done => {
         const taskState = {
             batchInProgress: false,

diff --git a/extensions/notification/destination/KafkaNotificationDestination.js b/extensions/notification/destination/KafkaNotificationDestination.js
@@ -79,8 +79,9 @@ class KafkaNotificationDestination extends NotificationDestination {
                 this._log.info('error setting up kafka notif destination',
                     { error: err.message });
                 done(err);
+            } else {
+                done();
             }
-            done();
         });
     }
 

diff --git a/extensions/notification/queueProcessor/QueueProcessor.js b/extensions/notification/queueProcessor/QueueProcessor.js
@@ -143,7 +143,9 @@ class QueueProcessor extends EventEmitter {
         async.series([
             next => this._setupNotificationConfigManager(next),
             next => this._setupDestination(this.destinationConfig.type, next),
-            next => this._destination.init(() => {
+            // if connection to destination fails, process will stop & restart
+            next => this._destination.init(next),
+            next => {
                 if (options && options.disableConsumer) {
                     this.emit('ready');
                     return next();
@@ -183,7 +185,7 @@ class QueueProcessor extends EventEmitter {
                 this._getConfig = util.callbackify(this.bnConfigManager
                     .getConfig.bind(this.bnConfigManager));
                 return undefined;
-            }),
+            },
         ], err => {
             if (err) {
                 this.logger.error('error starting notification queue processor',

diff --git a/extensions/replication/failedCRR/FailedCRRProducer.js b/extensions/replication/failedCRR/FailedCRRProducer.js
@@ -30,7 +30,7 @@ class FailedCRRProducer {
             maxRequestSize: this._kafkaConfig.maxRequestSize,
             topic: this._topic,
         });
-        this._producer.once('error', () => {});
+        this._producer.once('error', cb);
         this._producer.once('ready', () => {
             this._producer.removeAllListeners('error');
             this._producer.on('error', err =>

diff --git a/extensions/replication/replay/ReplayProducer.js b/extensions/replication/replay/ReplayProducer.js
@@ -30,7 +30,7 @@ class ReplayProducer {
             maxRequestSize: this._kafkaConfig.maxRequestSize,
             topic: this._topic,
         });
-        this._producer.once('error', () => {});
+        this._producer.once('error', cb);
         this._producer.once('ready', () => {
             this._producer.removeAllListeners('error');
             this._producer.on('error', err =>

diff --git a/images/nodesvc-base/Dockerfile b/images/nodesvc-base/Dockerfile
@@ -8,15 +8,25 @@ RUN yarn cache clean \
     && yarn install --production --frozen-lockfile --ignore-optional --ignore-engines --network-concurrency 1 \
     && yarn cache clean
 
+# Somehow chown in another layer will replace some node_modules built symlink with copy of file
+# To keep the same output as previously
+RUN chown -R ${USER} /tmp/build/node_modules
+
 ################################################################################
 FROM ghcr.io/scality/federation/nodesvc-base:7.10.7.0
 
 WORKDIR ${HOME_DIR}/backbeat
+RUN chown -R ${USER} ${HOME_DIR}/backbeat
 
-COPY . ${HOME_DIR}/backbeat
-COPY --from=builder /tmp/build/node_modules ./node_modules/
+# Keep same output as chown command without group (use group 0)
+COPY --chown=${USER}:0 . ${HOME_DIR}/backbeat
+COPY --from=builder --chown=${USER}:0 /tmp/build/node_modules ./node_modules/
 
-RUN chown -R ${USER} ${HOME_DIR}/backbeat
+# All copied files are already chowned scality(1000):root(0)
+# This removes a 763MB layer. Image goes from 2.34GB to 1.55GB
+# Besides S3C Federation will chown scality(1001):scality(1001) at poststart
+# TODO S3C-9479: Images will be reworked for size optimization
+# RUN chown -R ${USER} ${HOME_DIR}/backbeat
 
 USER ${USER}