upgrade fixes for 2.6.1

fix

Author: dannyzaken

package.json

@@ -1,6 +1,6 @@
 {
   "name": "noobaa-core",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "private": true,
   "license": "SEE LICENSE IN LICENSE",
   "description": "",

src/upgrade/upgrade.js

@@ -40,7 +40,7 @@ async function do_upgrade() {
         dbg.log0('failed preparing environment for upgrade_manager', err);
         // restart services to stop upgrade
         // TODO: better solution than restarting services
-        supervisor.restart('webserver');
+        supervisor.restart(['webserver']);
         process.exit(1);
     }
 }
@@ -63,8 +63,15 @@ async function start_upgrade_manager() {
     upgrade_prog.priority = '1';
     upgrade_prog.stopsignal = 'KILL';
     dbg.log0('UPGRADE: adding upgrade manager to supervisor and applying. configuration is', upgrade_prog);
-    await supervisor.add_program(upgrade_prog);
-    await supervisor.apply_changes();
+    try {
+        await supervisor.add_program(upgrade_prog);
+        await supervisor.apply_changes();
+    } catch (err) {
+        dbg.error(`UPGRADE: failed adding upgrade manager to supervisor. 
+        this probably means that supervisorctl is failing to connect to supervisord. restarting supervisord`, err);
+        await supervisor.restart_supervisord();
+        throw err;
+    }
 }
 
 function main() {

src/upgrade/upgrade_utils.js

@@ -330,49 +330,59 @@ function new_pre_upgrade_checkups(params) {
     );
 }
 
-function do_yum_update() {
-    dbg.log0('fix_security_issues: Called');
-    return promise_utils.exec(`cp -fd /etc/localtime /tmp`, {
-            ignore_rc: false,
-            return_stdout: true,
-            trim_stdout: true
-        })
-        .then(() => promise_utils.exec(`yum clean all`, {
+async function do_yum_update() {
+    try {
+        dbg.log0('UPGRADE: do_yum_update: Called');
+        dbg.log0('UPGRADE: copying /etc/localtime to tmp');
+        await promise_utils.exec(`cp -fd /etc/localtime /tmp`, {
             ignore_rc: false,
             return_stdout: true,
             trim_stdout: true
-        }))
-        .then(res => {
-            dbg.log0('fix_security_issues: yum clean', res);
-        })
-        .then(() => promise_utils.exec(`yum update -y`, {
+        });
+        dbg.log0('UPGRADE: calling yum clean all');
+        const clean_res = await promise_utils.exec(`yum clean all`, {
             ignore_rc: false,
             return_stdout: true,
             trim_stdout: true
-        }))
-        .then(res => {
-            dbg.log0('fix_security_issues: yum update', res);
-        })
-        .then(() => promise_utils.exec(`yum clean all`, {
+        });
+        dbg.log0('UPGRADE: yum clean result:', clean_res);
+        let update_retries = 3;
+        while (update_retries > 0) {
+            try {
+                dbg.log0('UPGRADE: calling yum update -y');
+                const update_res = await promise_utils.exec(`yum update -y`, {
+                    ignore_rc: false,
+                    return_stdout: true,
+                    trim_stdout: true
+                });
+                dbg.log0('UPGRADE: yum update result:', update_res);
+                // no retires necessary
+                update_retries = 0;
+            } catch (err) {
+                update_retries -= 1;
+                if (update_retries === 0) throw err;
+                dbg.error(`yum update failed with error. retrying in 30 seconds`, err);
+                await P.delay(30000);
+            }
+        }
+        await promise_utils.exec(`yum clean all`, {
             ignore_rc: false,
             return_stdout: true,
             trim_stdout: true
-        }))
-        .then(() => {
-            dbg.log0(`Updated yum packages`);
-        })
-        .then(() => promise_utils.exec(`cp -fd /tmp/localtime /etc`, {
+        });
+
+        dbg.log0(`Updated yum packages`);
+
+        await promise_utils.exec(`cp -fd /tmp/localtime /etc`, {
             ignore_rc: false,
             return_stdout: true,
             trim_stdout: true
-        }))
-        .then(() => {
-            dbg.log0('fix_security_issues: Success');
-        })
-        .catch(function(err) {
-            dbg.error('fix_security_issues: Failure', err);
-            throw err;
         });
+    } catch (err) {
+        dbg.error('do_yum_update: Failure', err);
+        throw err;
+
+    }
 }