NAS backup: run take-backup commands concurrently on the KVM host, bounded per host

core/src/main/java/org/apache/cloudstack/backup/TakeBackupCommand.java

@@ -32,6 +32,7 @@ public class TakeBackupCommand extends Command {
     private List<String> volumePaths;
     @LogLevel(LogLevel.Log4jLevel.Off)
     private String mountOptions;
+    private boolean executeInSequence = false;
 
     public TakeBackupCommand(String vmName, String backupPath) {
         super();
@@ -89,6 +90,13 @@ public void setVolumePaths(List<String> volumePaths) {
 
     @Override
     public boolean executeInSequence() {
-        return true;
+        // Parallel by default: each backup uses its own per-VM on-NAS path, so concurrent
+        // runs do not contend. Operators can force sequential execution per zone via the
+        // backup.nas.parallel.execution.enabled setting.
+        return executeInSequence;
+    }
+
+    public void setExecuteInSequence(boolean executeInSequence) {
+        this.executeInSequence = executeInSequence;
     }
 }

core/src/test/java/org/apache/cloudstack/backup/TakeBackupCommandTest.java

@@ -0,0 +1,41 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.backup;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TakeBackupCommandTest {
+
+    @Test
+    public void testExecuteInSequenceDefaultsToParallel() {
+        TakeBackupCommand command = new TakeBackupCommand("vm-1", "/backups/vm-1");
+        // Default: run in parallel with other backup/delete commands.
+        Assert.assertFalse(command.executeInSequence());
+    }
+
+    @Test
+    public void testExecuteInSequenceIsSettable() {
+        TakeBackupCommand command = new TakeBackupCommand("vm-1", "/backups/vm-1");
+
+        command.setExecuteInSequence(true);
+        Assert.assertTrue(command.executeInSequence());
+
+        command.setExecuteInSequence(false);
+        Assert.assertFalse(command.executeInSequence());
+    }
+}

engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupDao.java

@@ -35,5 +35,6 @@ public interface BackupDao extends GenericDao<BackupVO, Long> {
     List<Backup> syncBackups(Long zoneId, Long vmId, List<Backup> externalBackups);
     BackupVO getBackupVO(Backup backup);
     List<Backup> listByOfferingId(Long backupOfferingId);
+    List<BackupVO> listByZoneAndStatus(long zoneId, Backup.Status status);
     BackupResponse newBackupResponse(Backup backup);
 }

engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupDaoImpl.java

@@ -60,6 +60,7 @@ public class BackupDaoImpl extends GenericDaoBase<BackupVO, Long> implements Bac
     BackupOfferingDao backupOfferingDao;
 
     private SearchBuilder<BackupVO> backupSearch;
+    private SearchBuilder<BackupVO> zoneStatusSearch;
 
     public BackupDaoImpl() {
     }
@@ -72,6 +73,19 @@ protected void init() {
         backupSearch.and("backup_offering_id", backupSearch.entity().getBackupOfferingId(), SearchCriteria.Op.EQ);
         backupSearch.and("zone_id", backupSearch.entity().getZoneId(), SearchCriteria.Op.EQ);
         backupSearch.done();
+
+        zoneStatusSearch = createSearchBuilder();
+        zoneStatusSearch.and("zone_id", zoneStatusSearch.entity().getZoneId(), SearchCriteria.Op.EQ);
+        zoneStatusSearch.and("status", zoneStatusSearch.entity().getStatus(), SearchCriteria.Op.EQ);
+        zoneStatusSearch.done();
+    }
+
+    @Override
+    public List<BackupVO> listByZoneAndStatus(long zoneId, Backup.Status status) {
+        SearchCriteria<BackupVO> sc = zoneStatusSearch.create();
+        sc.setParameters("zone_id", zoneId);
+        sc.setParameters("status", status);
+        return listBy(sc);
     }
 
     @Override