This is an automated email from the ASF dual-hosted git repository. dahn pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 0d8f7d400375a155efe4109a3018cf5259160942 Merge: ab8197c55e1 92ba4765930 Author: Daan Hoogland <[email protected]> AuthorDate: Mon May 6 10:36:06 2024 +0200 Merge release branch 4.19 to main * 4.19: linstor: disconnect-disk also search for resource name in Linstor (#9035) ui: add support to change Account role for admins (#9012) Use parameter dcId as wrapper to prevent NPE (#8986) .../cloudstack/engine/subsystem/api/storage/EndPointSelector.java | 2 +- .../cloudstack/storage/endpoint/DefaultEndPointSelector.java | 3 ++- .../com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java | 7 ++++--- ui/public/locales/en.json | 1 + ui/src/config/section/account.js | 2 +- 5 files changed, 9 insertions(+), 6 deletions(-) diff --cc plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java index 0ab51dbf112,f0925f01bb8..e46a3ad8012 --- a/plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java +++ b/plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java @@@ -321,10 -316,10 +321,10 @@@ public class LinstorStorageAdaptor impl null, null); - optRsc = getResourceByPath(resources, volumePath); + optRsc = getResourceByPathOrName(resources, volumePath); } catch (ApiException apiEx) { // couldn't query linstor controller - s_logger.error(apiEx.getBestMessage()); + logger.error(apiEx.getBestMessage()); return false; }
