Martin Peřina has uploaded a new change for review. Change subject: core: Remove overridden getUsername() in Start/Stop/RestartVdsCommand ......................................................................
core: Remove overridden getUsername() in Start/Stop/RestartVdsCommand Removes overridden getUsername() method, which handles empty username when commands were executed from Quartz job. This customization is no longer necessary as it was fixed globally for all Quartz executed commands in patch Ibc7bae0be74d3a5f7c5b7cfc4f3827a1dcfda8b7. Change-Id: Id828addd0eb388a2ce37d3d9ead8c89e5b5506a9 Bug-Url: https://bugzilla.redhat.com/1182510 Signed-off-by: Martin Perina <mper...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/FenceVdsBaseCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/RestartVdsCommand.java 2 files changed, 0 insertions(+), 18 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/40/39840/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/FenceVdsBaseCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/FenceVdsBaseCommand.java index 367e766..01d23a3 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/FenceVdsBaseCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/FenceVdsBaseCommand.java @@ -4,7 +4,6 @@ import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.bll.Backend; import org.ovirt.engine.core.bll.LockMessagesMatchUtil; import org.ovirt.engine.core.bll.VdsCommand; @@ -34,8 +33,6 @@ import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBase; public abstract class FenceVdsBaseCommand<T extends FenceVdsActionParameters> extends VdsCommand<T> { - private static final String INTERNAL_FENCE_USER = "Engine"; - protected FenceValidator fenceValidator; /** @@ -175,12 +172,6 @@ getBackend().getResourceManager().RunVdsCommand(VDSCommandType.SetVdsStatus, new SetVdsStatusVDSCommandParameters(getVds().getId(), status)); } - } - - @Override - public String getUserName() { - String userName = super.getUserName(); - return StringUtils.isEmpty(userName) ? INTERNAL_FENCE_USER : userName; } @Override diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/RestartVdsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/RestartVdsCommand.java index 7fbc747..2d6255f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/RestartVdsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/RestartVdsCommand.java @@ -12,7 +12,6 @@ import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.bll.LockMessagesMatchUtil; import org.ovirt.engine.core.bll.NonTransactiveCommandAttribute; import org.ovirt.engine.core.bll.VdsCommand; @@ -51,8 +50,6 @@ */ @NonTransactiveCommandAttribute public class RestartVdsCommand<T extends FenceVdsActionParameters> extends VdsCommand<T> { - - private static final String INTERNAL_FENCE_USER = "Engine"; protected boolean skippedDueToFencingPolicy; @@ -212,12 +209,6 @@ skipped = fenceResult.getStatus() == Status.SKIPPED_DUE_TO_POLICY; } return skipped; - } - - @Override - public String getUserName() { - String userName = super.getUserName(); - return StringUtils.isEmpty(userName) ? INTERNAL_FENCE_USER : userName; } @Override -- To view, visit https://gerrit.ovirt.org/39840 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id828addd0eb388a2ce37d3d9ead8c89e5b5506a9 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <mper...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
