Yaniv Bronhaim has uploaded a new change for review. Change subject: core: add vdsName to vdsBroker log info (#853883) ......................................................................
core: add vdsName to vdsBroker log info (#853883) https://bugzilla.redhat.com/show_bug.cgi?id=853883 Change-Id: Ieb0589bb5f5e157c04f85e46f6769d66ef98b2d1 Signed-off-by: Yaniv Bronhaim <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/IsVmDuringInitiatingVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/SetVmStatusVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VDSCommandBase.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsIdVDSCommandBase.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerCommand.java 5 files changed, 33 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/61/7861/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/IsVmDuringInitiatingVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/IsVmDuringInitiatingVDSCommand.java index 2505510..85e2c2b 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/IsVmDuringInitiatingVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/IsVmDuringInitiatingVDSCommand.java @@ -3,7 +3,7 @@ import org.ovirt.engine.core.common.vdscommands.*; public class IsVmDuringInitiatingVDSCommand<P extends IsVmDuringInitiatingVDSCommandParameters> - extends VDSCommandBase<P> { +extends VDSCommandBase<P> { public IsVmDuringInitiatingVDSCommand(P parameters) { super(parameters); } @@ -11,6 +11,11 @@ @Override protected void ExecuteVDSCommand() { getVDSReturnValue().setReturnValue(ResourceManager.getInstance() - .IsVmDuringInitiating(getParameters().getVmId())); + .IsVmDuringInitiating(getParameters().getVmId())); + } + + @Override + protected String getAdditionalInformation() { + return ""; } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/SetVmStatusVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/SetVmStatusVDSCommand.java index ba8ddd9..5ca4c60 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/SetVmStatusVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/SetVmStatusVDSCommand.java @@ -40,4 +40,9 @@ } DbFacade.getInstance().getVmDynamicDAO().update(vmDynamic); } + + @Override + protected String getAdditionalInformation() { + return ""; + } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VDSCommandBase.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VDSCommandBase.java index a453f33..2a3cbe2 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VDSCommandBase.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VDSCommandBase.java @@ -45,12 +45,6 @@ } @Override - public String toString() { - return String.format("%s(%s)", super.toString(), - (getParameters() != null ? getParameters().toString() : "null")); - } - - @Override protected void ExecuteCommand() { try { // creating ReturnValue object since execute can be called more than once (failover) @@ -112,6 +106,15 @@ log.errorFormat("Command {0} execution failed. Exception: {1}", getCommandName(), ExceptionUtils.getMessage(ex)); } + protected abstract String getAdditionalInformation(); + + @Override + public String toString() { + return String.format("%s(%s %s)", super.toString(), + (!getAdditionalInformation().isEmpty() ? getAdditionalInformation() + ", " : ""), + (getParameters() != null ? getParameters().toString() : "null")); + } + protected abstract void ExecuteVDSCommand(); private static Log log = LogFactory.getLog(VDSCommandBase.class); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsIdVDSCommandBase.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsIdVDSCommandBase.java index de7d747..8368bab 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsIdVDSCommandBase.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsIdVDSCommandBase.java @@ -15,11 +15,22 @@ public abstract class VdsIdVDSCommandBase<P extends VdsIdVDSCommandParametersBase> extends VDSCommandBase<P> { protected VdsManager _vdsManager; + public VdsIdVDSCommandBase(P parameters) { super(parameters); _vdsManager = ResourceManager.getInstance().GetVdsManager(parameters.getVdsId()); } + @Override + protected String getAdditionalInformation() { + if (getVds() != null) { + return String.format("Vds: %1$s", getVds().getvds_name()); + } else { + return ""; + } + + } + protected Guid getVdsId() { return getParameters().getVdsId(); } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerCommand.java index 0228db7..27a02eb 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerCommand.java @@ -62,7 +62,7 @@ @Override protected String getAdditionalInformation() { if (getVds() != null) { - return String.format("Vds: %1$s", getVds().getvds_name()); + return String.format("Vds=%1$s", getVds().getvds_name()); } else { return super.getAdditionalInformation(); } -- To view, visit http://gerrit.ovirt.org/7861 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieb0589bb5f5e157c04f85e46f6769d66ef98b2d1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
