Skip to content

Fix issues in VM Scheduler#7782

Merged
DaanHoogland merged 2 commits intoapache:mainfrom
shapeblue:fix-vm-scheduler
Sep 18, 2023
Merged

Fix issues in VM Scheduler#7782
DaanHoogland merged 2 commits intoapache:mainfrom
shapeblue:fix-vm-scheduler

Conversation

@vishesh92
Copy link
Copy Markdown
Member

Description

When there is not enough CPU or it takes more than 1 minute of time for poll to complete, scheduled jobs are not processed or scheduled jobs are not scheduled.
This PR fixes the above issues in VM Scheduler.

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)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

  • Major
  • Minor

Bug Severity

  • BLOCKER
  • Critical
  • Major
  • Minor
  • Trivial

Screenshots (if appropriate):

How Has This Been Tested?

@vishesh92 vishesh92 requested a review from DaanHoogland July 27, 2023 09:15
@blueorangutan
Copy link
Copy Markdown

@vishesh92 a [SF] 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.

@blueorangutan
Copy link
Copy Markdown

@vishesh92 a [SF] 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.

@boring-cyborg boring-cyborg bot added component:integration-test Python Warning... Python code Ahead! labels Jul 27, 2023
@vishesh92
Copy link
Copy Markdown
Member Author

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

@vishesh92 a [SF] 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.

@blueorangutan
Copy link
Copy Markdown

Packaging result [SF]: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 6581

@vishesh92
Copy link
Copy Markdown
Member Author

@blueorangutan test

@blueorangutan
Copy link
Copy Markdown

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

Copy link
Copy Markdown
Contributor

@DaanHoogland DaanHoogland left a comment

Choose a reason for hiding this comment

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

clgtm

@blueorangutan
Copy link
Copy Markdown

[SF] Trillian test result (tid-7183)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 44691 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr7782-t7183-kvm-centos7.zip
Smoke tests completed. 112 look OK, 1 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test Result Time (s) Test File
test_01_migrate_VM_and_root_volume Error 77.68 test_vm_life_cycle.py
test_02_migrate_VM_with_two_data_disks Error 51.33 test_vm_life_cycle.py

@weizhouapache weizhouapache added this to the 4.19.0.0 milestone Jul 28, 2023
@vishesh92
Copy link
Copy Markdown
Member Author

@blueorangutan test

@blueorangutan
Copy link
Copy Markdown

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

@blueorangutan
Copy link
Copy Markdown

[SF] Trillian test result (tid-7224)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 46070 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr7782-t7224-kvm-centos7.zip
Smoke tests completed. 111 look OK, 2 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test Result Time (s) Test File
test_01_migrate_VM_and_root_volume Error 75.58 test_vm_life_cycle.py
test_02_migrate_VM_with_two_data_disks Error 52.35 test_vm_life_cycle.py
test_05_vmschedule_test_e2e Failure 361.55 test_vm_schedule.py

@vishesh92
Copy link
Copy Markdown
Member Author

@blueorangutan test rocky8 kvm-rocky8

@codecov
Copy link
Copy Markdown

codecov bot commented Aug 1, 2023

Codecov Report

Merging #7782 (7c0c89d) into main (0d9292c) will increase coverage by 13.25%.
Report is 128 commits behind head on main.
The diff coverage is 77.77%.

@@              Coverage Diff              @@
##               main    #7782       +/-   ##
=============================================
+ Coverage     13.44%   26.70%   +13.25%     
- Complexity     9397    27424    +18027     
=============================================
  Files          2747     5100     +2353     
  Lines        258844   375516   +116672     
  Branches      40313    59903    +19590     
=============================================
+ Hits          34793   100269    +65476     
- Misses       219667   261411    +41744     
- Partials       4384    13836     +9452     
Flag Coverage Δ
simulator-marvin-tests 24.21% <77.77%> (?)
uitests 4.87% <ø> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Changed Coverage Δ
...org/apache/cloudstack/vm/schedule/VMScheduler.java 100.00% <ø> (+100.00%) ⬆️
...apache/cloudstack/vm/schedule/VMSchedulerImpl.java 82.82% <75.00%> (+32.57%) ⬆️
.../cloudstack/vm/schedule/VMScheduleManagerImpl.java 80.50% <100.00%> (+5.66%) ⬆️

... and 3540 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@blueorangutan
Copy link
Copy Markdown

Packaging result [SF]: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 6625

@yadvr
Copy link
Copy Markdown
Member

yadvr commented Sep 11, 2023

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

@rohityadavcloud a [SF] 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.

@blueorangutan
Copy link
Copy Markdown

Packaging result [SF]: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 7009

@vishesh92
Copy link
Copy Markdown
Member Author

@blueorangutan test

@blueorangutan
Copy link
Copy Markdown

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

@blueorangutan
Copy link
Copy Markdown

[SF] Trillian test result (tid-7656)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 45905 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr7782-t7656-kvm-centos7.zip
Smoke tests completed. 112 look OK, 1 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test Result Time (s) Test File
test_02_upgrade_kubernetes_cluster Failure 545.32 test_kubernetes_clusters.py
test_07_deploy_kubernetes_ha_cluster Failure 3610.15 test_kubernetes_clusters.py
test_08_upgrade_kubernetes_ha_cluster Failure 0.06 test_kubernetes_clusters.py
test_09_delete_kubernetes_ha_cluster Failure 0.04 test_kubernetes_clusters.py
ContextSuite context=TestKubernetesCluster>:teardown Error 78.56 test_kubernetes_clusters.py

@DaanHoogland
Copy link
Copy Markdown
Contributor

@vishesh92 is this ready for merge or does it need more testing?

@vishesh92
Copy link
Copy Markdown
Member Author

@DaanHoogland This is ready for merging

@DaanHoogland DaanHoogland reopened this Sep 18, 2023
@DaanHoogland DaanHoogland merged commit d25521e into apache:main Sep 18, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants