Skip to content
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

Merged
merged 14 commits into from
Mar 10, 2025

Conversation

tpodowd
Copy link
Contributor

@tpodowd tpodowd commented Sep 30, 2024

Description

This PR Adds A New Object Storage Provider Plugin for Cloudian HyperStore

  • 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.

Other Bug fixes and improvements as part of this fix I kept in separate commits.

  • Use a password input field type for object store secret key entry
  • Fix to avoid pre-pending a second '/' to the object name in the Bucket Browser Feature.
  • Fix issue where usage may not be collected if another object store is down.
  • Various fixes and enhancements to CloudianClient

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)
  • build/CI
  • test (unit or integration test code)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

  • Major
  • Minor

Bug Severity

  • BLOCKER
  • Critical
  • Major
  • Minor
  • Trivial

Screenshots (if appropriate):

Screenshot 2024-09-30 at 13 02 20

How Has This Been Tested?

  1. Unit Testing
  2. Testing against the Cloudian HyperStore system. Tested bad configurations and credentials, system down.
  3. Monitored log entries and sniffed network connections.
  4. Tested the various UI compontents such as Add Object Storage, Edit and Delete Object Storage. Adding buckets with various Accounts and Projects, editing bucket configurations, verifying configurations were set using different S3 exploration tools.
  5. Tested the bucket browser UI component against HyperStore.

How did you try to break this feature and the system with this change?

  • As this change altered CloudianClient which is shared code with the other cloudian infrastructure plugin, I also re-tested that plugin after these changes.
  • I also lightly tested with Minio.
  • This plugin feature shouldn't break other areas of the system.

Copy link

codecov bot commented Sep 30, 2024

Codecov Report

Attention: Patch coverage is 74.38867% with 199 lines in your changes missing coverage. Please review.

Project coverage is 16.24%. Comparing base (24b7c66) to head (01be768).
Report is 35 commits behind head on main.

Files with missing lines Patch % Lines
...river/CloudianHyperStoreObjectStoreDriverImpl.java 76.30% 92 Missing and 8 partials ⚠️
...che/cloudstack/cloudian/client/CloudianClient.java 73.84% 28 Missing and 6 partials ⚠️
...le/CloudianHyperStoreObjectStoreLifeCycleImpl.java 58.06% 24 Missing and 2 partials ⚠️
...der/CloudianHyperStoreObjectStoreProviderImpl.java 40.00% 15 Missing ⚠️
...storage/datastore/util/CloudianHyperStoreUtil.java 83.01% 6 Missing and 3 partials ⚠️
...loudstack/storage/object/BucketApiServiceImpl.java 0.00% 8 Missing ⚠️
...cloudstack/cloudian/client/CloudianCredential.java 82.05% 6 Missing and 1 partial ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##              main    #9748       +/-   ##
============================================
+ Coverage     4.00%   16.24%   +12.24%     
- Complexity       0    13368    +13368     
============================================
  Files          396     5672     +5276     
  Lines        32530   498985   +466455     
  Branches      5766    60341    +54575     
============================================
+ Hits          1302    81059    +79757     
- Misses       31078   408891   +377813     
- Partials       150     9035     +8885     
Flag Coverage Δ
uitests 4.04% <ø> (+0.04%) ⬆️
unittests 17.09% <74.38%> (?)

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

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@rohityadavcloud
Copy link
Member

Thanks for the PR @tpodowd since we don't have the cloudian system to test against, we'll help with regression testing.

@blueorangutan test

@tpodowd
Copy link
Contributor Author

tpodowd commented Oct 1, 2024

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:

since we don't have the cloudian system to test against, we'll help with regression testing.

Thanks, let me know what information you need and I'll do my best to get back to you.

@tpodowd
Copy link
Contributor Author

tpodowd commented Oct 2, 2024

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

@tpodowd
Copy link
Contributor Author

tpodowd commented Oct 4, 2024

Sorry. I was reviewing the beautiful code coverage report and reviewing code I had not tested when I noticed a bad typo that means CloudianClient won't timeout. I have a fix locally and have added unit tests. I am doing a full build and a bit more testing and then I'll push another commit.

@tpodowd
Copy link
Contributor Author

tpodowd commented Oct 4, 2024

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.

@tpodowd
Copy link
Contributor Author

tpodowd commented Oct 6, 2024

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!

@DaanHoogland
Copy link
Contributor

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.

