(cloudstack) 01/01: Merge branch '4.19' of https://github.com/apache/cloudstack into 4.20

[pearl11594]

This is an automated email from the ASF dual-hosted git repository.

pearl11594 pushed a commit to branch 4.20
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 0427abf855f1c23716da0614b61b244029c6d14f
Merge: b8359e8f62e 8ce34ad791e
Author: Pearl Dsilva <pearl1...@gmail.com>
AuthorDate: Mon Mar 10 09:34:24 2025 -0400

    Merge branch '4.19' of https://github.com/apache/cloudstack into 4.20

 .../hypervisors/kvm/src/main/java/com/cloud/ha/KVMInvestigator.java | 5 +++--
 server/src/main/java/com/cloud/network/NetworkServiceImpl.java      | 6 +++---
 server/src/test/java/com/cloud/network/NetworkServiceImplTest.java  | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --cc 
plugins/hypervisors/kvm/src/main/java/com/cloud/ha/KVMInvestigator.java
index eb64f4bc439,72878f439ee..ce9fbe6c232
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/ha/KVMInvestigator.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/ha/KVMInvestigator.java
@@@ -36,8 -36,10 +36,9 @@@ import org.apache.cloudstack.engine.sub
  import org.apache.cloudstack.ha.HAManager;
  import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
  import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
 -import org.apache.log4j.Logger;
  
  import javax.inject.Inject;
+ import java.util.Arrays;
  import java.util.List;
  
  public class KVMInvestigator extends AdapterBase implements Investigator {
@@@ -88,8 -91,9 +89,8 @@@
              storageSupportHA = storageSupportHa(zonePools);
          }
          if (!storageSupportHA) {
 -            s_logger.warn(
 -                    "Agent investigation was requested on host " + agent + ", 
but host does not support investigation because it has no NFS storage. Skipping 
investigation.");
 +            logger.warn("Agent investigation was requested on host {}, but 
host does not support investigation because it has no NFS storage. Skipping 
investigation.", agent);
-             return Status.Disconnected;
+             return null;
          }
  
          Status hostStatus = null;
diff --cc server/src/main/java/com/cloud/network/NetworkServiceImpl.java
index a5356375db7,bdb928ae919..faff178345a
--- a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java
@@@ -2073,9 -1905,9 +2073,9 @@@ public class NetworkServiceImpl extend
              if (vpc == null) {
                  throw new CloudRuntimeException(String.format("VPC with id %s 
not found", vpcId));
              }
 -            s_logger.warn(String.format("VPC public MTU already set at VPC 
creation phase to: %s. Ignoring public MTU " +
 +            logger.warn(String.format("VPC public MTU already set at VPC 
creation phase to: %s. Ignoring public MTU " +
                      "passed during VPC network tier creation ", 
vpc.getPublicMtu()));
-             interfaceMTUs.set(vpc.getPublicMtu(), privateMtu);
+             interfaceMTUs.set(vpc.getPublicMtu(), interfaceMTUs.second());
          }
      }