From ab092c042ff77774e1afccc9ed87a16b8ac3fc3c Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Fri, 26 Apr 2024 09:08:01 +0200 Subject: [PATCH 1/2] auto unwrap was casuing an NPE --- .../cloudstack/storage/endpoint/DefaultEndPointSelector.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/storage/src/main/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java index bc16bafd7a9f..eb3ebf06536b 100644 --- a/engine/storage/src/main/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java +++ b/engine/storage/src/main/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java @@ -338,7 +338,7 @@ protected EndPoint findEndpointForImageStorage(DataStore store) { * Finds an SSVM that can be used to execute a command. * For zone-wide image store, use SSVM for that zone. For region-wide store, we can arbitrarily pick one SSVM to do the task. * */ - public EndPoint findSsvm(long dcId) { + public EndPoint findSsvm(Long dcId) { List ssAHosts = listUpAndConnectingSecondaryStorageVmHost(dcId); if (ssAHosts == null || ssAHosts.isEmpty()) { return null; From f0535822c091e97b51997aa418929427fab53aa3 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Fri, 26 Apr 2024 12:14:42 +0200 Subject: [PATCH 2/2] override --- .../engine/subsystem/api/storage/EndPointSelector.java | 2 +- .../cloudstack/storage/endpoint/DefaultEndPointSelector.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/EndPointSelector.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/EndPointSelector.java index ec8dfe633b5f..4f2a69bc7719 100644 --- a/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/EndPointSelector.java +++ b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/EndPointSelector.java @@ -47,5 +47,5 @@ public interface EndPointSelector { EndPoint select(DataStore store, String downloadUrl); - EndPoint findSsvm(long dcId); + EndPoint findSsvm(Long dcId); } diff --git a/engine/storage/src/main/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java index eb3ebf06536b..ba1278f2fa04 100644 --- a/engine/storage/src/main/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java +++ b/engine/storage/src/main/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java @@ -338,6 +338,7 @@ protected EndPoint findEndpointForImageStorage(DataStore store) { * Finds an SSVM that can be used to execute a command. * For zone-wide image store, use SSVM for that zone. For region-wide store, we can arbitrarily pick one SSVM to do the task. * */ + @Override public EndPoint findSsvm(Long dcId) { List ssAHosts = listUpAndConnectingSecondaryStorageVmHost(dcId); if (ssAHosts == null || ssAHosts.isEmpty()) {