Merge pull request #5966 from nimrod-becker/backport_to_5_3

Backport to 5.3: fixed upgrade script update_bucket_owner_account.js
noobaa · Mar 30, 2020 · 25cd79b · 25cd79b
2 parents 9f579d9 + 9440626
commit 25cd79b
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/src/upgrade/upgrade_scripts/5.3.0/update_bucket_owner_account.js b/src/upgrade/upgrade_scripts/5.3.0/update_bucket_owner_account.js
@@ -6,18 +6,18 @@ const _ = require('lodash');
 async function run({ dbg, mongo_client, system_store }) {
     try {
         const system_owner = _.get(system_store.data, 'systems.0.owner._id');
-        await system_store.make_changes({
-            update: {
-                buckets: [{
-                    $find: {
-                        owner_account: { $exists: false }
-                    },
-                    $set: {
-                        owner_account: system_owner
-                    }
-                }]
-            }
-        });
+        const buckets = system_store.data.buckets
+            .filter(b => !b.owner_account)
+            .map(b => ({
+                _id: b._id,
+                $set: { owner_account: system_owner }
+            }));
+        if (buckets.length > 0) {
+            dbg.log0(`updating owner_account (${system_owner}) to these buckets: ${buckets.map(b => b._id).join(', ')}`);
+            await system_store.make_changes({ update: { buckets } });
+        } else {
+            dbg.log0('there are no buckets that need owner_account update');
+        }
     } catch (err) {
         dbg.error('got error while updating bucket owner_account:', err);
         throw err;