-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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
linstor: Fix using multiple primary storage with same linstor-controller #10280
linstor: Fix using multiple primary storage with same linstor-controller #10280
Conversation
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## 4.19 #10280 +/- ##
============================================
- Coverage 15.16% 15.15% -0.01%
+ Complexity 11314 11313 -1
============================================
Files 5409 5409
Lines 474473 474663 +190
Branches 57876 57903 +27
============================================
- Hits 71947 71943 -4
- Misses 394482 394677 +195
+ Partials 8044 8043 -1
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
1ff6d37
to
a4a3099
Compare
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.
code looks generally good, but is 3rd party all the way. some readability improvements possible (no -1)
...age/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java
Outdated
Show resolved
Hide resolved
...age/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java
Outdated
Show resolved
Hide resolved
...n/java/org/apache/cloudstack/storage/datastore/driver/LinstorPrimaryDataStoreDriverImpl.java
Outdated
Show resolved
Hide resolved
@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 ✔️ debian ✔️ suse15. SL-JID 12221 |
@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-12195) |
a4a3099
to
1ce5bd8
Compare
[LL]Trillian test result (tid-7069)
|
@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 ✔️ debian ✔️ suse15. SL-JID 12234 |
@blueorangutan test |
@DaanHoogland a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests |
[SF] Trillian test result (tid-12206)
|
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, I've not tested this though.
@rp- I hope you must have covered the template deletion part. If not, please verify once.
I did, I tested with 3 primary storages using the same linstor cluster. |
This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch. |
@rp- can you have another look? (conflicts) |
already on it |
It should have been always possible to use multiple primary storages, with the same linstor-controller, by just using different resource-groups with different settings. But if the same template was used on 2 different primary storages, there would be a name collision on the linstor-controller, as 2 of them would get allocated to the same name. This commit fixes this, by intelligently reusing the same template, as long as possible (if select filter properties match enough).
1ce5bd8
to
fa245cc
Compare
@DaanHoogland sorry took a while had to retest, encryption and this change here. |
ok, I'll do one more round |
@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 ✔️ debian ✔️ suse15. SL-JID 12345 |
@blueorangutan test |
@DaanHoogland a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests |
[SF] Trillian test result (tid-12320)
|
Description
It should have been always possible to use multiple primary storages, with the same linstor-controller, by just using different resource-groups with different settings.
But if the same template was used on 2 different primary storages, there would be a name collision on the linstor-controller, as 2 of them would get allocated to the same name.
This commit fixes this, by intelligently reusing the same template, as long as possible (if select filter properties match enough).
Types of changes
Feature/Enhancement Scale or Bug Severity
Feature/Enhancement Scale
Bug Severity
Screenshots (if appropriate):
How Has This Been Tested?
How did you try to break this feature and the system with this change?