Skip to content

Commit 187f17c

Browse files
committed
fix build errors with DRS plugins after merge-forward
1 parent 9052641 commit 187f17c

File tree

2 files changed

+6
-4
lines changed
  • plugins/drs/cluster

2 files changed

+6
-4
lines changed

plugins/drs/cluster/balanced/src/main/java/org/apache/cloudstack/cluster/Balanced.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
import com.cloud.utils.Ternary;
2525
import com.cloud.utils.component.AdapterBase;
2626
import com.cloud.vm.VirtualMachine;
27-
import org.apache.log4j.Logger;
27+
import org.apache.logging.log4j.LogManager;
28+
import org.apache.logging.log4j.Logger;
2829

2930
import javax.naming.ConfigurationException;
3031
import java.util.ArrayList;
@@ -35,7 +36,7 @@
3536

3637
public class Balanced extends AdapterBase implements ClusterDrsAlgorithm {
3738

38-
private static final Logger logger = Logger.getLogger(Balanced.class);
39+
private static final Logger logger = LogManager.getLogger(Balanced.class);
3940

4041
@Override
4142
public boolean needsDrs(long clusterId, List<Ternary<Long, Long, Long>> cpuList,

plugins/drs/cluster/condensed/src/main/java/org/apache/cloudstack/cluster/Condensed.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
import com.cloud.utils.Ternary;
2525
import com.cloud.utils.component.AdapterBase;
2626
import com.cloud.vm.VirtualMachine;
27-
import org.apache.log4j.Logger;
27+
import org.apache.logging.log4j.LogManager;
28+
import org.apache.logging.log4j.Logger;
2829

2930
import javax.naming.ConfigurationException;
3031
import java.util.ArrayList;
@@ -36,7 +37,7 @@
3637

3738
public class Condensed extends AdapterBase implements ClusterDrsAlgorithm {
3839

39-
private static final Logger logger = Logger.getLogger(Condensed.class);
40+
private static final Logger logger = LogManager.getLogger(Condensed.class);
4041

4142
@Override
4243
public boolean needsDrs(long clusterId, List<Ternary<Long, Long, Long>> cpuList,

0 commit comments

Comments
 (0)