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 2020/07/14 08:09:01 UTC
[GitHub] [cloudstack] Spaceman1984 opened a new pull request #4138: Fixed incorrect error message on invalid template type download
Spaceman1984 opened a new pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138
## Description
<!--- Describe your changes in detail -->
When a template is downloaded, the first 1MB of the template is validated to determine if the template is of correct file type. On failure, the download is aborted and the input stream is set to null. This leads to a second error when the try-with-resources block tries to auto-close the stream and throws an ioexception. The "stream closed" error message is then written to the db.
This PR checks if an error has been stored before setting a new error message.
<!-- For new features, provide link to FS, dev ML discussion etc. -->
<!-- In case of bug fix, the expected and actual behaviours, steps to reproduce. -->
<!-- When "Fixes: #<id>" is specified, the issue/PR will automatically be closed when this PR gets merged -->
<!-- For addressing multiple issues/PRs, use multiple "Fixes: #<id>" -->
<!-- Fixes: # -->
Fixes: #4127
## Types of changes
<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
- [ ] Breaking change (fix or feature that would cause existing functionality to change)
- [ ] New feature (non-breaking change which adds functionality)
- [x] Bug fix (non-breaking change which fixes an issue)
- [ ] Enhancement (improves an existing feature and functionality)
- [ ] Cleanup (Code refactoring and cleanup, that may add test cases)
## Screenshots (if appropriate):
## How Has This Been Tested?
<!-- Please describe in detail how you tested your changes. -->
<!-- Include details of your testing environment, and the tests you ran to -->
<!-- see how your change affects other areas of the code, etc. -->
This has been tested by downloading an invalid template and checking the error message from the UI or in cloud.template_store_ref.error_str in the db.
The cleanup has been tested by restarting the management server to trigger template sync to verify if the dead template has been removed.
<!-- Please read the [CONTRIBUTING](https://github.com/apache/cloudstack/blob/master/CONTRIBUTING.md) document -->
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-642028871
Packaging result: ✔centos7 ✔debian. JID-1333
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-657399519
@Spaceman1984 a Jenkins job has been kicked to build packages. 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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] Spaceman1984 commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
Spaceman1984 commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-642015660
@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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] Spaceman1984 commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
Spaceman1984 commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-653587251
@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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] rhtyd merged pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
rhtyd merged pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-649198647
<b>Trillian test result (tid-1833)</b>
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 59748 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4138-t1833-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_privategw_acl.py
Intermittent failure detected: /marvin/tests/smoke/test_public_ip_range.py
Intermittent failure detected: /marvin/tests/smoke/test_reset_vm_on_reboot.py
Intermittent failure detected: /marvin/tests/smoke/test_resource_accounting.py
Intermittent failure detected: /marvin/tests/smoke/test_router_dhcphosts.py
Intermittent failure detected: /marvin/tests/smoke/test_router_dns.py
Intermittent failure detected: /marvin/tests/smoke/test_router_dnsservice.py
Intermittent failure detected: /marvin/tests/smoke/test_routers_iptables_default_policy.py
Intermittent failure detected: /marvin/tests/smoke/test_routers_network_ops.py
Intermittent failure detected: /marvin/tests/smoke/test_routers.py
Intermittent failure detected: /marvin/tests/smoke/test_secondary_storage.py
Intermittent failure detected: /marvin/tests/smoke/test_service_offerings.py
Intermittent failure detected: /marvin/tests/smoke/test_snapshots.py
Intermittent failure detected: /marvin/tests/smoke/test_ssvm.py
Intermittent failure detected: /marvin/tests/smoke/test_templates.py
Intermittent failure detected: /marvin/tests/smoke/test_usage.py
Intermittent failure detected: /marvin/tests/smoke/test_vm_life_cycle.py
Intermittent failure detected: /marvin/tests/smoke/test_vm_snapshots.py
Intermittent failure detected: /marvin/tests/smoke/test_volumes.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_router_nics.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_vpn.py
Intermittent failure detected: /marvin/tests/smoke/test_hostha_kvm.py
Smoke tests completed. 55 look OK, 22 have error(s)
Only failed tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---
test_02_vpc_privategw_static_routes | `Failure` | 179.50 | test_privategw_acl.py
test_03_vpc_privategw_restart_vpc_cleanup | `Failure` | 174.21 | test_privategw_acl.py
test_04_rvpc_privategw_static_routes | `Failure` | 238.73 | test_privategw_acl.py
ContextSuite context=TestResetVmOnReboot>:setup | `Error` | 0.00 | test_reset_vm_on_reboot.py
ContextSuite context=TestRAMCPUResourceAccounting>:setup | `Error` | 0.00 | test_resource_accounting.py
ContextSuite context=TestRouterDHCPHosts>:setup | `Error` | 0.00 | test_router_dhcphosts.py
ContextSuite context=TestRouterDHCPOpts>:setup | `Error` | 0.00 | test_router_dhcphosts.py
ContextSuite context=TestRouterDns>:setup | `Error` | 0.00 | test_router_dns.py
test_01_sys_vm_start | `Failure` | 0.54 | test_secondary_storage.py
ContextSuite context=TestRouterDnsService>:setup | `Error` | 0.00 | test_router_dnsservice.py
ContextSuite context=TestRouterIpTablesPolicies>:setup | `Error` | 0.00 | test_routers_iptables_default_policy.py
ContextSuite context=TestVPCIpTablesPolicies>:setup | `Error` | 0.00 | test_routers_iptables_default_policy.py
ContextSuite context=TestIsolatedNetworks>:setup | `Error` | 0.00 | test_routers_network_ops.py
ContextSuite context=TestRedundantIsolateNetworks>:setup | `Error` | 0.00 | test_routers_network_ops.py
ContextSuite context=TestRouterServices>:setup | `Error` | 0.00 | test_routers.py
ContextSuite context=TestCpuCapServiceOfferings>:setup | `Error` | 0.00 | test_service_offerings.py
ContextSuite context=TestServiceOfferings>:setup | `Error` | 0.29 | test_service_offerings.py
ContextSuite context=TestSnapshotRootDisk>:setup | `Error` | 0.00 | test_snapshots.py
test_01_list_sec_storage_vm | `Failure` | 0.03 | test_ssvm.py
test_02_list_cpvm_vm | `Failure` | 0.03 | test_ssvm.py
test_03_ssvm_internals | `Failure` | 0.03 | test_ssvm.py
test_04_cpvm_internals | `Failure` | 0.02 | test_ssvm.py
test_05_stop_ssvm | `Failure` | 0.03 | test_ssvm.py
test_06_stop_cpvm | `Failure` | 0.03 | test_ssvm.py
test_07_reboot_ssvm | `Failure` | 0.03 | test_ssvm.py
test_08_reboot_cpvm | `Failure` | 0.02 | test_ssvm.py
test_09_destroy_ssvm | `Failure` | 0.03 | test_ssvm.py
test_10_destroy_cpvm | `Failure` | 0.02 | test_ssvm.py
test_02_create_template_with_checksum_sha1 | `Error` | 65.38 | test_templates.py
test_03_create_template_with_checksum_sha256 | `Error` | 65.38 | test_templates.py
test_04_create_template_with_checksum_md5 | `Error` | 65.37 | test_templates.py
test_05_create_template_with_no_checksum | `Error` | 65.36 | test_templates.py
test_02_deploy_vm_from_direct_download_template | `Error` | 1.19 | test_templates.py
test_03_deploy_vm_wrong_checksum | `Error` | 1.23 | test_templates.py
ContextSuite context=TestTemplates>:setup | `Error` | 16.56 | test_templates.py
ContextSuite context=TestISOUsage>:setup | `Error` | 0.00 | test_usage.py
ContextSuite context=TestLBRuleUsage>:setup | `Error` | 0.00 | test_usage.py
ContextSuite context=TestNatRuleUsage>:setup | `Error` | 0.00 | test_usage.py
ContextSuite context=TestPublicIPUsage>:setup | `Error` | 0.00 | test_usage.py
ContextSuite context=TestSnapshotUsage>:setup | `Error` | 0.00 | test_usage.py
ContextSuite context=TestVmUsage>:setup | `Error` | 0.00 | test_usage.py
ContextSuite context=TestVolumeUsage>:setup | `Error` | 0.00 | test_usage.py
ContextSuite context=TestVpnUsage>:setup | `Error` | 0.00 | test_usage.py
ContextSuite context=Test01DeployVM>:setup | `Error` | 0.00 | test_vm_life_cycle.py
ContextSuite context=Test02VMLifeCycle>:setup | `Error` | 0.00 | test_vm_life_cycle.py
test_14_secure_to_secure_vm_migration | `Error` | 11.26 | test_vm_life_cycle.py
test_15_secured_to_nonsecured_vm_migration | `Error` | 73.97 | test_vm_life_cycle.py
test_16_nonsecured_to_secured_vm_migration | `Error` | 1.20 | test_vm_life_cycle.py
ContextSuite context=TestVmSnapshot>:setup | `Error` | 2.02 | test_vm_snapshots.py
ContextSuite context=TestCreateVolume>:setup | `Error` | 0.00 | test_volumes.py
ContextSuite context=TestVolumes>:setup | `Error` | 0.00 | test_volumes.py
ContextSuite context=TestVPCRedundancy>:setup | `Error` | 0.00 | test_vpc_redundant.py
ContextSuite context=TestVPCNics>:setup | `Error` | 0.00 | test_vpc_router_nics.py
ContextSuite context=TestRVPCSite2SiteVpn>:setup | `Error` | 0.00 | test_vpc_vpn.py
ContextSuite context=TestVPCSite2SiteVPNMultipleOptions>:setup | `Error` | 0.00 | test_vpc_vpn.py
ContextSuite context=TestVpcRemoteAccessVpn>:setup | `Error` | 0.00 | test_vpc_vpn.py
ContextSuite context=TestVpcSite2SiteVpn>:setup | `Error` | 0.00 | test_vpc_vpn.py
test_disable_oobm_ha_state_ineligible | `Error` | 1512.07 | test_hostha_kvm.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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on a change in pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
rhtyd commented on a change in pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#discussion_r444618668
##########
File path: engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
##########
@@ -489,6 +489,10 @@ public void handleTemplateSync(DataStore store) {
s_logger.info("Removing leftover template " + uniqueName + " entry from template store table");
// remove those leftover entries
_vmTemplateStoreDao.remove(tmpltStore.getId());
+ // remove from zones
+ _vmTemplateZoneDao.deletePrimaryRecordsForTemplate(tmplt.getId());
+ // remove template
+ _templateDao.remove(tmplt.getId());
Review comment:
@Spaceman1984 this probably needs checking, what if the templates are OK for other secondary storages within the same zone; and across zones?
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] nvazquez commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-656731435
@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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] Spaceman1984 commented on a change in pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
Spaceman1984 commented on a change in pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#discussion_r451315166
##########
File path: core/src/main/java/com/cloud/storage/template/HttpTemplateDownloader.java
##########
@@ -243,7 +247,6 @@ private boolean copyBytes(File file, InputStream in, RandomAccessFile out) throw
offset = writeBlock(bytes, out, block, offset);
if (!verifyFormat.isVerifiedFormat() && (offset >= 1048576 || offset >= remoteSize)) { //let's check format after we get 1MB or full file
verifyFormat.invoke();
- if (verifyFormat.isInvalid()) return true;
Review comment:
@rhtyd If validation fails, an exception is thrown, so there is no setting of an invalid state that has to be checked. Validation happens inside verifyFormat.invoke();
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-648735089
@Spaceman1984 a Jenkins job has been kicked to build packages. 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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] Spaceman1984 commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
Spaceman1984 commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-653601359
@blueorangutan test
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] Spaceman1984 commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
Spaceman1984 commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-657411602
@blueorangutan test
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] Spaceman1984 commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
Spaceman1984 commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-650027189
@blueorangutan test
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-656731887
@nvazquez a Jenkins job has been kicked to build packages. 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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on a change in pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
rhtyd commented on a change in pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#discussion_r451300255
##########
File path: core/src/main/java/com/cloud/storage/template/HttpTemplateDownloader.java
##########
@@ -243,7 +247,6 @@ private boolean copyBytes(File file, InputStream in, RandomAccessFile out) throw
offset = writeBlock(bytes, out, block, offset);
if (!verifyFormat.isVerifiedFormat() && (offset >= 1048576 || offset >= remoteSize)) { //let's check format after we get 1MB or full file
verifyFormat.invoke();
- if (verifyFormat.isInvalid()) return true;
Review comment:
@Spaceman1984 cc @nvazquez why are we not validating format now?
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-653705717
<b>Trillian test result (tid-1963)</b>
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 32939 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4138-t1963-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_privategw_acl.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_vpn.py
Smoke tests completed. 75 look OK, 2 have error(s)
Only failed tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---
test_02_vpc_privategw_static_routes | `Failure` | 207.40 | test_privategw_acl.py
test_03_vpc_privategw_restart_vpc_cleanup | `Failure` | 220.80 | test_privategw_acl.py
test_04_rvpc_privategw_static_routes | `Failure` | 307.58 | test_privategw_acl.py
test_01_redundant_vpc_site2site_vpn | `Failure` | 387.53 | test_vpc_vpn.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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-650027366
@Spaceman1984 a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) 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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] Spaceman1984 commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
Spaceman1984 commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-648743961
@blueorangutan test
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-641888270
Packaging result: ✔centos7 ✔debian. JID-1330
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] Spaceman1984 commented on a change in pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
Spaceman1984 commented on a change in pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#discussion_r447742017
##########
File path: core/src/main/java/com/cloud/storage/template/HttpTemplateDownloader.java
##########
@@ -218,7 +219,10 @@ public long download(boolean resume, DownloadCompleteCallback callback) {
errorString = hte.getMessage();
Review comment:
> Why not set it if errorString is null as below?
It may be an easy code change, but then the scope of this issue will be greater, which will require more testing 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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] Spaceman1984 commented on a change in pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
Spaceman1984 commented on a change in pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#discussion_r442870662
##########
File path: core/src/main/java/com/cloud/storage/template/HttpTemplateDownloader.java
##########
@@ -219,7 +219,7 @@ public long download(boolean resume, DownloadCompleteCallback callback) {
} catch (IOException ioe) {
status = TemplateDownloader.Status.UNRECOVERABLE_ERROR; //probably a file write error?
// Let's not overwrite the original error message.
- if (errorString.isEmpty()){
+ if (errorString.equals(" ")){
Review comment:
@DaanHoogland What if we get rid of the check altogether and append the error message to what was there already?
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] Spaceman1984 closed pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
Spaceman1984 closed pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-657412220
@Spaceman1984 a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) 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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-641876771
@Spaceman1984 a Jenkins job has been kicked to build packages. 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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] Spaceman1984 commented on a change in pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
Spaceman1984 commented on a change in pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#discussion_r438056979
##########
File path: core/src/main/java/com/cloud/storage/template/HttpTemplateDownloader.java
##########
@@ -218,7 +218,10 @@ public long download(boolean resume, DownloadCompleteCallback callback) {
errorString = hte.getMessage();
} catch (IOException ioe) {
status = TemplateDownloader.Status.UNRECOVERABLE_ERROR; //probably a file write error?
- errorString = ioe.getMessage();
+ // Let's not overwrite the original error message.
+ if (errorString.isEmpty()){
Review comment:
You are correct @DaanHoogland, I have made the change.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] Spaceman1984 commented on a change in pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
Spaceman1984 commented on a change in pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#discussion_r451315166
##########
File path: core/src/main/java/com/cloud/storage/template/HttpTemplateDownloader.java
##########
@@ -243,7 +247,6 @@ private boolean copyBytes(File file, InputStream in, RandomAccessFile out) throw
offset = writeBlock(bytes, out, block, offset);
if (!verifyFormat.isVerifiedFormat() && (offset >= 1048576 || offset >= remoteSize)) { //let's check format after we get 1MB or full file
verifyFormat.invoke();
- if (verifyFormat.isInvalid()) return true;
Review comment:
@rhtyd If validation fails, an exception is thrown, so there is no setting of an invalid state that has to be checked.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] Spaceman1984 commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
Spaceman1984 commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-657398641
@nvazquez I had a look at the errors, doesn't seem related to template downloads. I will fire the tests again.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
rhtyd commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-653724883
@nvazquez are you LGTM on 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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-653587648
@Spaceman1984 a Jenkins job has been kicked to build packages. 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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-642030628
@Spaceman1984 a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) 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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] Spaceman1984 commented on a change in pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
Spaceman1984 commented on a change in pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#discussion_r444789643
##########
File path: engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
##########
@@ -489,6 +489,10 @@ public void handleTemplateSync(DataStore store) {
s_logger.info("Removing leftover template " + uniqueName + " entry from template store table");
// remove those leftover entries
_vmTemplateStoreDao.remove(tmpltStore.getId());
+ // remove from zones
+ _vmTemplateZoneDao.deletePrimaryRecordsForTemplate(tmplt.getId());
+ // remove template
+ _templateDao.remove(tmplt.getId());
Review comment:
You are correct @rhtyd, this code removes the template if there is an error in any of the storages. I have reverted.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] Spaceman1984 commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
Spaceman1984 commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-657398760
@blueorangutan test
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-648743609
Packaging result: ✔centos7 ✔debian. JID-1445
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-657399169
@Spaceman1984 a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) 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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] nvazquez commented on a change in pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
nvazquez commented on a change in pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#discussion_r452910190
##########
File path: core/src/main/java/com/cloud/storage/template/HttpTemplateDownloader.java
##########
@@ -243,7 +247,6 @@ private boolean copyBytes(File file, InputStream in, RandomAccessFile out) throw
offset = writeBlock(bytes, out, block, offset);
if (!verifyFormat.isVerifiedFormat() && (offset >= 1048576 || offset >= remoteSize)) { //let's check format after we get 1MB or full file
verifyFormat.invoke();
- if (verifyFormat.isInvalid()) return true;
Review comment:
In short, prior to these changes the invoke() method only set the boolean variable retrieved in case of valid/invalid. After these changes, if it is invalid invoke() throws an exception, so no need to check isInvalid() in this line
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-656742553
Packaging result: ✔centos7 ✔debian. JID-1564
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-642015982
@Spaceman1984 a Jenkins job has been kicked to build packages. 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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] nvazquez commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-657082946
@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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-656760195
@nvazquez a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) 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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-657083185
@nvazquez a Jenkins job has been kicked to build packages. 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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-641891176
@Spaceman1984 a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) 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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] Spaceman1984 commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
Spaceman1984 commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-641875909
@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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] nvazquez commented on a change in pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
nvazquez commented on a change in pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#discussion_r447636519
##########
File path: core/src/main/java/com/cloud/storage/template/HttpTemplateDownloader.java
##########
@@ -218,7 +219,10 @@ public long download(boolean resume, DownloadCompleteCallback callback) {
errorString = hte.getMessage();
Review comment:
Why not set it if errorString is null as below?
##########
File path: core/src/main/java/com/cloud/storage/template/HttpTemplateDownloader.java
##########
@@ -218,7 +219,10 @@ public long download(boolean resume, DownloadCompleteCallback callback) {
errorString = hte.getMessage();
} catch (IOException ioe) {
status = TemplateDownloader.Status.UNRECOVERABLE_ERROR; //probably a file write error?
- errorString = ioe.getMessage();
+ // Let's not overwrite the original error message.
+ if (errorString == null){
Review comment:
Minor format one: can you leave a space between the closing parenthesis and the opening brace?
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-653601683
@Spaceman1984 a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) 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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] nvazquez commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-657221627
@Spaceman1984 can you take a look at the failing 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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] nvazquez commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-656759727
@blueorangutan test
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] Spaceman1984 removed a comment on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
Spaceman1984 removed a comment on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-657398760
@blueorangutan test
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] nvazquez commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-657091570
@blueorangutan test
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on a change in pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on a change in pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#discussion_r438706146
##########
File path: core/src/main/java/com/cloud/storage/template/HttpTemplateDownloader.java
##########
@@ -219,7 +219,7 @@ public long download(boolean resume, DownloadCompleteCallback callback) {
} catch (IOException ioe) {
status = TemplateDownloader.Status.UNRECOVERABLE_ERROR; //probably a file write error?
// Let's not overwrite the original error message.
- if (errorString.isEmpty()){
+ if (errorString.equals(" ")){
Review comment:
i'd go for `errorString.trim().isEmpty()` to be honest (to be more defensive, but this should work as well. And it might be wise to alter the initialisation statement 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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-648744544
@Spaceman1984 a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) 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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] Spaceman1984 commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
Spaceman1984 commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-648734565
@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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] Spaceman1984 commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
Spaceman1984 commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-657399207
@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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-657198899
<b>Trillian test result (tid-2063)</b>
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 59961 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4138-t2063-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_privategw_acl.py
Intermittent failure detected: /marvin/tests/smoke/test_public_ip_range.py
Intermittent failure detected: /marvin/tests/smoke/test_reset_vm_on_reboot.py
Intermittent failure detected: /marvin/tests/smoke/test_resource_accounting.py
Intermittent failure detected: /marvin/tests/smoke/test_router_dhcphosts.py
Intermittent failure detected: /marvin/tests/smoke/test_router_dns.py
Intermittent failure detected: /marvin/tests/smoke/test_router_dnsservice.py
Intermittent failure detected: /marvin/tests/smoke/test_routers_iptables_default_policy.py
Intermittent failure detected: /marvin/tests/smoke/test_routers_network_ops.py
Intermittent failure detected: /marvin/tests/smoke/test_routers.py
Intermittent failure detected: /marvin/tests/smoke/test_secondary_storage.py
Intermittent failure detected: /marvin/tests/smoke/test_service_offerings.py
Intermittent failure detected: /marvin/tests/smoke/test_snapshots.py
Intermittent failure detected: /marvin/tests/smoke/test_ssvm.py
Intermittent failure detected: /marvin/tests/smoke/test_templates.py
Intermittent failure detected: /marvin/tests/smoke/test_usage.py
Intermittent failure detected: /marvin/tests/smoke/test_vm_life_cycle.py
Intermittent failure detected: /marvin/tests/smoke/test_vm_snapshots.py
Intermittent failure detected: /marvin/tests/smoke/test_volumes.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_router_nics.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_vpn.py
Intermittent failure detected: /marvin/tests/smoke/test_hostha_kvm.py
Smoke tests completed. 55 look OK, 22 have error(s)
Only failed tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---
test_02_vpc_privategw_static_routes | `Failure` | 181.47 | test_privategw_acl.py
test_03_vpc_privategw_restart_vpc_cleanup | `Failure` | 176.01 | test_privategw_acl.py
test_04_rvpc_privategw_static_routes | `Failure` | 240.47 | test_privategw_acl.py
ContextSuite context=TestResetVmOnReboot>:setup | `Error` | 0.00 | test_reset_vm_on_reboot.py
ContextSuite context=TestRAMCPUResourceAccounting>:setup | `Error` | 0.00 | test_resource_accounting.py
ContextSuite context=TestRouterDHCPHosts>:setup | `Error` | 0.00 | test_router_dhcphosts.py
ContextSuite context=TestRouterDHCPOpts>:setup | `Error` | 0.00 | test_router_dhcphosts.py
ContextSuite context=TestRouterDns>:setup | `Error` | 0.00 | test_router_dns.py
test_01_sys_vm_start | `Failure` | 0.08 | test_secondary_storage.py
ContextSuite context=TestRouterDnsService>:setup | `Error` | 0.00 | test_router_dnsservice.py
ContextSuite context=TestRouterIpTablesPolicies>:setup | `Error` | 0.00 | test_routers_iptables_default_policy.py
ContextSuite context=TestVPCIpTablesPolicies>:setup | `Error` | 0.00 | test_routers_iptables_default_policy.py
ContextSuite context=TestIsolatedNetworks>:setup | `Error` | 0.00 | test_routers_network_ops.py
ContextSuite context=TestRedundantIsolateNetworks>:setup | `Error` | 0.00 | test_routers_network_ops.py
ContextSuite context=TestRouterServices>:setup | `Error` | 0.00 | test_routers.py
ContextSuite context=TestCpuCapServiceOfferings>:setup | `Error` | 0.00 | test_service_offerings.py
ContextSuite context=TestServiceOfferings>:setup | `Error` | 0.14 | test_service_offerings.py
ContextSuite context=TestSnapshotRootDisk>:setup | `Error` | 0.00 | test_snapshots.py
test_01_list_sec_storage_vm | `Failure` | 0.03 | test_ssvm.py
test_02_list_cpvm_vm | `Failure` | 0.02 | test_ssvm.py
test_03_ssvm_internals | `Failure` | 0.02 | test_ssvm.py
test_04_cpvm_internals | `Failure` | 0.02 | test_ssvm.py
test_05_stop_ssvm | `Failure` | 0.02 | test_ssvm.py
test_06_stop_cpvm | `Failure` | 0.02 | test_ssvm.py
test_07_reboot_ssvm | `Failure` | 0.03 | test_ssvm.py
test_08_reboot_cpvm | `Failure` | 0.02 | test_ssvm.py
test_09_destroy_ssvm | `Failure` | 0.02 | test_ssvm.py
test_10_destroy_cpvm | `Failure` | 0.02 | test_ssvm.py
test_02_create_template_with_checksum_sha1 | `Error` | 65.36 | test_templates.py
test_03_create_template_with_checksum_sha256 | `Error` | 65.38 | test_templates.py
test_04_create_template_with_checksum_md5 | `Error` | 65.35 | test_templates.py
test_05_create_template_with_no_checksum | `Error` | 65.36 | test_templates.py
test_02_deploy_vm_from_direct_download_template | `Error` | 1.19 | test_templates.py
test_03_deploy_vm_wrong_checksum | `Error` | 1.24 | test_templates.py
ContextSuite context=TestTemplates>:setup | `Error` | 16.55 | test_templates.py
ContextSuite context=TestISOUsage>:setup | `Error` | 0.00 | test_usage.py
ContextSuite context=TestLBRuleUsage>:setup | `Error` | 0.00 | test_usage.py
ContextSuite context=TestNatRuleUsage>:setup | `Error` | 0.00 | test_usage.py
ContextSuite context=TestPublicIPUsage>:setup | `Error` | 0.00 | test_usage.py
ContextSuite context=TestSnapshotUsage>:setup | `Error` | 0.00 | test_usage.py
ContextSuite context=TestVmUsage>:setup | `Error` | 0.00 | test_usage.py
ContextSuite context=TestVolumeUsage>:setup | `Error` | 0.00 | test_usage.py
ContextSuite context=TestVpnUsage>:setup | `Error` | 0.00 | test_usage.py
ContextSuite context=Test01DeployVM>:setup | `Error` | 0.00 | test_vm_life_cycle.py
ContextSuite context=Test02VMLifeCycle>:setup | `Error` | 0.00 | test_vm_life_cycle.py
test_14_secure_to_secure_vm_migration | `Error` | 11.27 | test_vm_life_cycle.py
test_15_secured_to_nonsecured_vm_migration | `Error` | 73.93 | test_vm_life_cycle.py
test_16_nonsecured_to_secured_vm_migration | `Error` | 1.18 | test_vm_life_cycle.py
ContextSuite context=TestVmSnapshot>:setup | `Error` | 1.55 | test_vm_snapshots.py
ContextSuite context=TestCreateVolume>:setup | `Error` | 0.00 | test_volumes.py
ContextSuite context=TestVolumes>:setup | `Error` | 0.00 | test_volumes.py
ContextSuite context=TestVPCRedundancy>:setup | `Error` | 0.00 | test_vpc_redundant.py
ContextSuite context=TestVPCNics>:setup | `Error` | 0.00 | test_vpc_router_nics.py
ContextSuite context=TestRVPCSite2SiteVpn>:setup | `Error` | 0.00 | test_vpc_vpn.py
ContextSuite context=TestVPCSite2SiteVPNMultipleOptions>:setup | `Error` | 0.00 | test_vpc_vpn.py
ContextSuite context=TestVpcRemoteAccessVpn>:setup | `Error` | 0.00 | test_vpc_vpn.py
ContextSuite context=TestVpcSite2SiteVpn>:setup | `Error` | 0.00 | test_vpc_vpn.py
test_disable_oobm_ha_state_ineligible | `Error` | 1512.18 | test_hostha_kvm.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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-650264465
<b>Trillian test result (tid-1857)</b>
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 29496 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4138-t1857-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_privategw_acl.py
Smoke tests completed. 76 look OK, 1 have error(s)
Only failed tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---
test_02_vpc_privategw_static_routes | `Failure` | 185.25 | test_privategw_acl.py
test_03_vpc_privategw_restart_vpc_cleanup | `Failure` | 202.21 | test_privategw_acl.py
test_04_rvpc_privategw_static_routes | `Failure` | 283.49 | test_privategw_acl.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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] Spaceman1984 commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
Spaceman1984 commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-642029807
@blueorangutan test
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] Spaceman1984 commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
Spaceman1984 commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-641890461
@blueorangutan test
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] Spaceman1984 commented on a change in pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
Spaceman1984 commented on a change in pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#discussion_r444706088
##########
File path: engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
##########
@@ -489,6 +489,10 @@ public void handleTemplateSync(DataStore store) {
s_logger.info("Removing leftover template " + uniqueName + " entry from template store table");
// remove those leftover entries
_vmTemplateStoreDao.remove(tmpltStore.getId());
+ // remove from zones
+ _vmTemplateZoneDao.deletePrimaryRecordsForTemplate(tmplt.getId());
+ // remove template
+ _templateDao.remove(tmplt.getId());
Review comment:
I'll test with multiple secondary storages
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-657410982
Packaging result: ✔centos7 ✔debian. JID-1569
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-657091699
@nvazquez a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) 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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] Spaceman1984 commented on a change in pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
Spaceman1984 commented on a change in pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#discussion_r442870662
##########
File path: core/src/main/java/com/cloud/storage/template/HttpTemplateDownloader.java
##########
@@ -219,7 +219,7 @@ public long download(boolean resume, DownloadCompleteCallback callback) {
} catch (IOException ioe) {
status = TemplateDownloader.Status.UNRECOVERABLE_ERROR; //probably a file write error?
// Let's not overwrite the original error message.
- if (errorString.isEmpty()){
+ if (errorString.equals(" ")){
Review comment:
What if we get rid of the check altogether and append the error message to what was there already?
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-657021313
<b>Trillian test result (tid-2055)</b>
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 59213 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4138-t2055-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_privategw_acl.py
Intermittent failure detected: /marvin/tests/smoke/test_public_ip_range.py
Intermittent failure detected: /marvin/tests/smoke/test_reset_vm_on_reboot.py
Intermittent failure detected: /marvin/tests/smoke/test_resource_accounting.py
Intermittent failure detected: /marvin/tests/smoke/test_router_dhcphosts.py
Intermittent failure detected: /marvin/tests/smoke/test_router_dns.py
Intermittent failure detected: /marvin/tests/smoke/test_router_dnsservice.py
Intermittent failure detected: /marvin/tests/smoke/test_routers_iptables_default_policy.py
Intermittent failure detected: /marvin/tests/smoke/test_routers_network_ops.py
Intermittent failure detected: /marvin/tests/smoke/test_routers.py
Intermittent failure detected: /marvin/tests/smoke/test_secondary_storage.py
Intermittent failure detected: /marvin/tests/smoke/test_service_offerings.py
Intermittent failure detected: /marvin/tests/smoke/test_snapshots.py
Intermittent failure detected: /marvin/tests/smoke/test_ssvm.py
Intermittent failure detected: /marvin/tests/smoke/test_templates.py
Intermittent failure detected: /marvin/tests/smoke/test_usage.py
Intermittent failure detected: /marvin/tests/smoke/test_vm_life_cycle.py
Intermittent failure detected: /marvin/tests/smoke/test_vm_snapshots.py
Intermittent failure detected: /marvin/tests/smoke/test_volumes.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_router_nics.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_vpn.py
Intermittent failure detected: /marvin/tests/smoke/test_hostha_kvm.py
Smoke tests completed. 55 look OK, 22 have error(s)
Only failed tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---
test_02_vpc_privategw_static_routes | `Failure` | 171.90 | test_privategw_acl.py
test_03_vpc_privategw_restart_vpc_cleanup | `Failure` | 170.45 | test_privategw_acl.py
test_04_rvpc_privategw_static_routes | `Failure` | 223.65 | test_privategw_acl.py
ContextSuite context=TestResetVmOnReboot>:setup | `Error` | 0.00 | test_reset_vm_on_reboot.py
ContextSuite context=TestRAMCPUResourceAccounting>:setup | `Error` | 0.00 | test_resource_accounting.py
ContextSuite context=TestRouterDHCPHosts>:setup | `Error` | 0.00 | test_router_dhcphosts.py
ContextSuite context=TestRouterDHCPOpts>:setup | `Error` | 0.00 | test_router_dhcphosts.py
ContextSuite context=TestRouterDns>:setup | `Error` | 0.00 | test_router_dns.py
test_01_sys_vm_start | `Failure` | 0.07 | test_secondary_storage.py
ContextSuite context=TestRouterDnsService>:setup | `Error` | 0.00 | test_router_dnsservice.py
ContextSuite context=TestRouterIpTablesPolicies>:setup | `Error` | 0.00 | test_routers_iptables_default_policy.py
ContextSuite context=TestVPCIpTablesPolicies>:setup | `Error` | 0.00 | test_routers_iptables_default_policy.py
ContextSuite context=TestIsolatedNetworks>:setup | `Error` | 0.00 | test_routers_network_ops.py
ContextSuite context=TestRedundantIsolateNetworks>:setup | `Error` | 0.00 | test_routers_network_ops.py
ContextSuite context=TestRouterServices>:setup | `Error` | 0.00 | test_routers.py
ContextSuite context=TestCpuCapServiceOfferings>:setup | `Error` | 0.00 | test_service_offerings.py
ContextSuite context=TestServiceOfferings>:setup | `Error` | 0.14 | test_service_offerings.py
ContextSuite context=TestSnapshotRootDisk>:setup | `Error` | 0.00 | test_snapshots.py
test_01_list_sec_storage_vm | `Failure` | 0.03 | test_ssvm.py
test_02_list_cpvm_vm | `Failure` | 0.02 | test_ssvm.py
test_03_ssvm_internals | `Failure` | 0.02 | test_ssvm.py
test_04_cpvm_internals | `Failure` | 0.03 | test_ssvm.py
test_05_stop_ssvm | `Failure` | 0.02 | test_ssvm.py
test_06_stop_cpvm | `Failure` | 0.02 | test_ssvm.py
test_07_reboot_ssvm | `Failure` | 0.02 | test_ssvm.py
test_08_reboot_cpvm | `Failure` | 0.02 | test_ssvm.py
test_09_destroy_ssvm | `Failure` | 0.02 | test_ssvm.py
test_10_destroy_cpvm | `Failure` | 0.02 | test_ssvm.py
test_02_create_template_with_checksum_sha1 | `Error` | 65.36 | test_templates.py
test_03_create_template_with_checksum_sha256 | `Error` | 65.37 | test_templates.py
test_04_create_template_with_checksum_md5 | `Error` | 65.36 | test_templates.py
test_05_create_template_with_no_checksum | `Error` | 65.36 | test_templates.py
test_02_deploy_vm_from_direct_download_template | `Error` | 1.16 | test_templates.py
test_03_deploy_vm_wrong_checksum | `Error` | 1.22 | test_templates.py
ContextSuite context=TestTemplates>:setup | `Error` | 16.49 | test_templates.py
ContextSuite context=TestISOUsage>:setup | `Error` | 0.00 | test_usage.py
ContextSuite context=TestLBRuleUsage>:setup | `Error` | 0.00 | test_usage.py
ContextSuite context=TestNatRuleUsage>:setup | `Error` | 0.00 | test_usage.py
ContextSuite context=TestPublicIPUsage>:setup | `Error` | 0.00 | test_usage.py
ContextSuite context=TestSnapshotUsage>:setup | `Error` | 0.00 | test_usage.py
ContextSuite context=TestVmUsage>:setup | `Error` | 0.00 | test_usage.py
ContextSuite context=TestVolumeUsage>:setup | `Error` | 0.00 | test_usage.py
ContextSuite context=TestVpnUsage>:setup | `Error` | 0.00 | test_usage.py
ContextSuite context=Test01DeployVM>:setup | `Error` | 0.00 | test_vm_life_cycle.py
ContextSuite context=Test02VMLifeCycle>:setup | `Error` | 0.00 | test_vm_life_cycle.py
test_14_secure_to_secure_vm_migration | `Error` | 11.26 | test_vm_life_cycle.py
test_15_secured_to_nonsecured_vm_migration | `Error` | 73.92 | test_vm_life_cycle.py
test_16_nonsecured_to_secured_vm_migration | `Error` | 1.17 | test_vm_life_cycle.py
ContextSuite context=TestVmSnapshot>:setup | `Error` | 1.56 | test_vm_snapshots.py
ContextSuite context=TestCreateVolume>:setup | `Error` | 0.00 | test_volumes.py
ContextSuite context=TestVolumes>:setup | `Error` | 0.00 | test_volumes.py
ContextSuite context=TestVPCRedundancy>:setup | `Error` | 0.00 | test_vpc_redundant.py
ContextSuite context=TestVPCNics>:setup | `Error` | 0.00 | test_vpc_router_nics.py
ContextSuite context=TestRVPCSite2SiteVpn>:setup | `Error` | 0.00 | test_vpc_vpn.py
ContextSuite context=TestVPCSite2SiteVPNMultipleOptions>:setup | `Error` | 0.00 | test_vpc_vpn.py
ContextSuite context=TestVpcRemoteAccessVpn>:setup | `Error` | 0.00 | test_vpc_vpn.py
ContextSuite context=TestVpcSite2SiteVpn>:setup | `Error` | 0.00 | test_vpc_vpn.py
test_disable_oobm_ha_state_ineligible | `Error` | 1511.72 | test_hostha_kvm.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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on a change in pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on a change in pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#discussion_r438040173
##########
File path: core/src/main/java/com/cloud/storage/template/HttpTemplateDownloader.java
##########
@@ -218,7 +218,10 @@ public long download(boolean resume, DownloadCompleteCallback callback) {
errorString = hte.getMessage();
} catch (IOException ioe) {
status = TemplateDownloader.Status.UNRECOVERABLE_ERROR; //probably a file write error?
- errorString = ioe.getMessage();
+ // Let's not overwrite the original error message.
+ if (errorString.isEmpty()){
Review comment:
errorString contains a single space initially. String.isEmpty returns (this.value.length == 0)
so this is never happening.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-657675773
<b>Trillian test result (tid-2097)</b>
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 28268 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4138-t2097-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_privategw_acl.py
Smoke tests completed. 76 look OK, 1 have error(s)
Only failed tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---
test_02_vpc_privategw_static_routes | `Failure` | 182.40 | test_privategw_acl.py
test_03_vpc_privategw_restart_vpc_cleanup | `Failure` | 181.51 | test_privategw_acl.py
test_04_rvpc_privategw_static_routes | `Failure` | 232.38 | test_privategw_acl.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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-653596078
Packaging result: ✔centos7 ✔debian. JID-1516
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4138: Fixed incorrect error message on invalid template type download
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-657086274
Packaging result: ✔centos7 ✔debian. JID-1567
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org