(cloudstack) branch main updated: fix build errors with DRS plugins after merge-forward

[weizhou]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 187f17c216d fix build errors with DRS plugins after merge-forward
187f17c216d is described below

commit 187f17c216dccfbe0b487558f6a5ef8a0d2e37d6
Author: Wei Zhou <weiz...@apache.org>
AuthorDate: Tue Feb 13 11:07:59 2024 +0100

    fix build errors with DRS plugins after merge-forward
---
 .../src/main/java/org/apache/cloudstack/cluster/Balanced.java        | 5 +++--
 .../src/main/java/org/apache/cloudstack/cluster/Condensed.java       | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git 
a/plugins/drs/cluster/balanced/src/main/java/org/apache/cloudstack/cluster/Balanced.java
 
b/plugins/drs/cluster/balanced/src/main/java/org/apache/cloudstack/cluster/Balanced.java
index ea234c2b794..c799ac872c0 100644
--- 
a/plugins/drs/cluster/balanced/src/main/java/org/apache/cloudstack/cluster/Balanced.java
+++ 
b/plugins/drs/cluster/balanced/src/main/java/org/apache/cloudstack/cluster/Balanced.java
@@ -24,7 +24,8 @@ import com.cloud.offering.ServiceOffering;
 import com.cloud.utils.Ternary;
 import com.cloud.utils.component.AdapterBase;
 import com.cloud.vm.VirtualMachine;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import javax.naming.ConfigurationException;
 import java.util.ArrayList;
@@ -35,7 +36,7 @@ import static 
org.apache.cloudstack.cluster.ClusterDrsService.ClusterDrsImbalanc
 
 public class Balanced extends AdapterBase implements ClusterDrsAlgorithm {
 
-    private static final Logger logger = Logger.getLogger(Balanced.class);
+    private static final Logger logger = LogManager.getLogger(Balanced.class);
 
     @Override
     public boolean needsDrs(long clusterId, List<Ternary<Long, Long, Long>> 
cpuList,
diff --git 
a/plugins/drs/cluster/condensed/src/main/java/org/apache/cloudstack/cluster/Condensed.java
 
b/plugins/drs/cluster/condensed/src/main/java/org/apache/cloudstack/cluster/Condensed.java
index dc1546f9f6a..3a8befa628b 100644
--- 
a/plugins/drs/cluster/condensed/src/main/java/org/apache/cloudstack/cluster/Condensed.java
+++ 
b/plugins/drs/cluster/condensed/src/main/java/org/apache/cloudstack/cluster/Condensed.java
@@ -24,7 +24,8 @@ import com.cloud.offering.ServiceOffering;
 import com.cloud.utils.Ternary;
 import com.cloud.utils.component.AdapterBase;
 import com.cloud.vm.VirtualMachine;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import javax.naming.ConfigurationException;
 import java.util.ArrayList;
@@ -36,7 +37,7 @@ import static 
org.apache.cloudstack.cluster.ClusterDrsService.ClusterDrsImbalanc
 
 public class Condensed extends AdapterBase implements ClusterDrsAlgorithm {
 
-    private static final Logger logger = Logger.getLogger(Condensed.class);
+    private static final Logger logger = LogManager.getLogger(Condensed.class);
 
     @Override
     public boolean needsDrs(long clusterId, List<Ternary<Long, Long, Long>> 
cpuList,