underpost 3.2.70 → 3.2.90

package/src/cli/db.js

@@ -6,7 +6,7 @@
  * Supports MariaDB and MongoDB with import/export capabilities, Git integration, and multi-pod operations.
  */
 
-import { mergeFile, splitFileFactory, loadConfServerJson, resolveConfSecrets } from '../server/conf.js';
+import { mergeFile, splitFileFactory, loadConfServerJson, resolveConfSecrets, loadConfInstances } from '../server/conf.js';
 import { loggerFactory } from '../server/logger.js';
 import { shellExec } from '../server/process.js';
 import fs from 'fs-extra';
@@ -275,7 +275,7 @@ class UnderpostDB {
         const authFlags = user && password
           ? ` --username ${JSON.stringify(user)} --password ${JSON.stringify(password)} --authenticationDatabase ${JSON.stringify(authDatabase)}`
           : '';
-        const restoreCmd = `mongorestore -d ${dbName} ${containerBsonPath}${drop ? ' --drop' : ''}${preserveUUID ? ' --preserveUUID' : ''}${authFlags}`;
+        const restoreCmd = `mongorestore -d ${dbName} ${containerBsonPath} --numParallelCollections=1 --numInsertionWorkersPerCollection=1 --batchSize=100 --stopOnError${drop ? ' --drop' : ''}${preserveUUID ? ' --preserveUUID' : ''}${authFlags}`;
         Underpost.kubectl.exec({ podName, namespace, command: restoreCmd });
 
         logger.info('Successfully imported MongoDB database', { podName, dbName });
@@ -790,7 +790,7 @@ class UnderpostDB {
 
               // Handle primary pod detection for MongoDB
               let podsToProcess = [];
-              if (provider === 'mongoose' && !options.allPods) {
+              if (provider === 'mongoose' && (options.import === true || !options.allPods)) {
                 // For MongoDB, always use primary pod unless allPods is true
                 if (!targetPods || targetPods.length === 0) {
                   logger.warn('No MongoDB pods available to check for primary');
@@ -1119,7 +1119,9 @@ class UnderpostDB {
             // Process additional instances
             const confInstancesPath = `./engine-private/conf/${deployId}/conf.instances.json`;
             if (fs.existsSync(confInstancesPath)) {
-              const confInstances = JSON.parse(fs.readFileSync(confInstancesPath, 'utf8'));
+              // Expands multiInstance variants so each deployed instance is
+              // registered (handles both the bare-array and { instances } shapes).
+              const confInstances = loadConfInstances(deployId);
               for (const instance of confInstances) {
                 const { id, host, path, fromPort, metadata } = instance;
                 const { runtime } = metadata;