apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

build: fix build failure after merge-forward

Browse Source
This commit is contained in:
Wei Zhou 2024-04-17 16:40:31 +02:00
parent 63a0797b18
commit 38ca11f99a
No known key found for this signature in database
GPG Key ID: 1503DFE7C8226103
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtDomainListener.java
View File

@ -15,7 +15,8 @@
package com.cloud.hypervisor.kvm.resource; package com.cloud.hypervisor.kvm.resource;
import com.cloud.resource.AgentStatusUpdater; import com.cloud.resource.AgentStatusUpdater;
import org.apache.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.libvirt.Domain; import org.libvirt.Domain;
import org.libvirt.LibvirtException; import org.libvirt.LibvirtException;
import org.libvirt.event.DomainEvent; import org.libvirt.event.DomainEvent;
@ -24,7 +25,7 @@ import org.libvirt.event.LifecycleListener;
import org.libvirt.event.StoppedDetail; import org.libvirt.event.StoppedDetail;
public class LibvirtDomainListener implements LifecycleListener { public class LibvirtDomainListener implements LifecycleListener {
private static final Logger LOGGER = Logger.getLogger(LibvirtDomainListener.class); private static final Logger LOGGER = LogManager.getLogger(LibvirtDomainListener.class);
private final AgentStatusUpdater agentStatusUpdater; private final AgentStatusUpdater agentStatusUpdater;

11
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckAndRepairVolumeCommandWrapper.java
View File

@ -42,7 +42,6 @@ import org.apache.cloudstack.utils.qemu.QemuObject;
import org.apache.cloudstack.utils.qemu.QemuObject.EncryptFormat; import org.apache.cloudstack.utils.qemu.QemuObject.EncryptFormat;
import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.libvirt.LibvirtException; import org.libvirt.LibvirtException;
import java.io.IOException; import java.io.IOException;
@ -53,8 +52,6 @@ import java.util.List;
@ResourceWrapper(handles = CheckAndRepairVolumeCommand.class) @ResourceWrapper(handles = CheckAndRepairVolumeCommand.class)
public class LibvirtCheckAndRepairVolumeCommandWrapper extends CommandWrapper<CheckAndRepairVolumeCommand, Answer, LibvirtComputingResource> { public class LibvirtCheckAndRepairVolumeCommandWrapper extends CommandWrapper<CheckAndRepairVolumeCommand, Answer, LibvirtComputingResource> {
private static final Logger s_logger = Logger.getLogger(LibvirtCheckAndRepairVolumeCommandWrapper.class);
@Override @Override
public Answer execute(CheckAndRepairVolumeCommand command, LibvirtComputingResource serverResource) { public Answer execute(CheckAndRepairVolumeCommand command, LibvirtComputingResource serverResource) {
final String volumeId = command.getPath(); final String volumeId = command.getPath();
@ -105,7 +102,7 @@ public class LibvirtCheckAndRepairVolumeCommandWrapper extends CommandWrapper<Ch
EncryptFormat encryptFormat = EncryptFormat.enumValue(command.getEncryptFormat()); EncryptFormat encryptFormat = EncryptFormat.enumValue(command.getEncryptFormat());
byte[] passphrase = command.getPassphrase(); byte[] passphrase = command.getPassphrase();
String checkVolumeResult = checkAndRepairVolume(vol, null, encryptFormat, passphrase, serverResource); String checkVolumeResult = checkAndRepairVolume(vol, null, encryptFormat, passphrase, serverResource);
s_logger.info(String.format("Check Volume result for the volume %s is %s", vol.getName(), checkVolumeResult)); logger.info(String.format("Check Volume result for the volume %s is %s", vol.getName(), checkVolumeResult));
CheckAndRepairVolumeAnswer answer = new CheckAndRepairVolumeAnswer(command, true, checkVolumeResult); CheckAndRepairVolumeAnswer answer = new CheckAndRepairVolumeAnswer(command, true, checkVolumeResult);
answer.setVolumeCheckExecutionResult(checkVolumeResult); answer.setVolumeCheckExecutionResult(checkVolumeResult);
@ -119,7 +116,7 @@ public class LibvirtCheckAndRepairVolumeCommandWrapper extends CommandWrapper<Ch
String repairVolumeResult = checkAndRepairVolume(vol, repair, encryptFormat, passphrase, serverResource); String repairVolumeResult = checkAndRepairVolume(vol, repair, encryptFormat, passphrase, serverResource);
String finalResult = (checkVolumeResult != null ? checkVolumeResult.concat(",") : "") + repairVolumeResult; String finalResult = (checkVolumeResult != null ? checkVolumeResult.concat(",") : "") + repairVolumeResult;
s_logger.info(String.format("Repair Volume result for the volume %s is %s", vol.getName(), repairVolumeResult)); logger.info(String.format("Repair Volume result for the volume %s is %s", vol.getName(), repairVolumeResult));
CheckAndRepairVolumeAnswer answer = new CheckAndRepairVolumeAnswer(command, true, finalResult); CheckAndRepairVolumeAnswer answer = new CheckAndRepairVolumeAnswer(command, true, finalResult);
answer.setVolumeRepairExecutionResult(repairVolumeResult); answer.setVolumeRepairExecutionResult(repairVolumeResult);
@ -138,7 +135,7 @@ public class LibvirtCheckAndRepairVolumeCommandWrapper extends CommandWrapper<Ch
jsonNode = objectMapper.readTree(checkVolumeResult); jsonNode = objectMapper.readTree(checkVolumeResult);
} catch (JsonProcessingException e) { } catch (JsonProcessingException e) {
String msg = String.format("Error processing response %s during check volume %s", checkVolumeResult, e.getMessage()); String msg = String.format("Error processing response %s during check volume %s", checkVolumeResult, e.getMessage());
s_logger.info(msg); logger.info(msg);
return skipRepairVolumeCommand(command, checkVolumeResult, msg); return skipRepairVolumeCommand(command, checkVolumeResult, msg);
} }
@ -157,7 +154,7 @@ public class LibvirtCheckAndRepairVolumeCommandWrapper extends CommandWrapper<Ch
} }
private CheckAndRepairVolumeAnswer skipRepairVolumeCommand(CheckAndRepairVolumeCommand command, String checkVolumeResult, String msg) { private CheckAndRepairVolumeAnswer skipRepairVolumeCommand(CheckAndRepairVolumeCommand command, String checkVolumeResult, String msg) {
s_logger.info(msg); logger.info(msg);
String jsonStringFormat = String.format("{ \"message\": \"%s\" }", msg); String jsonStringFormat = String.format("{ \"message\": \"%s\" }", msg);
String finalResult = (checkVolumeResult != null ? checkVolumeResult.concat(",") : "") + jsonStringFormat; String finalResult = (checkVolumeResult != null ? checkVolumeResult.concat(",") : "") + jsonStringFormat;
CheckAndRepairVolumeAnswer answer = new CheckAndRepairVolumeAnswer(command, true, finalResult); CheckAndRepairVolumeAnswer answer = new CheckAndRepairVolumeAnswer(command, true, finalResult);