fix build errors with DRS plugins after merge-forward

weizhouapache · Feb 13, 2024 · 187f17c · 187f17c
1 parent 9052641
commit 187f17c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 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
@@ -24,7 +24,8 @@
 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 @@
 
 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
@@ -24,7 +24,8 @@
 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 @@
 
 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,