Commit 7ba5240
Block backup deletion while create-VM-from-backup or restore jobs are in progress (#12792)
* Block backup deletion while create-VM-from-backup or restore jobs are in progress
* Add tests
* Fix exception message
* Update test
Co-authored-by: Abhisar Sinha <63767682+abh1sar@users.noreply.github.com>1 parent 03de62b commit 7ba5240
File tree
2 files changed
+44
-0
lines changed- server/src
- main/java/org/apache/cloudstack/backup
- test/java/org/apache/cloudstack/backup
2 files changed
+44
-0
lines changedLines changed: 14 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1531 | 1531 | | |
1532 | 1532 | | |
1533 | 1533 | | |
| 1534 | + | |
| 1535 | + | |
1534 | 1536 | | |
1535 | 1537 | | |
1536 | 1538 | | |
| |||
1551 | 1553 | | |
1552 | 1554 | | |
1553 | 1555 | | |
| 1556 | + | |
| 1557 | + | |
| 1558 | + | |
| 1559 | + | |
| 1560 | + | |
| 1561 | + | |
| 1562 | + | |
| 1563 | + | |
| 1564 | + | |
| 1565 | + | |
| 1566 | + | |
| 1567 | + | |
1554 | 1568 | | |
1555 | 1569 | | |
1556 | 1570 | | |
| |||
Lines changed: 30 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
91 | 91 | | |
92 | 92 | | |
93 | 93 | | |
| 94 | + | |
94 | 95 | | |
95 | 96 | | |
96 | 97 | | |
| |||
241 | 242 | | |
242 | 243 | | |
243 | 244 | | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
244 | 248 | | |
245 | 249 | | |
246 | 250 | | |
| |||
1489 | 1493 | | |
1490 | 1494 | | |
1491 | 1495 | | |
| 1496 | + | |
1492 | 1497 | | |
1493 | 1498 | | |
1494 | 1499 | | |
| |||
1523 | 1528 | | |
1524 | 1529 | | |
1525 | 1530 | | |
| 1531 | + | |
| 1532 | + | |
| 1533 | + | |
| 1534 | + | |
| 1535 | + | |
| 1536 | + | |
| 1537 | + | |
| 1538 | + | |
| 1539 | + | |
| 1540 | + | |
| 1541 | + | |
| 1542 | + | |
| 1543 | + | |
| 1544 | + | |
| 1545 | + | |
| 1546 | + | |
| 1547 | + | |
| 1548 | + | |
| 1549 | + | |
| 1550 | + | |
| 1551 | + | |
| 1552 | + | |
| 1553 | + | |
| 1554 | + | |
| 1555 | + | |
1526 | 1556 | | |
1527 | 1557 | | |
1528 | 1558 | | |
| |||
0 commit comments