-
Notifications
You must be signed in to change notification settings - Fork 1.2k
various fixes for fiberchannel and autoscale prefix option #11071
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: 4.20
Are you sure you want to change the base?
Conversation
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## 4.20 #11071 +/- ##
============================================
- Coverage 16.18% 16.17% -0.01%
- Complexity 13298 13302 +4
============================================
Files 5657 5657
Lines 498470 498641 +171
Branches 60493 60519 +26
============================================
+ Hits 80660 80664 +4
- Misses 408830 408995 +165
- Partials 8980 8982 +2
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pull Request Overview
This PR fixes several issues and enhances functionality in both autoscale VM hostname generation and storage connectivity, including improvements for handling disk connections asynchronously and build configuration refinements.
- Introduces an optional configuration for including a hostname prefix for autoscale VMs.
- Implements asynchronous disk connection handling and improves error messaging and logging across storage adapter scripts.
- Adds several m2e IDE build annotations and fixes path issues in Maven POMs.
Reviewed Changes
Copilot reviewed 15 out of 16 changed files in this pull request and generated 5 comments.
Show a summary per file
| File | Description |
|---|---|
| server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java | Adds hostname generation methods with and without prefix for autoscale VMs. |
| server/src/main/java/com/cloud/network/as/AutoScaleManager.java | Introduces a new config key to enable/disable the autoscale hostname prefix. |
| scripts/storage/multipath/startConnectVolume.sh | Implements a shell script to connect volumes, with minor spelling issues in comments. |
| scripts/storage/multipath/finishConnectVolume.sh | Provides a finishing connect script with similar spelling issues as startConnectVolume.sh. |
| scripts/storage/multipath/disconnectVolume.sh | Updates background execution behavior for disk disconnect operations. |
| scripts/storage/multipath/connectVolume.sh | Refactors volume connect logic to use dedicated start/finish connect scripts and a waiting loop. |
| pom.xml, plugins/*/pom.xml, engine/schema/pom.xml | Updates Maven POM configurations and ensures m2e IDE compatibility. |
| plugins/storage/volume/adaptive/src/main/java/org/apache/cloudstack/storage/datastore/driver/AdaptiveDataStoreDriverImpl.java | Modifies persistence method signatures and logging for volume operations. |
| plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/MultipathSCSIAdapterBase.java | Adjusts script timeout values and error messages, and adds new script properties. |
| plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java, KVMStoragePoolManager.java, AsyncPhysicalDiskConnectorDecorator.java | Improves exception handling and implements support for asynchronous physical disk connections. |
...rc/main/java/org/apache/cloudstack/storage/datastore/driver/AdaptiveDataStoreDriverImpl.java
Outdated
Show resolved
Hide resolved
...hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/MultipathSCSIAdapterBase.java
Outdated
Show resolved
Hide resolved
Co-authored-by: Copilot <[email protected]>
Co-authored-by: Copilot <[email protected]>
Co-authored-by: Copilot <[email protected]>
…stack/storage/datastore/driver/AdaptiveDataStoreDriverImpl.java Co-authored-by: Copilot <[email protected]>
…/storage/MultipathSCSIAdapterBase.java Co-authored-by: Copilot <[email protected]>
|
I ran the Linstor integration tests against it and had not problems, so green light from me, from that perspective. |
rp-
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm
|
This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch. |
|
@rg9975 can you please resolve the conflicts? |
...rc/main/java/org/apache/cloudstack/storage/datastore/driver/AdaptiveDataStoreDriverImpl.java
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pull Request Overview
Copilot reviewed 15 out of 15 changed files in this pull request and generated 12 comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java
Outdated
Show resolved
Hide resolved
...rc/main/java/org/apache/cloudstack/storage/datastore/driver/AdaptiveDataStoreDriverImpl.java
Outdated
Show resolved
Hide resolved
...hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/MultipathSCSIAdapterBase.java
Outdated
Show resolved
Hide resolved
...ns/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java
Outdated
Show resolved
Hide resolved
...hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/MultipathSCSIAdapterBase.java
Outdated
Show resolved
Hide resolved
...hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/MultipathSCSIAdapterBase.java
Outdated
Show resolved
Hide resolved
Co-authored-by: Vishesh <[email protected]>
…stack/storage/datastore/driver/AdaptiveDataStoreDriverImpl.java Co-authored-by: Vishesh <[email protected]>
….java Co-authored-by: Copilot <[email protected]>
Co-authored-by: Copilot <[email protected]>
…/storage/MultipathSCSIAdapterBase.java Co-authored-by: Copilot <[email protected]>
Co-authored-by: Copilot <[email protected]>
…/storage/KVMStoragePoolManager.java Co-authored-by: Copilot <[email protected]>
…/storage/MultipathSCSIAdapterBase.java Co-authored-by: Copilot <[email protected]>
…/storage/MultipathSCSIAdapterBase.java Co-authored-by: Copilot <[email protected]>
|
@blueorangutan package |
|
@DaanHoogland a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress. |
|
Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 15772 |
|
@blueorangutan package |
|
@DaanHoogland a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress. |
|
Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 15773 |
|
@blueorangutan test |
|
@DaanHoogland a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests |
|
[SF] Trillian Build Failed (tid-14840) |
|
[SF] Trillian Build Failed (tid-14841) |
Description
This PR fixes various issues in the fiberchannel/adaptive storage provider, including adding an optional interface for handling connecting disks in a 3 step process to improve performance on VMs with a large number of disks to connect. One additional change is included to provide an option to disable the fixed string prefix added to autoscale VMs to allow for longer generated names. A couple of small annotations were added to help builds when running in an m2e-compatible IDE.
Types of changes
Feature/Enhancement Scale or Bug Severity
Feature/Enhancement Scale
Bug Severity
Screenshots (if appropriate):
How Has This Been Tested?
Code has been tested and used in live environment with appropriate storage appliances.
How did you try to break this feature and the system with this change?
Code has been tested and used in live environment with appropriate storage appliances.