etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix build errors with DRS plugins after merge-forward

This commit is contained in:
Wei Zhou 2024-02-13 11:07:59 +01:00
parent 90526419a3
commit 187f17c216
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,8 @@ import com.cloud.offering.ServiceOffering;
import com.cloud.utils.Ternary; import com.cloud.utils.Ternary;
import com.cloud.utils.component.AdapterBase; import com.cloud.utils.component.AdapterBase;
import com.cloud.vm.VirtualMachine; 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 javax.naming.ConfigurationException;
import java.util.ArrayList; import java.util.ArrayList;
@ -35,7 +36,7 @@ import static org.apache.cloudstack.cluster.ClusterDrsService.ClusterDrsImbalanc
public class Balanced extends AdapterBase implements ClusterDrsAlgorithm { 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 @Override
public boolean needsDrs(long clusterId, List<Ternary<Long, Long, Long>> cpuList, public boolean needsDrs(long clusterId, List<Ternary<Long, Long, Long>> cpuList,

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

@ -24,7 +24,8 @@ import com.cloud.offering.ServiceOffering;
import com.cloud.utils.Ternary; import com.cloud.utils.Ternary;
import com.cloud.utils.component.AdapterBase; import com.cloud.utils.component.AdapterBase;
import com.cloud.vm.VirtualMachine; 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 javax.naming.ConfigurationException;
import java.util.ArrayList; import java.util.ArrayList;
@ -36,7 +37,7 @@ import static org.apache.cloudstack.cluster.ClusterDrsService.ClusterDrsImbalanc
public class Condensed extends AdapterBase implements ClusterDrsAlgorithm { 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 @Override
public boolean needsDrs(long clusterId, List<Ternary<Long, Long, Long>> cpuList, public boolean needsDrs(long clusterId, List<Ternary<Long, Long, Long>> cpuList,