@tpodowd
Copy link
Contributor Author

tpodowd commented Oct 11, 2024

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!

@tpodowd
Copy link
Contributor Author

tpodowd commented Oct 18, 2024

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.

@JoaoJandre
Copy link
Contributor

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.

@tpodowd
Copy link
Contributor Author

tpodowd commented Oct 21, 2024

@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.

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.

Copy link
Contributor

@JoaoJandre JoaoJandre left a 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.

Copy link
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, one organisational issue though

@abh1sar
Copy link
Collaborator

abh1sar commented Nov 5, 2024

Hi @tpodowd,
I understand Cloudian doesn't support per bucket Quota.
Does it support per user quota? Is there a way to configure it from within CloudStack?

cc @rohityadavcloud @sureshanaparti

@tpodowd
Copy link
Contributor Author

tpodowd commented Nov 5, 2024

Hi @abh1sar - Thanks for your comment/question.

I understand Cloudian doesn't support per bucket Quota.

Yes, Cloudian HyperStore does not currently support a bucket storage quota.

Does it support per user 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.

Is there a way to configure it from within CloudStack?

Unfortunately not. There are some issues here:

  1. Although the CloudStack APIs for Object Storage allow setting a quota on a bucket, there is no API framework provided to the plugins to set something on the CloudStack Account level.
  2. On HyperStore, setting a quota on an Account/User is usually something that an administrator would do as it is related to QoS settings (ie protecting the system, rather than protecting the user). I guess a user concerned about potential storage costs might also want to impose a limit on themselves. But, if the administrator for example set the QoS limit to one thing, then the user should not be able to raise it higher or disable it for themselves.

Currently, the administrator would have to login to the HyperStore system and either:

  1. Select the HyperStore group (representing the CloudStack Domain) and set a QoS limit that applies to all users in that group.
  2. Select the HyperStore user (representing the CloudStack Account) and set a QoS limit that only applies to that particular user.

@abh1sar
Copy link
Collaborator

abh1sar commented Nov 5, 2024

Thanks @tpodowd for your response.
If we had to implement the functionality to set Account level Quota in cloudstack, how do you think that could be done?
Does the HyperStore plugin has API to do something like that?
I am asking because I am working on a PR which adds resource limits to Object Storage space usage.

@tpodowd
Copy link
Contributor Author

tpodowd commented Nov 5, 2024

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.
https://github.com/tpodowd/cloudstack/tree/edit_object_storage

@tpodowd
Copy link
Contributor Author

tpodowd commented Feb 17, 2025

Hi @DaanHoogland @rohityadavcloud - Any update on when this PR is likely to be merged?

@abh1sar
Copy link
Collaborator

abh1sar commented Feb 17, 2025

Hi @tpodowd ,
Please sync with the latest code and test bucket creation. The quota field in create bucket api has been made mandatory since #10017 to support Object Storage Limits per Account/Project and Domain.
Happy to discuss further if needed.

@tpodowd
Copy link
Contributor Author

tpodowd commented Feb 18, 2025

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:

  • Bucket B1 created for User A with a quota of 5GB.
  • Plugin adjusts the HyperStore user A's quota to 5GB

  • Bucket B2 created for User A with a quota of 5GB.
  • Plugin keeps HyperStore user A's quota at 5GB (updates CS DB quotas for B1,B2 to 5GB to match)

  • Bucket B3 created for User A with a quota of 3GB.
  • Plugin reduces HyperStore user A's quota to 3GB (updates CS DB quotas for B1,B2,B3 to 3GB to match)

  • Bucket B2's quota is adjusted to 10GB
  • Plugin expands HyperStore user A's quota to 10GB (updates CS DB quotas for B1,B2,B3 to 10GB to match)

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.

@apache apache deleted a comment from blueorangutan Feb 18, 2025
@apache apache deleted a comment from blueorangutan Feb 18, 2025
@apache apache deleted a comment from blueorangutan Feb 18, 2025
@apache apache deleted a comment from blueorangutan Feb 18, 2025
- 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.
- The Store details are maintained outside of the plugin so it is
  best to save them using their original key names.
- 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.
- created new deleteIAMCredential() function.
The CloudStack UI and API now require a quota setting to be configured
on all buckets. HyperStore does not support a bucket quota limit
setting. As a work around, this commit allows a quota setting of 0
to indicate there is no quota limit. Any other non-zero value will
cause the quota setting to fail.

