-
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
Add Cloudian HyperStore Object Storage #9748
base: main
Are you sure you want to change the base?
Conversation
- Added API to return the version of the HyperStore service - Added API to manage user Root credentials - Added API to return usage information for buckets owned by a group Fixes: - Only disable https certificate validation if using https - Don't log the admin password on error - Update to always throw exception on error instead of sometimes returning empty data. - Fixed empty list cases for list users and list groups - Use an easier to understand exception message for SSL errors - Updated test cases
If there are multiple object stores configured and one of the stores is down or has some other issue returning bucket usage, it can cause usage collection to be skipped on other object stores.
- Previous Behaviour: if uploadDirectory was empty, it was set to '/'. When the object is uploaded the API adds another '/' between the endpoint url and the object name, so an object called 'abc.txt' would be uploaded as '/abc.txt'. The bucket listing is done using a delimiter of '/' which returns the common prefix '/' of the '/abc.txt' object and the object itself is not listed at the top level. - New Behaviour: The object is uploaded as 'abc.txt' if uploadDirectory is empty as would be expected.
- Allow the CloudStack administrator to connect to Cloudian HyperStore object storage. - Once connected, CloudStack Accounts can create buckets that are managed by and belong to their own Account. - IAM Credentials are available for each bucket such that Accounts can use the buckets either from 3rd party S3 applications or from the CloudStack Bucket Browser UI Feature. - The plugin supports all the current CloudStack bucket operations such as Object Lock, Versioning, Encryption and policy settings. - The plugin currently does not support setting a bucket quota as HyperStore does not currently support that functionality. - Bucket usage is supported. More Details: - See plugins/storage/object/cloudian/README.md for details UI Changes - Add Object Storage for Cloudian HyperStore: - Cloudian HyperStore Object Storage requires more fields than Minio, Ceph and Simulator so when the Cloudian HyperStore provider is selected, the GUI adjusts and offers the extra fields that the provider requires.
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #9748 +/- ##
============================================
- Coverage 16.15% 4.00% -12.16%
============================================
Files 5666 396 -5270
Lines 497960 32527 -465433
Branches 60241 5760 -54481
============================================
- Hits 80459 1302 -79157
+ Misses 408499 31075 -377424
+ Partials 9002 150 -8852
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
Thanks for the PR @tpodowd since we don't have the cloudian system to test against, we'll help with regression testing. @blueorangutan test |
Hi @rohityadavcloud - I updated the PR to fix the README.md lint issue and also added a bit more unit test coverage in the main driver code. You mentioned the following:
Thanks, let me know what information you need and I'll do my best to get back to you. |
Hi @DaanHoogland - I think I have got the pre-commit stuff nailed now. I ran pre-commit locally and it fixed the end of files for me. Then I reviewed that and pushed commit 40c0366 |
Sorry. I was reviewing the beautiful code coverage report and reviewing code I had not tested when I noticed a bad typo that means |
- The timeout parameter was using the port so instead of timing out in 10 seconds, it was using 19443 seconds. - Added tests to use real connections instead of mocking and added line tests to try catch other issues. - Noticed that HyperStore and AWS IAM services use return different errorcodes. This will be fixed in HyperStore so handle both errorcodes.
Ok. Hopefully that is it. I have pre-commit hooked in now also so I know that is clean. Code coverage should be a little better again also. |
Hi @DaanHoogland / @rohityadavcloud - There seems to be an error in one of the checks. I'm not sure that it is related to my changes though. Let me know if I need to do anything about it. Thanks! |
rerunning, let's see. It doesn't seem related to me either. |
- The Store details are maintained outside of the plugin so it is best to save them using their original key names.
I realised that I should not change the key names that the Object Store Details use as they may be read/updated outside of the plugin. Thanks! |
...ntegrations/cloudian/src/main/java/org/apache/cloudstack/cloudian/client/CloudianClient.java
Outdated
Show resolved
Hide resolved
...ntegrations/cloudian/src/main/java/org/apache/cloudstack/cloudian/client/CloudianClient.java
Outdated
Show resolved
Hide resolved
.../org/apache/cloudstack/storage/datastore/driver/CloudianHyperStoreObjectStoreDriverImpl.java
Outdated
Show resolved
Hide resolved
.../org/apache/cloudstack/storage/datastore/driver/CloudianHyperStoreObjectStoreDriverImpl.java
Outdated
Show resolved
Hide resolved
.../org/apache/cloudstack/storage/datastore/driver/CloudianHyperStoreObjectStoreDriverImpl.java
Outdated
Show resolved
Hide resolved
...udian/src/main/java/org/apache/cloudstack/storage/datastore/util/CloudianHyperStoreUtil.java
Outdated
Show resolved
Hide resolved
...udian/src/main/java/org/apache/cloudstack/storage/datastore/util/CloudianHyperStoreUtil.java
Outdated
Show resolved
Hide resolved
- error out of getUserBucketUsages() if bucket param is set but userid is not - added unit tests for the same. - split some copy/paste code into a new function - added unit tests for new function which required moving the test to the right package to test a protected function. - use the base class logger - misc tidy ups.
Hi @JoaoJandre - I have pushed another commit to address your review comments. Thanks for your time and let me know if you have any other concerns or questions. |
@tpodowd I did my best with no knowledge of Cloudian 😄 . In any case, overall it looks good to me. There is only one thing (#9748 (comment)) left that I think should be addressed. |
- created new deleteIAMCredential() function.
Hi @JoaoJandre - No worries. Thank you so much again for your time on this. I have addressed your last comment and have pushed an update. |
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, did not test it.
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.
clgtm, one organisational issue though
Hi @tpodowd, |
Hi @abh1sar - Thanks for your comment/question.
Yes, Cloudian HyperStore does not currently support a bucket storage quota.
Yes, Cloudian HyperStore does support per user quota. We have a warning level and a hard limit for storage bytes and we also have some other related settings.
Unfortunately not. There are some issues here:
Currently, the administrator would have to login to the HyperStore system and either:
|
Thanks @tpodowd for your response. |
Hi @abh1sar. The current plugin does not have any API support itself for setting Account level QoS (as it only implements the provided plugin APIs). The HyperStore Admin API itself does support setting QoS for a user though so that could be made available to CloudStack if it was implemented in CloudianClient (which is easy enough). If I know more about what you are doing, I guess I can also chip in. FYI. I have another PR pending this one also which adds the ability to edit the Object Store details. |
Hi @DaanHoogland @rohityadavcloud - Any update on when this PR is likely to be merged? |
Hi @abh1sar, ok. I will allocate some time to look at this in the coming days. As I mentioned before, we don't have a bucket level quota setting. We do have a User level QoS setting. I think the only thing that I can do currently is to set the User (that owns the bucket) QoS settings to the limit specified in the create bucket request. An example might be as below:
When any adjustment happens to the user's quota, all of the HyperStore buckets owned by that account need to get their quota settings updated in the DB to correctly represent the latest user's quota setting. This is currently all we can do I think. If we document it, it should not be too hard to understand for the admin. Does this sounds ok? I think plugin wise, the plugin currently does not update information about different bucket(s) when processing a request for a certain bucket, so I will need to figure out how best to do that. I do think it is easier for the administrator to understand the implementation and understand what the quota is set to though if it is done this way. |
@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 12496 |
@tpodowd , it seems there is some dependency error on debian:
and in the github action:
I must say I can not find it (yet) |
<parent> | ||
<groupId>org.apache.cloudstack</groupId> | ||
<artifactId>cloudstack-plugins</artifactId> | ||
<version>4.20.0.0-SNAPSHOT</version> |
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.
<version>4.20.0.0-SNAPSHOT</version> | |
<version>4.21.0.0-SNAPSHOT</version> |
Hi @DaanHoogland - please ignore this PR for the moment. I'm going to look at the plugin again with the new information that @abh1sar has provided regarding the quota being required. I'll fix the build issue before I push anything to the branch. @abh1sar - can you check my reply above also regarding how I think we might handle this? Thanks @shwstppr for pointing out the issue with the pom versions. |
I got my local build working again and confirmed that indeed we cannot add buckets currently as quota is now a requirement and create bucket fails with:
This is because the Cloudian plugin as written does not implement bucket quota and fails the request. I need to figure out an approach for this. I guess there are two approaches:
I am guessing that option 1 is not really an option and I need to implement option 2? Let me know if I am wrong about that. |
Hi @tpodowd Another thing could be, if you are ok with Cloudian not supporting Object Storage Limits, you can document that and make the quota field non-mandatory for Cloudian. |
Description
This PR Adds A New Object Storage Provider Plugin for Cloudian HyperStore
More Details:
UI Changes - Add Object Storage for Cloudian HyperStore:
Other Bug fixes and improvements as part of this fix I kept in separate commits.
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?