Skip to content

Conversation

@nvazquez
Copy link
Contributor

@nvazquez nvazquez commented Jun 21, 2018

Description

Upgrade Apache DBCP version from 1.x to 2.x version.
Benefits: http://commons.apache.org/proper/commons-dbcp/

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)
  • Enhancement (improves an existing feature and functionality)
  • Cleanup (Code refactoring and cleanup, that may add test cases)

GitHub Issue/PRs

Screenshots (if appropriate):

How Has This Been Tested?

  • Built local environment from scratch, deployed simple environment correctly.
  • Local environment working, packages updated, continues working
  • Simulator working locally
  • Usage module working

Checklist:

  • I have read the CONTRIBUTING document.
  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
    Testing
  • I have added tests to cover my changes.
  • All relevant new and existing integration tests have passed.
  • A full integration testsuite with all test that can run on my environment has passed.

@nvazquez
Copy link
Contributor Author

@blueorangutan package

@blueorangutan
Copy link

@nvazquez a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan
Copy link

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-2143

@nvazquez
Copy link
Contributor Author

@blueorangutan test

@blueorangutan
Copy link

@nvazquez a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

Copy link
Member

@rohityadavcloud rohityadavcloud left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, subject to testing (I've not tested, but Travis is green so PR looks promising!). Can we also consider moving to HikariCP?

@nvazquez
Copy link
Contributor Author

Thanks @rhtyd, we have made an attempt to HikariCP on this PR #2603 but unfortunately faced lot of increasing issues and estimate a big effort for fixing all of them

@nvazquez
Copy link
Contributor Author

@blueorangutan test

@blueorangutan
Copy link

@nvazquez a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

@nvazquez nvazquez changed the title Update Apache DBCP version WIP: Update Apache DBCP version Jun 22, 2018
@nvazquez
Copy link
Contributor Author

@blueorangutan package

@blueorangutan
Copy link

@nvazquez a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan
Copy link

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-2149

@nvazquez
Copy link
Contributor Author

@blueorangutan package

@blueorangutan
Copy link

@nvazquez a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan
Copy link

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-2150

@nvazquez
Copy link
Contributor Author

@blueorangutan test

@blueorangutan
Copy link

@nvazquez a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

@nvazquez nvazquez changed the title WIP: Update Apache DBCP version Update Apache DBCP version Jun 23, 2018
@blueorangutan
Copy link

Trillian test result (tid-2815)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 34788 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2718-t2815-kvm-centos7.zip
Intermitten failure detected: /marvin/tests/smoke/test_certauthority_root.py
Intermitten failure detected: /marvin/tests/smoke/test_deploy_virtio_scsi_vm.py
Intermitten failure detected: /marvin/tests/smoke/test_privategw_acl.py
Intermitten failure detected: /marvin/tests/smoke/test_public_ip_range.py
Intermitten failure detected: /marvin/tests/smoke/test_templates.py
Intermitten failure detected: /marvin/tests/smoke/test_usage.py
Intermitten failure detected: /marvin/tests/smoke/test_vm_life_cycle.py
Intermitten failure detected: /marvin/tests/smoke/test_volumes.py
Intermitten failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Intermitten failure detected: /marvin/tests/smoke/test_vpc_vpn.py
Intermitten failure detected: /marvin/tests/smoke/test_hostha_kvm.py
Smoke tests completed. 60 look OK, 7 have error(s)
Only failed tests results shown below:

Test Result Time (s) Test File
ContextSuite context=TestDeployVirtioSCSIVM>:setup Error 0.00 test_deploy_virtio_scsi_vm.py
test_03_vpc_privategw_restart_vpc_cleanup Failure 1132.54 test_privategw_acl.py
test_04_extract_template Failure 128.36 test_templates.py
ContextSuite context=TestISOUsage>:setup Error 0.00 test_usage.py
test_01_secure_vm_migration Error 4.20 test_vm_life_cycle.py
test_02_unsecure_vm_migration Error 1.11 test_vm_life_cycle.py
test_03_secured_to_nonsecured_vm_migration Error 1.12 test_vm_life_cycle.py
test_04_nonsecured_to_secured_vm_migration Error 1.12 test_vm_life_cycle.py
test_06_download_detached_volume Failure 137.65 test_volumes.py
test_11_migrate_volume_and_change_offering Error 127.96 test_volumes.py
test_hostha_enable_ha_when_host_in_maintenance Error 3.75 test_hostha_kvm.py

@nvazquez
Copy link
Contributor Author

@blueorangutan test matrix

@blueorangutan
Copy link

@nvazquez a Trillian-Jenkins matrix job (centos6 mgmt + xs71, centos7 mgmt + vmware65, centos7 mgmt + kvmcentos7) has been kicked to run smoke tests

@nvazquez
Copy link
Contributor Author

@blueorangutan test matrix

@blueorangutan
Copy link

@nvazquez a Trillian-Jenkins matrix job (centos6 mgmt + xs71, centos7 mgmt + vmware65, centos7 mgmt + kvmcentos7) has been kicked to run smoke tests

@blueorangutan
Copy link

Trillian test result (tid-2822)
Environment: xenserver-71 (x2), Advanced Networking with Mgmt server 7
Total time taken: 23516 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2718-t2822-xenserver-71.zip
Intermitten failure detected: /marvin/tests/smoke/test_certauthority_root.py
Intermitten failure detected: /marvin/tests/smoke/test_scale_vm.py
Intermitten failure detected: /marvin/tests/smoke/test_templates.py
Intermitten failure detected: /marvin/tests/smoke/test_volumes.py
Smoke tests completed. 64 look OK, 3 have error(s)
Only failed tests results shown below:

Test Result Time (s) Test File
test_provision_certificate Error 7.25 test_certauthority_root.py
test_01_scale_vm Error 19.55 test_scale_vm.py
test_11_migrate_volume_and_change_offering Error 5.39 test_volumes.py

@blueorangutan
Copy link

Trillian test result (tid-2823)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 25612 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2718-t2823-kvm-centos7.zip
Intermitten failure detected: /marvin/tests/smoke/test_certauthority_root.py
Intermitten failure detected: /marvin/tests/smoke/test_deploy_virtio_scsi_vm.py
Intermitten failure detected: /marvin/tests/smoke/test_privategw_acl.py
Intermitten failure detected: /marvin/tests/smoke/test_ssvm.py
Intermitten failure detected: /marvin/tests/smoke/test_vm_life_cycle.py
Intermitten failure detected: /marvin/tests/smoke/test_volumes.py
Smoke tests completed. 63 look OK, 4 have error(s)
Only failed tests results shown below:

Test Result Time (s) Test File
ContextSuite context=TestDeployVirtioSCSIVM>:setup Error 0.00 test_deploy_virtio_scsi_vm.py
test_03_vpc_privategw_restart_vpc_cleanup Failure 1110.45 test_privategw_acl.py
test_01_secure_vm_migration Error 3.18 test_vm_life_cycle.py
test_02_unsecure_vm_migration Error 1.10 test_vm_life_cycle.py
test_03_secured_to_nonsecured_vm_migration Error 3.15 test_vm_life_cycle.py
test_04_nonsecured_to_secured_vm_migration Error 1.10 test_vm_life_cycle.py
test_11_migrate_volume_and_change_offering Error 129.20 test_volumes.py

@blueorangutan
Copy link

Trillian test result (tid-2824)
Environment: vmware-65 (x2), Advanced Networking with Mgmt server 7
Total time taken: 46427 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2718-t2824-vmware-65.zip
Intermitten failure detected: /marvin/tests/smoke/test_certauthority_root.py
Intermitten failure detected: /marvin/tests/smoke/test_ssvm.py
Intermitten failure detected: /marvin/tests/smoke/test_volumes.py
Smoke tests completed. 63 look OK, 4 have error(s)
Only failed tests results shown below:

Test Result Time (s) Test File

Copy link
Contributor

@borisstoyanov borisstoyanov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, based on test results and code review

@nvazquez
Copy link
Contributor Author

nvazquez commented Jul 9, 2018

Thanks @borisstoyanov! @rhtyd @DaanHoogland do you approve as well?

@rohityadavcloud
Copy link
Member

LGTM, merging this based on tests and and reviews.

@rohityadavcloud rohityadavcloud merged commit 9fb36e7 into apache:master Jul 10, 2018
borisstoyanov pushed a commit to shapeblue/cloudstack that referenced this pull request Jul 23, 2018
* Update Apache DBCP version

* Fix DB connection

* Prevent hang on the db creation
@nvazquez nvazquez mentioned this pull request Aug 16, 2018
12 tasks
rohityadavcloud pushed a commit that referenced this pull request Aug 17, 2018
Backport #2718 to 4.11 branch for 4.11.2.0
@nvazquez nvazquez deleted the updatedbcp branch April 6, 2020 14:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants