Synchronise 2026.1 with upstream - #23
Open
github-actions[bot] wants to merge 7 commits into
Open
Conversation
…zation When RequestContext is initialized, oslo_log's formatters or other middleware may trigger a call to get_logging_values(), which in turn calls to_dict(). In Manila's RequestContext, to_dict() is overridden to include specific attributes like 'read_deleted', 'remote_address', 'timestamp', 'quota_class', and 'service_catalog'. If super().__init__() is called before these attributes are assigned, any implicit call to to_dict() during the parent class initialization results in an AttributeError. This patch moves the assignment of these Manila-specific attributes before the super().__init__() call to ensure they are available when referenced by to_dict() through the oslo_context logging chain. References: https://opendev.org/openstack/oslo.context/src/commit/044826fb46ffced940c48fb6f07828282c1a0fcd/oslo_context/context.py#L367 Closes-Bug: #2146025 Change-Id: Ie1c4886f804cd892130460afdba1ca44a0655a6e Signed-off-by: hongp <inyong.hong@samsung.com> (cherry picked from commit ec23384)
Add missing created_at/updated_at fields to api-ref response samples and parameter documentation. Fix potential AttributeError in share migration when extra_specs is missing. Update test stub to include timestamp fields. Change-Id: Ic3a36d22c80b5627d99ed61d6bcced57d2e39c94 partially-implements: blueprint qos-types Signed-off-by: Goutham Pacha Ravi <gouthampravi@gmail.com> (cherry picked from commit ddf1a9c)
…nitialization" into stable/2026.1
During the upgrade of the manila service, it is missing manila services from enabled_services. This change addresses it by loading the manila settings file, which directly adds manila to enabled services. Change-Id: I7d4210a8e72dc6e750d933f039fbee034fca2268 Signed-off-by: Carlos da Silva <ces.eduardo98@gmail.com> (cherry picked from commit ee25bf0)
In case _create_barbican_kms_config_for_specified_vserver fails, the NetApp ONTAP driver fails to store the share server details, making it impossible to manually delete the share server afterwards, considering that the deletion process requires the vserver name mandatory to succeed. This fix follows the same approach as the setup vserver proccess does: in case of an exception, we save the share server data in a format that Manila is already expecting, so the share/manager will be able to save the share server details and the NetApp ONTAP driver will be able to locate the share server for deletion later. Closes-Bug: #2163166 Change-Id: Icb915624dfa3ec50d1973edaa90aec62c0ec1f52 Signed-off-by: Carlos da Silva <ces.eduardo98@gmail.com> (cherry picked from commit 93b437f)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR contains a snapshot of 2026.1 from upstream stable/2026.1.