You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by GitBox <gi...@apache.org> on 2022/08/04 08:52:32 UTC
[GitHub] [cloudstack] SadiJr opened a new pull request, #6589: [Veeam] disable jobs but keep backups
SadiJr opened a new pull request, #6589:
URL: https://github.com/apache/cloudstack/pull/6589
### Description
Using the VMWare hypervisor, with the Veeam plugin active, it is not possible to remove the VM from its Backup Offering without removing its backups. To resolve this limitation, a new parameter has been added to the `removeVirtualMachineFromBackupOffering` API to allow users to disable the job but keep Veeam backups. So, when removing a VM from a Backup Offering, it is possible to pass the forced parameter to true, which will remove the job and the backups. Otherwise, the job will just be disabled and the backups will be kept.
### Types of changes
- [ ] Breaking change (fix or feature that would cause existing functionality to change)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Bug fix (non-breaking change which fixes an issue)
- [x] Enhancement (improves an existing feature and functionality)
- [ ] Cleanup (Code refactoring and cleanup, that may add test cases)
### Feature/Enhancement Scale or Bug Severity
#### Feature/Enhancement Scale
- [ ] Major
- [x] Minor
### How Has This Been Tested?
It was tested in a local lab:
1. I created a new VM and attached this VM to a Backup Offering;
2. I make some manual backups;
3. I removed this VM from the backup offering, without using the `force` option as false, and checked if, in Veeam, the job was still there, in the disabled state, and if the backups were still stored too;
4. I repeat this process, but using true in `force` option and check if the backups and job are deleted in Veeam.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] github-actions[bot] commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1202439915
This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1209389213
@blueorangutan test centos7 vmware-65u2
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [Veeam] disable jobs but keep backups [cloudstack]
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1847188291
@DaanHoogland a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [Veeam] disable jobs but keep backups [cloudstack]
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-2067216141
Packaging result [SF]: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 9342
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [Veeam] disable jobs but keep backups [cloudstack]
Posted by "weizhouapache (via GitHub)" <gi...@apache.org>.
weizhouapache commented on code in PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#discussion_r1432694167
##########
engine/schema/src/main/resources/META-INF/db/schema-41720to41800.sql:
##########
@@ -1562,6 +1562,21 @@ DELETE FROM `cloud`.`snapshot_store_ref`
WHERE store_role = "Primary" AND store_id IN (SELECT id FROM storage_pool WHERE removed IS NOT NULL);
+ALTER TABLE `cloud`.`backups` ADD backup_volumes TEXT NULL COMMENT 'details of backedup volumes';
+
+-- Populate column backup_volumes in table backups with a GSON
+-- formed by concatenating the UUID, type, size, path and deviceId
+-- of the volumes of VMs that have some backup offering.
+-- Required for the restore process of a backup using Veeam
+-- The Gson result can be in one of this formats:
+-- When VM has only ROOT disk: [{"uuid":"<uuid>","type":"<type>","size":<size>,"path":"<path>","deviceId":<deviceId>}]
+-- When VM has more tha one disk: [{"uuid":"<uuid>","type":"<type>","size":<size>,"path":"<path>","deviceId":<deviceId>}, {"uuid":"<uuid>","type":"<type>","size":<size>,"path":"<path>","deviceId":<deviceId>}, <>]
+UPDATE `cloud`.`backups` b INNER JOIN `cloud`.`vm_instance` vm ON b.vm_id = vm.id SET b.backup_volumes = (SELECT CONCAT("[", GROUP_CONCAT( CONCAT("{\"uuid\":\"", v.uuid, "\",\"type\":\"", v.volume_type, "\",\"size\":", v.`size`, ",\"path\":\"", v.path, "\",\"deviceId\":", v.device_id, "}") SEPARATOR ","), "]") FROM `cloud`.`volumes` v WHERE v.instance_id = vm.id);
Review Comment:
`AND volumes.removed IS NULL` ?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1208567118
<b>Trillian test result (tid-4642)</b>
Environment: xenserver-71 (x2), Advanced Networking with Mgmt server 7
Total time taken: 36946 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr6589-t4642-xenserver-71.zip
Smoke tests completed. 101 look OK, 0 have errors
Only failed tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1206348110
Packaging result: :heavy_multiplication_x: el7 :heavy_multiplication_x: el8 :heavy_multiplication_x: debian :heavy_check_mark: suse15. SL-JID 3918
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1201249999
Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 3875
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on a diff in pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on code in PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#discussion_r936710856
##########
utils/src/main/java/com/cloud/utils/UuidUtils.java:
##########
@@ -28,6 +28,10 @@ public final static String first(String uuid) {
return uuid.substring(0, uuid.indexOf('-'));
}
+ public static boolean isUuid(String data) {
Review Comment:
Was that your point @JoaoJandre ?
I think the question was to use an existing `validateUUID` method instead of creating this new one, @SadiJr.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [Veeam] disable jobs but keep backups [cloudstack]
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-2017731794
Packaging result [SF]: ✖️ el7 ✖️ el8 ✖️ el9 ✖️ debian ✖️ suse15. SL-JID 9027
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1205006402
Packaging result: :heavy_multiplication_x: el7 :heavy_check_mark: el8 :heavy_multiplication_x: debian :heavy_multiplication_x: suse15. SL-JID 3904
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1199796561
@acs-robot a Jenkins job has been kicked to build UI QA env. I'll keep you posted as I make progress.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] codecov[bot] commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
codecov[bot] commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1213133212
# [Codecov](https://codecov.io/gh/apache/cloudstack/pull/6589?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) Report
> Merging [#6589](https://codecov.io/gh/apache/cloudstack/pull/6589?src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (528c194) into [main](https://codecov.io/gh/apache/cloudstack/commit/9717ed9af2449cd21a5b6ff897669e51fda1142c?el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (9717ed9) will **decrease** coverage by `0.00%`.
> The diff coverage is `0.48%`.
```diff
@@ Coverage Diff @@
## main #6589 +/- ##
============================================
- Coverage 5.87% 5.87% -0.01%
- Complexity 3933 3934 +1
============================================
Files 2454 2454
Lines 242632 242715 +83
Branches 37970 37983 +13
============================================
+ Hits 14246 14249 +3
- Misses 226810 226890 +80
Partials 1576 1576
```
| [Impacted Files](https://codecov.io/gh/apache/cloudstack/pull/6589?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) | Coverage Δ | |
|---|---|---|
| [...main/java/com/cloud/storage/dao/VolumeDaoImpl.java](https://codecov.io/gh/apache/cloudstack/pull/6589/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-ZW5naW5lL3NjaGVtYS9zcmMvbWFpbi9qYXZhL2NvbS9jbG91ZC9zdG9yYWdlL2Rhby9Wb2x1bWVEYW9JbXBsLmphdmE=) | `0.00% <0.00%> (ø)` | |
| [...ngine/schema/src/main/java/com/cloud/vm/NicVO.java](https://codecov.io/gh/apache/cloudstack/pull/6589/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-ZW5naW5lL3NjaGVtYS9zcmMvbWFpbi9qYXZhL2NvbS9jbG91ZC92bS9OaWNWTy5qYXZh) | `26.92% <0.00%> (-0.53%)` | :arrow_down: |
| [...chema/src/main/java/com/cloud/vm/VMInstanceVO.java](https://codecov.io/gh/apache/cloudstack/pull/6589/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-ZW5naW5lL3NjaGVtYS9zcmMvbWFpbi9qYXZhL2NvbS9jbG91ZC92bS9WTUluc3RhbmNlVk8uamF2YQ==) | `24.69% <0.00%> (+0.29%)` | :arrow_up: |
| [...ema/src/main/java/com/cloud/vm/dao/NicDaoImpl.java](https://codecov.io/gh/apache/cloudstack/pull/6589/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-ZW5naW5lL3NjaGVtYS9zcmMvbWFpbi9qYXZhL2NvbS9jbG91ZC92bS9kYW8vTmljRGFvSW1wbC5qYXZh) | `0.00% <0.00%> (ø)` | |
| [...in/java/org/apache/cloudstack/backup/BackupVO.java](https://codecov.io/gh/apache/cloudstack/pull/6589/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-ZW5naW5lL3NjaGVtYS9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvY2xvdWRzdGFjay9iYWNrdXAvQmFja3VwVk8uamF2YQ==) | `6.66% <0.00%> (+6.66%)` | :arrow_up: |
| [...rg/apache/cloudstack/backup/dao/BackupDaoImpl.java](https://codecov.io/gh/apache/cloudstack/pull/6589/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-ZW5naW5lL3NjaGVtYS9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvY2xvdWRzdGFjay9iYWNrdXAvZGFvL0JhY2t1cERhb0ltcGwuamF2YQ==) | `0.00% <0.00%> (ø)` | |
| [...udstack/engine/cloud/entity/api/db/VMEntityVO.java](https://codecov.io/gh/apache/cloudstack/pull/6589/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-ZW5naW5lL3NjaGVtYS9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvY2xvdWRzdGFjay9lbmdpbmUvY2xvdWQvZW50aXR5L2FwaS9kYi9WTUVudGl0eVZPLmphdmE=) | `0.00% <0.00%> (ø)` | |
| [.../apache/cloudstack/backup/DummyBackupProvider.java](https://codecov.io/gh/apache/cloudstack/pull/6589/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-cGx1Z2lucy9iYWNrdXAvZHVtbXkvc3JjL21haW4vamF2YS9vcmcvYXBhY2hlL2Nsb3Vkc3RhY2svYmFja3VwL0R1bW15QmFja3VwUHJvdmlkZXIuamF2YQ==) | `0.00% <ø> (ø)` | |
| [.../apache/cloudstack/backup/VeeamBackupProvider.java](https://codecov.io/gh/apache/cloudstack/pull/6589/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-cGx1Z2lucy9iYWNrdXAvdmVlYW0vc3JjL21haW4vamF2YS9vcmcvYXBhY2hlL2Nsb3Vkc3RhY2svYmFja3VwL1ZlZWFtQmFja3VwUHJvdmlkZXIuamF2YQ==) | `0.00% <0.00%> (ø)` | |
| [...rg/apache/cloudstack/backup/veeam/VeeamClient.java](https://codecov.io/gh/apache/cloudstack/pull/6589/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-cGx1Z2lucy9iYWNrdXAvdmVlYW0vc3JjL21haW4vamF2YS9vcmcvYXBhY2hlL2Nsb3Vkc3RhY2svYmFja3VwL3ZlZWFtL1ZlZWFtQ2xpZW50LmphdmE=) | `16.23% <0.00%> (-0.35%)` | :arrow_down: |
| ... and [7 more](https://codecov.io/gh/apache/cloudstack/pull/6589/diff?src=pr&el=tree-more&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) | |
:mega: We’re building smart automated test selection to slash your CI/CD build times. [Learn more](https://about.codecov.io/iterative-testing/?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1259438260
@SadiJr can you look at the comments and the conflicts?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] github-actions[bot] commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1438561769
This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1209389811
@DaanHoogland a Trillian-Jenkins test job (centos7 mgmt + vmware-65u2) has been kicked to run smoke tests
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1207895374
@DaanHoogland a Trillian-Jenkins matrix job (centos7 mgmt + xs71, centos7 mgmt + vmware65, centos7 mgmt + kvmcentos7) has been kicked to run smoke tests
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] github-actions[bot] commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1210561903
This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] sonarcloud[bot] commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by "sonarcloud[bot] (via GitHub)" <gi...@apache.org>.
sonarcloud[bot] commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1428813055
SonarCloud Quality Gate failed. [](https://sonarcloud.io/dashboard?id=apache_cloudstack&pullRequest=6589)
[](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6589&resolved=false&types=BUG) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6589&resolved=false&types=BUG) [0 Bugs](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6589&resolved=false&types=BUG)
[](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6589&resolved=false&types=VULNERABILITY) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6589&resolved=false&types=VULNERABILITY) [0 Vulnerabilities](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6589&resolved=false&types=VULNERABILITY)
[](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=6589&resolved=false&types=SECURITY_HOTSPOT) [](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=6589&resolved=false&types=SECURITY_HOTSPOT) [0 Security Hotspots](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=6589&resolved=false&types=SECURITY_HOTSPOT)
[](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6589&resolved=false&types=CODE_SMELL) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6589&resolved=false&types=CODE_SMELL) [20 Code Smells](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6589&resolved=false&types=CODE_SMELL)
[](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6589&metric=new_coverage&view=list) [6.1% Coverage](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6589&metric=new_coverage&view=list)
[](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6589&metric=new_duplicated_lines_density&view=list) [0.3% Duplication](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6589&metric=new_duplicated_lines_density&view=list)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1204961731
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [Veeam] disable jobs but keep backups [cloudstack]
Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1847186090
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [Veeam] disable jobs but keep backups [cloudstack]
Posted by "sureshanaparti (via GitHub)" <gi...@apache.org>.
sureshanaparti commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-2018027245
@BryanMLima Some build errors here _VeeamClient.java_, please check.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [Veeam] disable jobs but keep backups [cloudstack]
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1782503002
@DaanHoogland a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1204963204
@DaanHoogland a Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1209415738
<b>Trillian Build Failed (tid-4664)<b/>
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1209440526
<b>Trillian Build Failed (tid-4665)<b/>
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1211204004
<b>Trillian test result (tid-4669)</b>
Environment: vmware-65u2 (x2), Advanced Networking with Mgmt server 7
Total time taken: 42303 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr6589-t4669-vmware-65u2.zip
Smoke tests completed. 99 look OK, 2 have errors
Only failed tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---
test_08_upgrade_kubernetes_ha_cluster | `Failure` | 607.06 | test_kubernetes_clusters.py
test_01_unmanage_vm_cycle | `Error` | 46.38 | test_vm_lifecycle_unmanage_import.py
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] github-actions[bot] commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1232687669
This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] SadiJr commented on a diff in pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
SadiJr commented on code in PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#discussion_r936003070
##########
utils/src/main/java/com/cloud/utils/UuidUtils.java:
##########
@@ -28,6 +28,10 @@ public final static String first(String uuid) {
return uuid.substring(0, uuid.indexOf('-'));
}
+ public static boolean isUuid(String data) {
Review Comment:
From my point of view, using validate in the name of a method gives the impression that if the validation fails, an exception will be thrown. As in this case only true or false is returned, I decided to create a method whose name, again from my point of view, makes more sense.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1208678065
<b>Trillian test result (tid-4644)</b>
Environment: vmware-65u2 (x2), Advanced Networking with Mgmt server 7
Total time taken: 44490 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr6589-t4644-vmware-65u2.zip
Smoke tests completed. 100 look OK, 1 have errors
Only failed tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---
test_01_unmanage_vm_cycle | `Error` | 46.26 | test_vm_lifecycle_unmanage_import.py
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] github-actions[bot] commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1731309318
This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [Veeam] disable jobs but keep backups [cloudstack]
Posted by "shwstppr (via GitHub)" <gi...@apache.org>.
shwstppr commented on code in PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#discussion_r1347004926
##########
engine/schema/src/main/resources/META-INF/db/schema-41720to41800.sql:
##########
@@ -1562,6 +1562,21 @@ DELETE FROM `cloud`.`snapshot_store_ref`
WHERE store_role = "Primary" AND store_id IN (SELECT id FROM storage_pool WHERE removed IS NOT NULL);
+ALTER TABLE `cloud`.`backups` ADD backup_volumes TEXT NULL COMMENT 'details of backedup volumes';
+
+-- Populate column backup_volumes in table backups with a GSON
+-- formed by concatenating the UUID, type, size, path and deviceId
+-- of the volumes of VMs that have some backup offering.
+-- Required for the restore process of a backup using Veeam
+-- The Gson result can be in one of this formats:
+-- When VM has only ROOT disk: [{"uuid":"<uuid>","type":"<type>","size":<size>,"path":"<path>","deviceId":<deviceId>}]
+-- When VM has more tha one disk: [{"uuid":"<uuid>","type":"<type>","size":<size>,"path":"<path>","deviceId":<deviceId>}, {"uuid":"<uuid>","type":"<type>","size":<size>,"path":"<path>","deviceId":<deviceId>}, <>]
+UPDATE `cloud`.`backups` b INNER JOIN `cloud`.`vm_instance` vm ON b.vm_id = vm.id SET b.backup_volumes = (SELECT CONCAT("[", GROUP_CONCAT( CONCAT("{\"uuid\":\"", v.uuid, "\",\"type\":\"", v.volume_type, "\",\"size\":", v.`size`, ",\"path\":\"", v.path, "\",\"deviceId\":", v.device_id, "}") SEPARATOR ","), "]") FROM `cloud`.`volumes` v WHERE v.instance_id = vm.id);
+
+ALTER TABLE `cloud`.`vm_instance` ADD backup_name varchar(255) NULL COMMENT 'backup job name when using Veeam provider';
+
+UPDATE `cloud`.`vm_instance` vm INNER JOIN `cloud`.`backup_offering` bo ON vm.backup_offering_id = bo.id SET vm.backup_name = CONCAT(vm.instance_name, "-CSBKP-", vm.uuid);
+
Review Comment:
@SadiJr this would need addressing
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [Veeam] disable jobs but keep backups [cloudstack]
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1782593536
Packaging result [SF]: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: el9 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 7540
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] acs-robot commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
acs-robot commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1203867983
Found UI changes, kicking a new UI QA build
@blueorangutan ui
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1201189076
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] JoaoJandre commented on a diff in pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
JoaoJandre commented on code in PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#discussion_r934790922
##########
utils/src/main/java/com/cloud/utils/UuidUtils.java:
##########
@@ -28,6 +28,10 @@ public final static String first(String uuid) {
return uuid.substring(0, uuid.indexOf('-'));
}
+ public static boolean isUuid(String data) {
Review Comment:
Why create this method?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] github-actions[bot] commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1259074278
This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] github-actions[bot] commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1455532847
This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] github-actions[bot] commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1495474183
This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] github-actions[bot] commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1600867543
This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1578834475
@blueorangutan pakage
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] JoaoJandre commented on a diff in pull request #6589: [Veeam] disable jobs but keep backups
Posted by "JoaoJandre (via GitHub)" <gi...@apache.org>.
JoaoJandre commented on code in PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#discussion_r1332005642
##########
engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupDaoImpl.java:
##########
@@ -141,32 +143,37 @@ public List<Backup> syncBackups(Long zoneId, Long vmId, List<Backup> externalBac
@Override
public BackupResponse newBackupResponse(Backup backup) {
- VMInstanceVO vm = vmInstanceDao.findByIdIncludingRemoved(backup.getVmId());
- AccountVO account = accountDao.findByIdIncludingRemoved(vm.getAccountId());
- DomainVO domain = domainDao.findByIdIncludingRemoved(vm.getDomainId());
- DataCenterVO zone = dataCenterDao.findByIdIncludingRemoved(vm.getDataCenterId());
- BackupOffering offering = backupOfferingDao.findByIdIncludingRemoved(vm.getBackupOfferingId());
-
- BackupResponse response = new BackupResponse();
- response.setId(backup.getUuid());
- response.setVmId(vm.getUuid());
- response.setVmName(vm.getHostName());
- response.setExternalId(backup.getExternalId());
- response.setType(backup.getType());
- response.setDate(backup.getDate());
- response.setSize(backup.getSize());
- response.setProtectedSize(backup.getProtectedSize());
- response.setStatus(backup.getStatus());
- response.setVolumes(new Gson().toJson(vm.getBackupVolumeList().toArray(), Backup.VolumeInfo[].class));
- response.setBackupOfferingId(offering.getUuid());
- response.setBackupOffering(offering.getName());
- response.setAccountId(account.getUuid());
- response.setAccount(account.getAccountName());
- response.setDomainId(domain.getUuid());
- response.setDomain(domain.getName());
- response.setZoneId(zone.getUuid());
- response.setZone(zone.getName());
- response.setObjectName("backup");
- return response;
+ try {
+ VMInstanceVO vm = vmInstanceDao.findByIdIncludingRemoved(backup.getVmId());
+ AccountVO account = accountDao.findByIdIncludingRemoved(vm.getAccountId());
+ DomainVO domain = domainDao.findByIdIncludingRemoved(vm.getDomainId());
+ DataCenterVO zone = dataCenterDao.findByIdIncludingRemoved(vm.getDataCenterId());
+ BackupOffering offering = backupOfferingDao.findByIdIncludingRemoved(backup.getBackupOfferingId());
+
+ BackupResponse response = new BackupResponse();
+ response.setId(backup.getUuid());
+ response.setVmId(vm.getUuid());
+ response.setVmName(vm.getHostName());
+ response.setExternalId(backup.getExternalId());
+ response.setType(backup.getType());
+ response.setDate(backup.getDate());
+ response.setSize(backup.getSize());
+ response.setProtectedSize(backup.getProtectedSize());
+ response.setStatus(backup.getStatus());
+ response.setVolumes(GSON.toJson(vm.getBackupVolumeList().toArray(), Backup.VolumeInfo[].class));
+ response.setBackupOfferingId(offering.getUuid());
+ response.setBackupOffering(offering.getName());
+ response.setAccountId(account.getUuid());
+ response.setAccount(account.getAccountName());
+ response.setDomainId(domain.getUuid());
+ response.setDomain(domain.getName());
+ response.setZoneId(zone.getUuid());
+ response.setZone(zone.getName());
+ response.setObjectName("backup");
+ return response;
+ } catch (Exception e) {
+ LOGGER.error(String.format("Failed to create backup response from Backup [id: %s, vmId: %s] due to: [%s].", backup.getId(), backup.getVmId(), e.getMessage()), e);
+ return null;
+ }
Review Comment:
Does this whole block need to be guarded with a Pokemon catch?
Which methods are we expecting to throw exceptions?
We can probably change the catch to a couple of exceptions.
##########
engine/schema/src/main/resources/META-INF/db/schema-41720to41800.sql:
##########
@@ -1562,6 +1562,21 @@ DELETE FROM `cloud`.`snapshot_store_ref`
WHERE store_role = "Primary" AND store_id IN (SELECT id FROM storage_pool WHERE removed IS NOT NULL);
+ALTER TABLE `cloud`.`backups` ADD backup_volumes TEXT NULL COMMENT 'details of backedup volumes';
+
+-- Populate column backup_volumes in table backups with a GSON
+-- formed by concatenating the UUID, type, size, path and deviceId
+-- of the volumes of VMs that have some backup offering.
+-- Required for the restore process of a backup using Veeam
+-- The Gson result can be in one of this formats:
+-- When VM has only ROOT disk: [{"uuid":"<uuid>","type":"<type>","size":<size>,"path":"<path>","deviceId":<deviceId>}]
+-- When VM has more tha one disk: [{"uuid":"<uuid>","type":"<type>","size":<size>,"path":"<path>","deviceId":<deviceId>}, {"uuid":"<uuid>","type":"<type>","size":<size>,"path":"<path>","deviceId":<deviceId>}, <>]
+UPDATE `cloud`.`backups` b INNER JOIN `cloud`.`vm_instance` vm ON b.vm_id = vm.id SET b.backup_volumes = (SELECT CONCAT("[", GROUP_CONCAT( CONCAT("{\"uuid\":\"", v.uuid, "\",\"type\":\"", v.volume_type, "\",\"size\":", v.`size`, ",\"path\":\"", v.path, "\",\"deviceId\":", v.device_id, "}") SEPARATOR ","), "]") FROM `cloud`.`volumes` v WHERE v.instance_id = vm.id);
+
+ALTER TABLE `cloud`.`vm_instance` ADD backup_name varchar(255) NULL COMMENT 'backup job name when using Veeam provider';
+
+UPDATE `cloud`.`vm_instance` vm INNER JOIN `cloud`.`backup_offering` bo ON vm.backup_offering_id = bo.id SET vm.backup_name = CONCAT(vm.instance_name, "-CSBKP-", vm.uuid);
+
Review Comment:
Change this to schema-41810to41900.sql
##########
plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/VeeamClient.java:
##########
@@ -505,41 +532,26 @@ public boolean addVMToVeeamJob(final String jobId, final String vmwareInstanceNa
throw new CloudRuntimeException("Failed to add VM to backup offering likely due to timeout, please check Veeam tasks");
}
- public boolean removeVMFromVeeamJob(final String jobId, final String vmwareInstanceName, final String vmwareDcName) {
- LOG.debug("Trying to remove VM from backup offering that is a Veeam job: " + jobId);
- try {
- final String hierarchyId = findDCHierarchy(vmwareDcName);
- final String veeamVmRefId = lookupVM(hierarchyId, vmwareInstanceName);
- final HttpResponse response = get(String.format("/jobs/%s/includes", jobId));
- checkResponseOK(response);
- final ObjectMapper objectMapper = new XmlMapper();
- objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
- final ObjectsInJob jobObjects = objectMapper.readValue(response.getEntity().getContent(), ObjectsInJob.class);
- if (jobObjects == null || jobObjects.getObjects() == null) {
- LOG.warn("No objects found in the Veeam job " + jobId);
- return false;
- }
- for (final ObjectInJob jobObject : jobObjects.getObjects()) {
- if (jobObject.getName().equals(vmwareInstanceName) && jobObject.getHierarchyObjRef().equals(veeamVmRefId)) {
- final HttpResponse deleteResponse = delete(String.format("/jobs/%s/includes/%s", jobId, jobObject.getObjectInJobId()));
- return checkTaskStatus(deleteResponse);
- }
- }
- LOG.warn(vmwareInstanceName + " VM was not found to be attached to Veaam job (backup offering): " + jobId);
- return false;
- } catch (final IOException e) {
- LOG.error("Failed to list Veeam jobs due to:", e);
- checkResponseTimeOut(e);
- }
- return false;
+ private boolean checkIfVmAlreadyExistsInJob(String jobId, String vmwareInstanceName) {
+ jobId = jobId.replace("urn:veeam:Job:", "");
+ LOG.debug(String.format("Checking if VM [name: %s] is already assigned to the Backup Job [name: %s].", vmwareInstanceName, jobId));
+ List<String> cmds = Arrays.asList(
+ String.format("$job = (Get-VBRJob ^| Where-Object { $_.Id -eq '%s' })", jobId),
+ "if ($job) { ",
+ String.format("$vm = Get-VBRJobObject -Job $job -Name '%s'", vmwareInstanceName),
+ "if ($vm) { Write-Output \"VM has already in Job\" } else { Write-Output \"False\" }",
+ "} else { Write-Output \"False\" }"
+ );
+ Pair<Boolean, String> result = executePowerShellCommands(cmds);
+ return result.first() && !result.second().contains("False");
}
public boolean restoreFullVM(final String vmwareInstanceName, final String restorePointId) {
LOG.debug("Trying to restore full VM: " + vmwareInstanceName + " from backup");
try {
final HttpResponse response = post(String.format("/vmRestorePoints/%s?action=restore", restorePointId), null);
return checkTaskStatus(response);
- } catch (final IOException e) {
+ } catch (final Exception e) {
Review Comment:
Why catch Exception here?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [Veeam] disable jobs but keep backups [cloudstack]
Posted by "weizhouapache (via GitHub)" <gi...@apache.org>.
weizhouapache commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1847195392
good feature, but this PR is not ready for review. better move this to next milestone
cc @DaanHoogland @shwstppr
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [Veeam] disable jobs but keep backups [cloudstack]
Posted by "codecov-commenter (via GitHub)" <gi...@apache.org>.
codecov-commenter commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-2067106675
## [Codecov](https://app.codecov.io/gh/apache/cloudstack/pull/6589?dropdown=coverage&src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) Report
Attention: Patch coverage is `40.55944%` with `85 lines` in your changes are missing coverage. Please review.
> Project coverage is 23.23%. Comparing base [(`e44c17e`)](https://app.codecov.io/gh/apache/cloudstack/commit/e44c17e07703ac0ceda7326585f433fe33b37ca4?dropdown=coverage&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) to head [(`8de0ba0`)](https://app.codecov.io/gh/apache/cloudstack/pull/6589?dropdown=coverage&src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache).
> Report is 64 commits behind head on main.
> :exclamation: Current head 8de0ba0 differs from pull request most recent head 3a129f0. Consider uploading reports for the commit 3a129f0 to get more accurate results
| [Files](https://app.codecov.io/gh/apache/cloudstack/pull/6589?dropdown=coverage&src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) | Patch % | Lines |
|---|---|---|
| [.../src/main/java/com/cloud/vm/UserVmManagerImpl.java](https://app.codecov.io/gh/apache/cloudstack/pull/6589?src=pr&el=tree&filepath=server%2Fsrc%2Fmain%2Fjava%2Fcom%2Fcloud%2Fvm%2FUserVmManagerImpl.java&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache#diff-c2VydmVyL3NyYy9tYWluL2phdmEvY29tL2Nsb3VkL3ZtL1VzZXJWbU1hbmFnZXJJbXBsLmphdmE=) | 17.24% | [22 Missing and 2 partials :warning: ](https://app.codecov.io/gh/apache/cloudstack/pull/6589?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) |
| [.../storage/datastore/db/PrimaryDataStoreDaoImpl.java](https://app.codecov.io/gh/apache/cloudstack/pull/6589?src=pr&el=tree&filepath=engine%2Fschema%2Fsrc%2Fmain%2Fjava%2Forg%2Fapache%2Fcloudstack%2Fstorage%2Fdatastore%2Fdb%2FPrimaryDataStoreDaoImpl.java&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache#diff-ZW5naW5lL3NjaGVtYS9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvY2xvdWRzdGFjay9zdG9yYWdlL2RhdGFzdG9yZS9kYi9QcmltYXJ5RGF0YVN0b3JlRGFvSW1wbC5qYXZh) | 51.51% | [16 Missing :warning: ](https://app.codecov.io/gh/apache/cloudstack/pull/6589?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) |
| [...main/java/org/apache/cloudstack/backup/Backup.java](https://app.codecov.io/gh/apache/cloudstack/pull/6589?src=pr&el=tree&filepath=api%2Fsrc%2Fmain%2Fjava%2Forg%2Fapache%2Fcloudstack%2Fbackup%2FBackup.java&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache#diff-YXBpL3NyYy9tYWluL2phdmEvb3JnL2FwYWNoZS9jbG91ZHN0YWNrL2JhY2t1cC9CYWNrdXAuamF2YQ==) | 13.33% | [13 Missing :warning: ](https://app.codecov.io/gh/apache/cloudstack/pull/6589?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) |
| [...rg/apache/cloudstack/backup/BackupManagerImpl.java](https://app.codecov.io/gh/apache/cloudstack/pull/6589?src=pr&el=tree&filepath=server%2Fsrc%2Fmain%2Fjava%2Forg%2Fapache%2Fcloudstack%2Fbackup%2FBackupManagerImpl.java&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache#diff-c2VydmVyL3NyYy9tYWluL2phdmEvb3JnL2FwYWNoZS9jbG91ZHN0YWNrL2JhY2t1cC9CYWNrdXBNYW5hZ2VySW1wbC5qYXZh) | 30.00% | [5 Missing and 2 partials :warning: ](https://app.codecov.io/gh/apache/cloudstack/pull/6589?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) |
| [...stack/api/command/user/volume/DetachVolumeCmd.java](https://app.codecov.io/gh/apache/cloudstack/pull/6589?src=pr&el=tree&filepath=api%2Fsrc%2Fmain%2Fjava%2Forg%2Fapache%2Fcloudstack%2Fapi%2Fcommand%2Fuser%2Fvolume%2FDetachVolumeCmd.java&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache#diff-YXBpL3NyYy9tYWluL2phdmEvb3JnL2FwYWNoZS9jbG91ZHN0YWNrL2FwaS9jb21tYW5kL3VzZXIvdm9sdW1lL0RldGFjaFZvbHVtZUNtZC5qYXZh) | 0.00% | [6 Missing :warning: ](https://app.codecov.io/gh/apache/cloudstack/pull/6589?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) |
| [...in/java/org/apache/cloudstack/backup/BackupVO.java](https://app.codecov.io/gh/apache/cloudstack/pull/6589?src=pr&el=tree&filepath=engine%2Fschema%2Fsrc%2Fmain%2Fjava%2Forg%2Fapache%2Fcloudstack%2Fbackup%2FBackupVO.java&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache#diff-ZW5naW5lL3NjaGVtYS9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvY2xvdWRzdGFjay9iYWNrdXAvQmFja3VwVk8uamF2YQ==) | 33.33% | [3 Missing and 1 partial :warning: ](https://app.codecov.io/gh/apache/cloudstack/pull/6589?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) |
| [utils/src/main/java/com/cloud/utils/UuidUtils.java](https://app.codecov.io/gh/apache/cloudstack/pull/6589?src=pr&el=tree&filepath=utils%2Fsrc%2Fmain%2Fjava%2Fcom%2Fcloud%2Futils%2FUuidUtils.java&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache#diff-dXRpbHMvc3JjL21haW4vamF2YS9jb20vY2xvdWQvdXRpbHMvVXVpZFV0aWxzLmphdmE=) | 0.00% | [4 Missing :warning: ](https://app.codecov.io/gh/apache/cloudstack/pull/6589?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) |
| [...main/java/com/cloud/storage/dao/VolumeDaoImpl.java](https://app.codecov.io/gh/apache/cloudstack/pull/6589?src=pr&el=tree&filepath=engine%2Fschema%2Fsrc%2Fmain%2Fjava%2Fcom%2Fcloud%2Fstorage%2Fdao%2FVolumeDaoImpl.java&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache#diff-ZW5naW5lL3NjaGVtYS9zcmMvbWFpbi9qYXZhL2NvbS9jbG91ZC9zdG9yYWdlL2Rhby9Wb2x1bWVEYW9JbXBsLmphdmE=) | 25.00% | [3 Missing :warning: ](https://app.codecov.io/gh/apache/cloudstack/pull/6589?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) |
| [...chema/src/main/java/com/cloud/vm/VMInstanceVO.java](https://app.codecov.io/gh/apache/cloudstack/pull/6589?src=pr&el=tree&filepath=engine%2Fschema%2Fsrc%2Fmain%2Fjava%2Fcom%2Fcloud%2Fvm%2FVMInstanceVO.java&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache#diff-ZW5naW5lL3NjaGVtYS9zcmMvbWFpbi9qYXZhL2NvbS9jbG91ZC92bS9WTUluc3RhbmNlVk8uamF2YQ==) | 0.00% | [3 Missing :warning: ](https://app.codecov.io/gh/apache/cloudstack/pull/6589?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) |
| [...rg/apache/cloudstack/backup/dao/BackupDaoImpl.java](https://app.codecov.io/gh/apache/cloudstack/pull/6589?src=pr&el=tree&filepath=engine%2Fschema%2Fsrc%2Fmain%2Fjava%2Forg%2Fapache%2Fcloudstack%2Fbackup%2Fdao%2FBackupDaoImpl.java&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache#diff-ZW5naW5lL3NjaGVtYS9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvY2xvdWRzdGFjay9iYWNrdXAvZGFvL0JhY2t1cERhb0ltcGwuamF2YQ==) | 90.00% | [3 Missing :warning: ](https://app.codecov.io/gh/apache/cloudstack/pull/6589?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) |
| ... and [2 more](https://app.codecov.io/gh/apache/cloudstack/pull/6589?src=pr&el=tree-more&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) | |
<details><summary>Additional details and impacted files</summary>
```diff
@@ Coverage Diff @@
## main #6589 +/- ##
============================================
- Coverage 30.93% 23.23% -7.70%
+ Complexity 33753 23599 -10154
============================================
Files 5404 5234 -170
Lines 380309 355809 -24500
Branches 55507 51239 -4268
============================================
- Hits 117658 82686 -34972
- Misses 247041 261163 +14122
+ Partials 15610 11960 -3650
```
| [Flag](https://app.codecov.io/gh/apache/cloudstack/pull/6589/flags?src=pr&el=flags&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) | Coverage Δ | |
|---|---|---|
| [simulator-marvin-tests](https://app.codecov.io/gh/apache/cloudstack/pull/6589/flags?src=pr&el=flag&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) | `24.91% <40.55%> (+0.36%)` | :arrow_up: |
| [uitests](https://app.codecov.io/gh/apache/cloudstack/pull/6589/flags?src=pr&el=flag&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) | `4.34% <ø> (ø)` | |
| [unit-tests](https://app.codecov.io/gh/apache/cloudstack/pull/6589/flags?src=pr&el=flag&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) | `?` | |
Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache#carryforward-flags-in-the-pull-request-comment) to find out more.
</details>
[:umbrella: View full report in Codecov by Sentry](https://app.codecov.io/gh/apache/cloudstack/pull/6589?dropdown=coverage&src=pr&el=continue&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache).
:loudspeaker: Have feedback on the report? [Share it here](https://about.codecov.io/codecov-pr-comment-feedback/?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [Veeam] disable jobs but keep backups [cloudstack]
Posted by "BryanMLima (via GitHub)" <gi...@apache.org>.
BryanMLima commented on code in PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#discussion_r1572775460
##########
engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupDaoImpl.java:
##########
@@ -141,32 +141,37 @@ public List<Backup> syncBackups(Long zoneId, Long vmId, List<Backup> externalBac
@Override
public BackupResponse newBackupResponse(Backup backup) {
- VMInstanceVO vm = vmInstanceDao.findByIdIncludingRemoved(backup.getVmId());
- AccountVO account = accountDao.findByIdIncludingRemoved(vm.getAccountId());
- DomainVO domain = domainDao.findByIdIncludingRemoved(vm.getDomainId());
- DataCenterVO zone = dataCenterDao.findByIdIncludingRemoved(vm.getDataCenterId());
- BackupOffering offering = backupOfferingDao.findByIdIncludingRemoved(vm.getBackupOfferingId());
-
- BackupResponse response = new BackupResponse();
- response.setId(backup.getUuid());
- response.setVmId(vm.getUuid());
- response.setVmName(vm.getHostName());
- response.setExternalId(backup.getExternalId());
- response.setType(backup.getType());
- response.setDate(backup.getDate());
- response.setSize(backup.getSize());
- response.setProtectedSize(backup.getProtectedSize());
- response.setStatus(backup.getStatus());
- response.setVolumes(new Gson().toJson(vm.getBackupVolumeList().toArray(), Backup.VolumeInfo[].class));
- response.setBackupOfferingId(offering.getUuid());
- response.setBackupOffering(offering.getName());
- response.setAccountId(account.getUuid());
- response.setAccount(account.getAccountName());
- response.setDomainId(domain.getUuid());
- response.setDomain(domain.getName());
- response.setZoneId(zone.getUuid());
- response.setZone(zone.getName());
- response.setObjectName("backup");
- return response;
+ try {
+ VMInstanceVO vm = vmInstanceDao.findByIdIncludingRemoved(backup.getVmId());
+ AccountVO account = accountDao.findByIdIncludingRemoved(vm.getAccountId());
+ DomainVO domain = domainDao.findByIdIncludingRemoved(vm.getDomainId());
+ DataCenterVO zone = dataCenterDao.findByIdIncludingRemoved(vm.getDataCenterId());
+ BackupOffering offering = backupOfferingDao.findByIdIncludingRemoved(backup.getBackupOfferingId());
+
+ BackupResponse response = new BackupResponse();
+ response.setId(backup.getUuid());
+ response.setVmId(vm.getUuid());
+ response.setVmName(vm.getHostName());
+ response.setExternalId(backup.getExternalId());
+ response.setType(backup.getType());
+ response.setDate(backup.getDate());
+ response.setSize(backup.getSize());
+ response.setProtectedSize(backup.getProtectedSize());
+ response.setStatus(backup.getStatus());
+ response.setVolumes(GSON.toJson(backup.getBackupVolumeList().toArray(), Backup.VolumeInfo[].class));
+ response.setBackupOfferingId(offering.getUuid());
+ response.setBackupOffering(offering.getName());
+ response.setAccountId(account.getUuid());
+ response.setAccount(account.getAccountName());
+ response.setDomainId(domain.getUuid());
+ response.setDomain(domain.getName());
+ response.setZoneId(zone.getUuid());
+ response.setZone(zone.getName());
+ response.setObjectName("backup");
+ return response;
+ } catch (Exception e) {
Review Comment:
Same here.
##########
engine/schema/src/main/resources/META-INF/db/schema-41720to41800.sql:
##########
@@ -1562,6 +1562,21 @@ DELETE FROM `cloud`.`snapshot_store_ref`
WHERE store_role = "Primary" AND store_id IN (SELECT id FROM storage_pool WHERE removed IS NOT NULL);
+ALTER TABLE `cloud`.`backups` ADD backup_volumes TEXT NULL COMMENT 'details of backedup volumes';
+
+-- Populate column backup_volumes in table backups with a GSON
+-- formed by concatenating the UUID, type, size, path and deviceId
+-- of the volumes of VMs that have some backup offering.
+-- Required for the restore process of a backup using Veeam
+-- The Gson result can be in one of this formats:
+-- When VM has only ROOT disk: [{"uuid":"<uuid>","type":"<type>","size":<size>,"path":"<path>","deviceId":<deviceId>}]
+-- When VM has more tha one disk: [{"uuid":"<uuid>","type":"<type>","size":<size>,"path":"<path>","deviceId":<deviceId>}, {"uuid":"<uuid>","type":"<type>","size":<size>,"path":"<path>","deviceId":<deviceId>}, <>]
+UPDATE `cloud`.`backups` b INNER JOIN `cloud`.`vm_instance` vm ON b.vm_id = vm.id SET b.backup_volumes = (SELECT CONCAT("[", GROUP_CONCAT( CONCAT("{\"uuid\":\"", v.uuid, "\",\"type\":\"", v.volume_type, "\",\"size\":", v.`size`, ",\"path\":\"", v.path, "\",\"deviceId\":", v.device_id, "}") SEPARATOR ","), "]") FROM `cloud`.`volumes` v WHERE v.instance_id = vm.id);
Review Comment:
The volumes are already removed, I think it is better to keep all of them consistent. But I do not see a problem adding this condition.
##########
plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/VeeamBackupProvider.java:
##########
@@ -397,6 +404,30 @@ public void doInTransactionWithoutResult(TransactionStatus status) {
});
}
+ protected String createVolumeInfoFromVolumes(List<String> paths) {
+ List<VolumeVO> vmVolumes = new ArrayList<>();
+ try {
+ for (String diskName : paths) {
+ VolumeVO volumeVO = volumeDao.findByPath(diskName);
+ if (volumeVO != null) {
+ vmVolumes.add(volumeVO);
+ }
+ }
+ List<Backup.VolumeInfo> list = new ArrayList<>();
+ for (VolumeVO vol : vmVolumes) {
+ list.add(new Backup.VolumeInfo(vol.getUuid(), vol.getPath(), vol.getVolumeType(), vol.getSize(), vol.getDeviceId()));
+ }
+ return new Gson().toJson(list.toArray(), Backup.VolumeInfo[].class);
+ } catch (Exception e) {
Review Comment:
Speaking to @SadiJr, he mentioned that an exception was thrown when trying to parse to a JSON object, though, he does not remember exactly which. In this case, I think I prefer to keep the catch all here, just to be safe.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1203873996
UI build: :heavy_check_mark:
Live QA URL: http://qa.cloudstack.cloud:8080/client/pr/6589 (SL-JID-2068)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on a diff in pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on code in PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#discussion_r936778382
##########
utils/src/main/java/com/cloud/utils/UuidUtils.java:
##########
@@ -28,6 +28,10 @@ public final static String first(String uuid) {
return uuid.substring(0, uuid.indexOf('-'));
}
+ public static boolean isUuid(String data) {
Review Comment:
depends on what does `regex.matches()` do on no match; if it return false yes than renaming it makes sense. If it throws an exeption than validate... is the right name for it.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] JoaoJandre commented on a diff in pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
JoaoJandre commented on code in PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#discussion_r936916631
##########
utils/src/main/java/com/cloud/utils/UuidUtils.java:
##########
@@ -28,6 +28,10 @@ public final static String first(String uuid) {
return uuid.substring(0, uuid.indexOf('-'));
}
+ public static boolean isUuid(String data) {
Review Comment:
As far as I know, `regex.matches()` does not throw any exceptions, it returns false when the String doesn't match the regex.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] JoaoJandre commented on a diff in pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
JoaoJandre commented on code in PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#discussion_r936712063
##########
utils/src/main/java/com/cloud/utils/UuidUtils.java:
##########
@@ -28,6 +28,10 @@ public final static String first(String uuid) {
return uuid.substring(0, uuid.indexOf('-'));
}
+ public static boolean isUuid(String data) {
Review Comment:
I see, but then why not simply refactor the old method's name?
##########
utils/src/main/java/com/cloud/utils/UuidUtils.java:
##########
@@ -28,6 +28,10 @@ public final static String first(String uuid) {
return uuid.substring(0, uuid.indexOf('-'));
}
+ public static boolean isUuid(String data) {
Review Comment:
I see, but then why not refactor the old method's name?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1206299342
Packaging result: :heavy_multiplication_x: el7 :heavy_check_mark: el8 :heavy_multiplication_x: debian :heavy_multiplication_x: suse15. SL-JID 3914
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] GutoVeronezi commented on a diff in pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
GutoVeronezi commented on code in PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#discussion_r966237797
##########
api/src/main/java/org/apache/cloudstack/backup/Backup.java:
##########
@@ -125,9 +139,17 @@ public Long getSize() {
return size;
}
+ public void setDeviceId(Long deviceId) {
+ this.deviceId = deviceId;
+ }
+
+ public Long getDeviceId() {
+ return deviceId;
+ }
+
@Override
public String toString() {
- return StringUtils.join(":", uuid, path, type, size);
+ return StringUtils.join(":", uuid, path, type, size, deviceId);
Review Comment:
This `toString` is used in many places? If not, we could rewrite it to use the `ReflectionToStringBuilderUtils`.
##########
engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupDaoImpl.java:
##########
@@ -141,32 +143,37 @@ public List<Backup> syncBackups(Long zoneId, Long vmId, List<Backup> externalBac
@Override
public BackupResponse newBackupResponse(Backup backup) {
- VMInstanceVO vm = vmInstanceDao.findByIdIncludingRemoved(backup.getVmId());
- AccountVO account = accountDao.findByIdIncludingRemoved(vm.getAccountId());
- DomainVO domain = domainDao.findByIdIncludingRemoved(vm.getDomainId());
- DataCenterVO zone = dataCenterDao.findByIdIncludingRemoved(vm.getDataCenterId());
- BackupOffering offering = backupOfferingDao.findByIdIncludingRemoved(vm.getBackupOfferingId());
-
- BackupResponse response = new BackupResponse();
- response.setId(backup.getUuid());
- response.setVmId(vm.getUuid());
- response.setVmName(vm.getHostName());
- response.setExternalId(backup.getExternalId());
- response.setType(backup.getType());
- response.setDate(backup.getDate());
- response.setSize(backup.getSize());
- response.setProtectedSize(backup.getProtectedSize());
- response.setStatus(backup.getStatus());
- response.setVolumes(new Gson().toJson(vm.getBackupVolumeList().toArray(), Backup.VolumeInfo[].class));
- response.setBackupOfferingId(offering.getUuid());
- response.setBackupOffering(offering.getName());
- response.setAccountId(account.getUuid());
- response.setAccount(account.getAccountName());
- response.setDomainId(domain.getUuid());
- response.setDomain(domain.getName());
- response.setZoneId(zone.getUuid());
- response.setZone(zone.getName());
- response.setObjectName("backup");
- return response;
+ try {
+ VMInstanceVO vm = vmInstanceDao.findByIdIncludingRemoved(backup.getVmId());
+ AccountVO account = accountDao.findByIdIncludingRemoved(vm.getAccountId());
+ DomainVO domain = domainDao.findByIdIncludingRemoved(vm.getDomainId());
+ DataCenterVO zone = dataCenterDao.findByIdIncludingRemoved(vm.getDataCenterId());
+ BackupOffering offering = backupOfferingDao.findByIdIncludingRemoved(backup.getBackupOfferingId());
+
+ BackupResponse response = new BackupResponse();
+ response.setId(backup.getUuid());
+ response.setVmId(vm.getUuid());
+ response.setVmName(vm.getHostName());
+ response.setExternalId(backup.getExternalId());
+ response.setType(backup.getType());
+ response.setDate(backup.getDate());
+ response.setSize(backup.getSize());
+ response.setProtectedSize(backup.getProtectedSize());
+ response.setStatus(backup.getStatus());
+ response.setVolumes(new Gson().toJson(backup.getBackupVolumeList().toArray(), Backup.VolumeInfo[].class));
Review Comment:
We can use `GsonHelper` instead of instantiating `Gson` every time.
##########
engine/schema/src/main/java/org/apache/cloudstack/backup/BackupVO.java:
##########
@@ -192,4 +201,16 @@ public Class<?> getEntityType() {
public String getName() {
return null;
}
+
+ @Override
+ public List<Backup.VolumeInfo> getBackupVolumeList() {
+ if (StringUtils.isEmpty(this.backupVolumes)) {
+ return Collections.emptyList();
+ }
+ return Arrays.asList(new Gson().fromJson(this.backupVolumes, Backup.VolumeInfo[].class));
Review Comment:
We can use `GsonHelper` instead of instantiating `Gson` every time.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1375728350
@SadiJr , can you look at the conflicts here as well, please?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1207880173
Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 3937
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1207894798
@blueorangutan test matrix
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] SadiJr commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by "SadiJr (via GitHub)" <gi...@apache.org>.
SadiJr commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1429416116
@DaanHoogland sorry for the delay in the answer. I ended up being away for a long time, but I intend to come back now. Also, I'm going to put this PR as a Draft to do more tests, since it had a lot of changes that were already accepted, like the Networker backup plugin.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [Veeam] disable jobs but keep backups [cloudstack]
Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1787274303
@SadiJr are you still looking at this?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [Veeam] disable jobs but keep backups [cloudstack]
Posted by "BryanMLima (via GitHub)" <gi...@apache.org>.
BryanMLima commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1973147074
As @SadiJr is focusing in other tasks, I will be working on this PR.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [Veeam] disable jobs but keep backups [cloudstack]
Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-2060561470
the veeam component doesn't build: https://github.com/apache/cloudstack/actions/runs/8438408288/job/23110505848?pr=6589#step:7:20779
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [Veeam] disable jobs but keep backups [cloudstack]
Posted by "BryanMLima (via GitHub)" <gi...@apache.org>.
BryanMLima commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-2067110351
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1199800688
UI build: :heavy_check_mark:
Live QA URL: http://qa.cloudstack.cloud:8080/client/pr/6589 (SL-JID-2033)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1205278322
Packaging result: :heavy_multiplication_x: el7 :heavy_check_mark: el8 :heavy_multiplication_x: debian :heavy_multiplication_x: suse15. SL-JID 3908
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1201189765
@DaanHoogland a Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] acs-robot commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
acs-robot commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1199796082
Found UI changes, kicking a new UI QA build
@blueorangutan ui
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] harikrishna-patnala commented on a diff in pull request #6589: [Veeam] disable jobs but keep backups
Posted by "harikrishna-patnala (via GitHub)" <gi...@apache.org>.
harikrishna-patnala commented on code in PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#discussion_r1250404467
##########
engine/schema/src/main/resources/META-INF/db/schema-41720to41800.sql:
##########
Review Comment:
These changes need to be moved to schema-41810to41900.sql.
##########
api/src/main/java/org/apache/cloudstack/api/command/user/volume/DetachVolumeCmd.java:
##########
Review Comment:
any reason for these setters in Cmd file ? if not can you please remove them.
##########
engine/schema/src/main/java/com/cloud/vm/dao/NicDaoImpl.java:
##########
@@ -214,7 +214,7 @@ public NicVO findByNetworkIdAndMacAddress(long networkId, String mac) {
SearchCriteria<NicVO> sc = AllFieldsSearch.create();
sc.setParameters("network", networkId);
sc.setParameters("macAddress", mac);
- return findOneBy(sc);
+ return findOneIncludingRemovedBy(sc);
Review Comment:
Is this an intended change for this PR? can you please help me understand why we are including removed entries.
Also there are other many usages of this method, so I see a chance of regression here.
##########
plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/guru/VMwareGuru.java:
##########
@@ -538,13 +543,33 @@ private Long getPoolIdFromDatastoreUuid(String datastoreUuid) {
/**
* Get pool ID for disk
*/
- private Long getPoolId(VirtualDisk disk) {
+ private Long getPoolId(VirtualDisk disk, long datacenterId, long clusterId) {
VirtualDeviceBackingInfo backing = disk.getBacking();
checkBackingInfo(backing);
VirtualDiskFlatVer2BackingInfo info = (VirtualDiskFlatVer2BackingInfo)backing;
String[] fileNameParts = info.getFileName().split(" ");
- String datastoreUuid = StringUtils.substringBetween(fileNameParts[0], "[", "]");
- return getPoolIdFromDatastoreUuid(datastoreUuid);
+ String datastore = StringUtils.substringBetween(fileNameParts[0], "[", "]");
+ if (UuidUtils.isUuid(datastore)) {
+ return getPoolIdFromDatastoreUuid(datastore);
+ }
+ return getPoolIdFromDatastoreNameOrPath(datastore, datacenterId, clusterId);
+ }
+
+ protected Long getPoolIdFromDatastoreNameOrPath(String datastore, long datacenterId, long clusterId) {
Review Comment:
just to confirm, are we fixing any known issue here with respect to pool ID ? I don't see this related to the backups
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] sonarcloud[bot] commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by "sonarcloud[bot] (via GitHub)" <gi...@apache.org>.
sonarcloud[bot] commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1515208898
SonarCloud Quality Gate failed. [](https://sonarcloud.io/dashboard?id=apache_cloudstack&pullRequest=6589)
[](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6589&resolved=false&types=BUG) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6589&resolved=false&types=BUG) [0 Bugs](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6589&resolved=false&types=BUG)
[](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6589&resolved=false&types=VULNERABILITY) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6589&resolved=false&types=VULNERABILITY) [0 Vulnerabilities](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6589&resolved=false&types=VULNERABILITY)
[](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=6589&resolved=false&types=SECURITY_HOTSPOT) [](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=6589&resolved=false&types=SECURITY_HOTSPOT) [0 Security Hotspots](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=6589&resolved=false&types=SECURITY_HOTSPOT)
[](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6589&resolved=false&types=CODE_SMELL) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6589&resolved=false&types=CODE_SMELL) [25 Code Smells](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6589&resolved=false&types=CODE_SMELL)
[](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6589&metric=new_coverage&view=list) [6.6% Coverage](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6589&metric=new_coverage&view=list)
[](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6589&metric=new_duplicated_lines_density&view=list) [0.3% Duplication](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6589&metric=new_duplicated_lines_density&view=list)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] sonarcloud[bot] commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by "sonarcloud[bot] (via GitHub)" <gi...@apache.org>.
sonarcloud[bot] commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1438934277
SonarCloud Quality Gate failed. [](https://sonarcloud.io/dashboard?id=apache_cloudstack&pullRequest=6589)
[](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6589&resolved=false&types=BUG) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6589&resolved=false&types=BUG) [0 Bugs](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6589&resolved=false&types=BUG)
[](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6589&resolved=false&types=VULNERABILITY) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6589&resolved=false&types=VULNERABILITY) [0 Vulnerabilities](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6589&resolved=false&types=VULNERABILITY)
[](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=6589&resolved=false&types=SECURITY_HOTSPOT) [](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=6589&resolved=false&types=SECURITY_HOTSPOT) [0 Security Hotspots](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=6589&resolved=false&types=SECURITY_HOTSPOT)
[](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6589&resolved=false&types=CODE_SMELL) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6589&resolved=false&types=CODE_SMELL) [20 Code Smells](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6589&resolved=false&types=CODE_SMELL)
[](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6589&metric=new_coverage&view=list) [6.1% Coverage](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6589&metric=new_coverage&view=list)
[](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6589&metric=new_duplicated_lines_density&view=list) [0.3% Duplication](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6589&metric=new_duplicated_lines_density&view=list)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1339083339
@SadiJr will you address the comments as well?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [Veeam] disable jobs but keep backups [cloudstack]
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-2007021474
This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [Veeam] disable jobs but keep backups [cloudstack]
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1774558993
This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [Veeam] disable jobs but keep backups [cloudstack]
Posted by "SadiJr (via GitHub)" <gi...@apache.org>.
SadiJr commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1821435542
@DaanHoogland Sorry for the delay, it's being a little trickier than I anticipated. I will review the comments and work on this PR.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [Veeam] disable jobs but keep backups [cloudstack]
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1833559169
This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [Veeam] disable jobs but keep backups [cloudstack]
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-2067111572
@BryanMLima a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] JoaoJandre commented on a diff in pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
JoaoJandre commented on code in PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#discussion_r934790922
##########
utils/src/main/java/com/cloud/utils/UuidUtils.java:
##########
@@ -28,6 +28,10 @@ public final static String first(String uuid) {
return uuid.substring(0, uuid.indexOf('-'));
}
+ public static boolean isUuid(String data) {
Review Comment:
Why create this method instead of using validateUUID?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1203868814
@acs-robot a Jenkins job has been kicked to build UI QA env. I'll keep you posted as I make progress.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on a diff in pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on code in PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#discussion_r937518011
##########
utils/src/main/java/com/cloud/utils/UuidUtils.java:
##########
@@ -28,6 +28,10 @@ public final static String first(String uuid) {
return uuid.substring(0, uuid.indexOf('-'));
}
+ public static boolean isUuid(String data) {
Review Comment:
ok, so then it makes sense not to xall the method validate...
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] DaanHoogland closed pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
DaanHoogland closed pull request #6589: [Veeam] disable jobs but keep backups
URL: https://github.com/apache/cloudstack/pull/6589
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1208616675
<b>Trillian test result (tid-4643)</b>
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 40253 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr6589-t4643-kvm-centos7.zip
Smoke tests completed. 100 look OK, 1 have errors
Only failed tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---
test_08_upgrade_kubernetes_ha_cluster | `Failure` | 631.70 | test_kubernetes_clusters.py
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] github-actions[bot] commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1370634268
This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] sonarcloud[bot] commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by "sonarcloud[bot] (via GitHub)" <gi...@apache.org>.
sonarcloud[bot] commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1486971457
SonarCloud Quality Gate failed. [](https://sonarcloud.io/dashboard?id=apache_cloudstack&pullRequest=6589)
[](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6589&resolved=false&types=BUG) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6589&resolved=false&types=BUG) [0 Bugs](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6589&resolved=false&types=BUG)
[](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6589&resolved=false&types=VULNERABILITY) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6589&resolved=false&types=VULNERABILITY) [0 Vulnerabilities](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6589&resolved=false&types=VULNERABILITY)
[](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=6589&resolved=false&types=SECURITY_HOTSPOT) [](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=6589&resolved=false&types=SECURITY_HOTSPOT) [0 Security Hotspots](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=6589&resolved=false&types=SECURITY_HOTSPOT)
[](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6589&resolved=false&types=CODE_SMELL) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6589&resolved=false&types=CODE_SMELL) [20 Code Smells](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6589&resolved=false&types=CODE_SMELL)
[](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6589&metric=new_coverage&view=list) [6.1% Coverage](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6589&metric=new_coverage&view=list)
[](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6589&metric=new_duplicated_lines_density&view=list) [0.3% Duplication](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6589&metric=new_duplicated_lines_density&view=list)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] github-actions[bot] commented on pull request #6589: [Veeam] disable jobs but keep backups
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1683852852
This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [Veeam] disable jobs but keep backups [cloudstack]
Posted by "shwstppr (via GitHub)" <gi...@apache.org>.
shwstppr commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1744581230
@SadiJr can you please address outstanding comments and merge conflicts? Should this be considered for 4.19.0.0?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [Veeam] disable jobs but keep backups [cloudstack]
Posted by "shwstppr (via GitHub)" <gi...@apache.org>.
shwstppr commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1748359955
@SadiJr can you pleas have a look at the outstanding review comments?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] DaanHoogland closed pull request #6589: [Veeam] disable jobs but keep backups
Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland closed pull request #6589: [Veeam] disable jobs but keep backups
URL: https://github.com/apache/cloudstack/pull/6589
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [Veeam] disable jobs but keep backups [cloudstack]
Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1782501471
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [Veeam] disable jobs but keep backups [cloudstack]
Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1812665598
@SadiJr I moved this out of this milestone as it needs work. If you find time to get it into 4.19, feel free to move it back in.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [Veeam] disable jobs but keep backups [cloudstack]
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1847299913
Packaging result [SF]: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 7992
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [Veeam] disable jobs but keep backups [cloudstack]
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-1927835861
This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [Veeam] disable jobs but keep backups [cloudstack]
Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-2017647666
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [Veeam] disable jobs but keep backups [cloudstack]
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#issuecomment-2017648668
@DaanHoogland a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [Veeam] disable jobs but keep backups [cloudstack]
Posted by "JoaoJandre (via GitHub)" <gi...@apache.org>.
JoaoJandre commented on code in PR #6589:
URL: https://github.com/apache/cloudstack/pull/6589#discussion_r1567488377
##########
engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupDaoImpl.java:
##########
@@ -141,32 +141,37 @@ public List<Backup> syncBackups(Long zoneId, Long vmId, List<Backup> externalBac
@Override
public BackupResponse newBackupResponse(Backup backup) {
- VMInstanceVO vm = vmInstanceDao.findByIdIncludingRemoved(backup.getVmId());
- AccountVO account = accountDao.findByIdIncludingRemoved(vm.getAccountId());
- DomainVO domain = domainDao.findByIdIncludingRemoved(vm.getDomainId());
- DataCenterVO zone = dataCenterDao.findByIdIncludingRemoved(vm.getDataCenterId());
- BackupOffering offering = backupOfferingDao.findByIdIncludingRemoved(vm.getBackupOfferingId());
-
- BackupResponse response = new BackupResponse();
- response.setId(backup.getUuid());
- response.setVmId(vm.getUuid());
- response.setVmName(vm.getHostName());
- response.setExternalId(backup.getExternalId());
- response.setType(backup.getType());
- response.setDate(backup.getDate());
- response.setSize(backup.getSize());
- response.setProtectedSize(backup.getProtectedSize());
- response.setStatus(backup.getStatus());
- response.setVolumes(new Gson().toJson(vm.getBackupVolumeList().toArray(), Backup.VolumeInfo[].class));
- response.setBackupOfferingId(offering.getUuid());
- response.setBackupOffering(offering.getName());
- response.setAccountId(account.getUuid());
- response.setAccount(account.getAccountName());
- response.setDomainId(domain.getUuid());
- response.setDomain(domain.getName());
- response.setZoneId(zone.getUuid());
- response.setZone(zone.getName());
- response.setObjectName("backup");
- return response;
+ try {
+ VMInstanceVO vm = vmInstanceDao.findByIdIncludingRemoved(backup.getVmId());
+ AccountVO account = accountDao.findByIdIncludingRemoved(vm.getAccountId());
+ DomainVO domain = domainDao.findByIdIncludingRemoved(vm.getDomainId());
+ DataCenterVO zone = dataCenterDao.findByIdIncludingRemoved(vm.getDataCenterId());
+ BackupOffering offering = backupOfferingDao.findByIdIncludingRemoved(backup.getBackupOfferingId());
+
+ BackupResponse response = new BackupResponse();
+ response.setId(backup.getUuid());
+ response.setVmId(vm.getUuid());
+ response.setVmName(vm.getHostName());
+ response.setExternalId(backup.getExternalId());
+ response.setType(backup.getType());
+ response.setDate(backup.getDate());
+ response.setSize(backup.getSize());
+ response.setProtectedSize(backup.getProtectedSize());
+ response.setStatus(backup.getStatus());
+ response.setVolumes(GSON.toJson(backup.getBackupVolumeList().toArray(), Backup.VolumeInfo[].class));
+ response.setBackupOfferingId(offering.getUuid());
+ response.setBackupOffering(offering.getName());
+ response.setAccountId(account.getUuid());
+ response.setAccount(account.getAccountName());
+ response.setDomainId(domain.getUuid());
+ response.setDomain(domain.getName());
+ response.setZoneId(zone.getUuid());
+ response.setZone(zone.getName());
+ response.setObjectName("backup");
+ return response;
+ } catch (Exception e) {
Review Comment:
Do we need a Pokemon catch here? we should just list the expected exceptions instead.
##########
plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/VeeamBackupProvider.java:
##########
@@ -397,6 +404,30 @@ public void doInTransactionWithoutResult(TransactionStatus status) {
});
}
+ protected String createVolumeInfoFromVolumes(List<String> paths) {
Review Comment:
```suggestion
protected String createVolumeInfoFromVolumePaths(List<String> paths) {
```
##########
plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/VeeamBackupProvider.java:
##########
@@ -397,6 +404,30 @@ public void doInTransactionWithoutResult(TransactionStatus status) {
});
}
+ protected String createVolumeInfoFromVolumes(List<String> paths) {
+ List<VolumeVO> vmVolumes = new ArrayList<>();
+ try {
+ for (String diskName : paths) {
+ VolumeVO volumeVO = volumeDao.findByPath(diskName);
+ if (volumeVO != null) {
+ vmVolumes.add(volumeVO);
+ }
+ }
+ List<Backup.VolumeInfo> list = new ArrayList<>();
+ for (VolumeVO vol : vmVolumes) {
+ list.add(new Backup.VolumeInfo(vol.getUuid(), vol.getPath(), vol.getVolumeType(), vol.getSize(), vol.getDeviceId()));
+ }
+ return new Gson().toJson(list.toArray(), Backup.VolumeInfo[].class);
+ } catch (Exception e) {
Review Comment:
Do we need a pokemon catch here?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org