HyperStore may add a bucket quota limit setting in a future version
at which time we will address this further.

Additionally fix pom to update version
@tpodowd tpodowd force-pushed the add_cloudian_object_storage branch from f2a0120 to 01be768 Compare February 26, 2025 03:37
@tpodowd
Copy link
Contributor Author

tpodowd commented Feb 26, 2025

We discussed this internally. HyperStore does not currently support Bucket Quota limits. We have added an internal feature request for this which we may implement in a future HyperStore release. At such time, we will re-address and update the CloudStack HyperStore plugin bucket quota functionality. As the CloudStack UI and API currently both require a quota setting, we decided to allow the user to specify a value of 0 as the quota. The 0 quota will indicate no quota restriction for the bucket.

I rebased this branch on top of the latest main branch.
I fixed 2 issues in commit 01be768:

  1. The pom.xml was updated for the correct version number.
  2. Quota of 0 is now accepted and I added an extra test for the 0 case.

I built everything cleanly and tested adding a bucket successfully using a quota of 0. I also confirmed the error case worked with any other quota value and that UI shows the user the exception message to help them choose the 0 value.

Please let me know if you have any questions or comments.

@tpodowd tpodowd marked this pull request as ready for review February 26, 2025 04:01
@DaanHoogland DaanHoogland added this to the 4.21.0 milestone Feb 26, 2025
@DaanHoogland
Copy link
Contributor

@blueorangutan package

@blueorangutan
Copy link

@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.

@blueorangutan
Copy link

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

@blueorangutan
Copy link

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

@abh1sar
Copy link
Collaborator

abh1sar commented Feb 27, 2025

We discussed this internally. HyperStore does not currently support Bucket Quota limits. We have added an internal feature request for this which we may implement in a future HyperStore release. At such time, we will re-address and update the CloudStack HyperStore plugin bucket quota functionality. As the CloudStack UI and API currently both require a quota setting, we decided to allow the user to specify a value of 0 as the quota. The 0 quota will indicate no quota restriction for the bucket.

I rebased this branch on top of the latest main branch. I fixed 2 issues in commit 01be768:

  1. The pom.xml was updated for the correct version number.
  2. Quota of 0 is now accepted and I added an extra test for the 0 case.

I built everything cleanly and tested adding a bucket successfully using a quota of 0. I also confirmed the error case worked with any other quota value and that UI shows the user the exception message to help them choose the 0 value.

Please let me know if you have any questions or comments.

LGTM

@DaanHoogland
Copy link
Contributor

Please let me know if you have any questions or comments.

thanks @tpodowd , this means you are done with this PR, for now? (so we run regression tests and merge ..)

@tpodowd
Copy link
Contributor Author

tpodowd commented Feb 27, 2025

Hi @DaanHoogland - yes. I am done with this particular PR so it would be great to move forward. Thanks!

@blueorangutan
Copy link

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

@DaanHoogland
Copy link
Contributor

@blueorangutan test

@blueorangutan
Copy link

@DaanHoogland a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

@blueorangutan
Copy link

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

Test Result Time (s) Test File
test_06_purge_expunged_vm_background_task Failure 383.31 test_purge_expunged_vms.py

@tpodowd
Copy link
Contributor Author

tpodowd commented Mar 10, 2025

Hi @DaanHoogland - I saw you closed this and re-opened it but since it is not merged yet I was wondering if there is anything holding it up? I've another PR waiting for this one to be merged which adds editing of the Object Storage settings.

@DaanHoogland
Copy link
Contributor

@tpodowd

Hi @DaanHoogland - I saw you closed this and re-opened it but since it is not merged yet I was wondering if there is anything holding it up? I've another PR waiting for this one to be merged which adds editing of the Object Storage settings.

No, except maybe a 3rd party test report. But as this is an integration of 3rd party components we are lenient in that perspect, so I'm merging. Usually we ask that somene else than the contributer has tested and fed back their findings.

@DaanHoogland DaanHoogland merged commit d94aaa8 into apache:main Mar 10, 2025
47 of 49 checks passed
@tpodowd
Copy link
Contributor Author

tpodowd commented Mar 10, 2025

Thanks for the explanation and for merging @DaanHoogland.

@tpodowd tpodowd deleted the add_cloudian_object_storage branch March 10, 2025 06:59
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.

7 participants