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

[DPE-4196] Plugin Management Refactor #435

Merged
merged 114 commits into from
Feb 12, 2025

Conversation

phvalguima
Copy link
Contributor

@phvalguima phvalguima commented Sep 10, 2024

The main goal is to: (1) separate API call (/_cluster) between plugin-specific calls and cluster settings; (2) curb the requirements for restart for any plugin changes; (3) get a faster response time using cached entries wherever possible; (4) add new use-case with secret handling within the plugin logic itself; and (5) define models so we can standardize the plugin data exchanged between the objects and via relation.

The config-only plugin

These are plugin configured via config options. In this case, it is only needed to add a new OpenSearchPlugin -child class that manages the config options to be added or removed from the cluster.

For example, opensearch-knn receives the config from the charm and returns the options to be set in the opensearch.yml.

New Plugin Manager Infra

Now, the plugin manager is able to manage plugins that depend on config options, API calls and secrets. Whenever adding a new plugin, we should consider:

opensearch_plugins.py: this plugin should have a representation that is consumable by plugin_manager; it should be composed of all the configurations and keys to be added or removed to the cluster's main configuration
opensearch_plugin_manager.py: add the new plugin to the plugin dict; the manager must be able to instantiate this new plugin
opensearch_{plugin-name}.py: if the plugin is managed by a given relation, this lib will implement the relation manager and interface with OpenSearch's plugin-specific APIs
models.py: add any relation data model to this lib

Secret Management

Each plugin that handles the specific secrets must implement the secret management logic in its operation. The goal is to avoid filling the opensearch_secrets.py methods with ifs for each plugin case and separating / isolating each plugin code.

Adds Azure Backup Support

This PR builds on top of #531 and provides all the azure backup support and integration with the Blob store.

Remove unneeded restarts and add caching

We ensure that any configuration changes that come from plugin management are applied via API before being persisted on config files. If the API responds with a 200 status, then we should only write the new value to the configuration and finish without a need for restart.

In case the service is down and API is not available, we can assume we will eventually start the service back up. In this case, it suffices to write the config entries to the files and leave to the next start to pick them up.

This task is going to be divided into 3x parts:

Addresses low ranging fruits where we reduce the number of restarts and add caching support
Three main actions: (i) Merge {add,delete}_plugin together and its equivalents in OpenSearchPluginConfig class; (ii) we receive one big dictionary where a key: None means we want to simply delete that entry; and (iii) the main OpenSearchKeystore must observe secret changes and update its values accordingly
Returns unit tests: this is going to be commented out whilst Parts 1 and 2 happen, given this part of the code was covered with extensive testing
The current implementation of plugin_manager.run waits for the cluster to be started before processing its config changed. We relax this demand and open to the option where the cluster is not yet ready, so we can modify the configuration without issuing a restart request.

#252 is closed with OpenSearchPluginRelationsHandler interface. It allows plugins to define how they will handle its relation(s). opensearch_backup module extends this interface and defines a checker to process either small or large deployments details.

Other relevant changes:

  • Renaming method check_plugin_manager_ready to check_plugin_manager_ready_for_api
  • Any plugin that needs to manage things via API call should check the health of the cluster using check_plugin_manager_ready_for_api
  • Moving opensearch_distro.version to load the workload_version file we have present instead of an API call: this is two fold, 1. removes the dependency to a cluster to be ready and 2. makes this method in-sync with recent changes for upgrades logic
  • Waive the need of loading the default settings if this particular unit is powered down: which makes sense, in this moment we can do any config changes as we will eventually powered it back up later
  • If /_cluster/settings is available: apply the configs via API and do not add a restart request
  • On config-changed handler, the upgrade_in_progress check gets precedence and will continuously defer config-changed event until upgrade is finished before calling the plugin manager
  • Create a OpenSearchKeyStoreNotReadyYetError: responsible to identify the keystore has not been initialized yet across the cluster and hence, we cannot manage any plugins that use it; however, we always apply the opensearch.yml changes from that plugin
  • Add cached_property whenever it makes sense, also adds logic to clean the cache if there was any relevant changes to its content.
  • That still frees the config_changed to just call plugin_manager.run() before everything is set, as the run() method changes hard configuration only.

Closes #252, #280, #244

zmraul
zmraul previously approved these changes Jan 28, 2025
Copy link
Contributor

@zmraul zmraul left a comment

Choose a reason for hiding this comment

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

Nice! After some discussions around this PR, my opinion is that it successfully enables integrating plugins into the codebase keeping the following items in a centralized development environment:

  • Plugins that are configured via relations
  • Secrets that need to be created for storing credentials (related to plugins specifically)
  • Large deployment data abstraction (including passing secrets around)

Follow up work

There are some leftover tasks that there should be looked at once this is merged. I'm writing them down here, but I'll create issues for these once merged:

  • Look at default settings on <Plugin|Relation>RelData(Model) classes. These defaults are not adding value, since the validator should be the main point where checks happen. But just removing defaults interacts with Plugin data and config methods, so I would rather have specific work done on this to make sure validation is well done.
  • Some extra abstraction | constant is needed around s3 (and azure) secrets, since there is too many literal strings being used around, which makes following the flow of data hard within the code.

phvalguima and others added 17 commits January 28, 2025 18:10
Implements Azure storage integration.

Changes:
- All general objects (`OpenSearchBackups<nameOfClass>`) that worked
under S3 integration have been renamed to be specific about S3.
- `OpenSearchBackupBase` is now generic for both Azure and S3
integrators.
- On `OpenSearchBaseCharm`, `self.backup()` is reworked to take into
account both relations existing, or not. It will then generate the
correct sub class for the appropriate relation.
- Constants and error messages are a bit more generic to allow use on
both relation error scenarios
- New model `AzureRelData` for the integrator databag.

---------

Co-authored-by: Pedro Guimaraes <pedro.guimaraes@canonical.com>
Copy link
Contributor

@Mehdi-Bendriss Mehdi-Bendriss left a comment

Choose a reason for hiding this comment

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

We will merge this one - as we wait for #541 to follow and address the remaining feedback points.

@phvalguima phvalguima requested a review from zmraul February 12, 2025 08:37
Copy link
Contributor

@zmraul zmraul left a comment

Choose a reason for hiding this comment

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

Re-approving.

@phvalguima phvalguima merged commit 21bb109 into 2/edge Feb 12, 2025
36 of 42 checks passed
@phvalguima phvalguima deleted the DPE-4196-improve-plugin-manager branch February 12, 2025 09:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[RFE] Extend plugin manager
5 participants