Michael Kublin has uploaded a new change for review.
Change subject: engine: Clean up of RecoveryStoragePoolCommand
......................................................................
engine: Clean up of RecoveryStoragePoolCommand
I made code more readable and removed some mess
Change-Id: I44e31df68e01e30e7c58c25dfcf31c7088fc392c
Signed-off-by: Michael Kublin <mkub...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RecoveryStoragePoolCommand.java
1 file changed, 13 insertions(+), 16 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/03/11203/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RecoveryStoragePoolCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RecoveryStoragePoolCommand.java
index a9296f9..bd82878 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RecoveryStoragePoolCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RecoveryStoragePoolCommand.java
@@ -4,7 +4,6 @@
import org.ovirt.engine.core.bll.NonTransactiveCommandAttribute;
import org.ovirt.engine.core.common.action.RecoveryStoragePoolParameters;
-import org.ovirt.engine.core.common.action.VdcActionParametersBase;
import org.ovirt.engine.core.common.businessentities.StorageDomainSharedStatus;
import org.ovirt.engine.core.common.businessentities.StorageDomainStatus;
import org.ovirt.engine.core.common.businessentities.StoragePoolIsoMap;
@@ -27,7 +26,7 @@
import org.ovirt.engine.core.utils.ejb.EjbUtils;
@NonTransactiveCommandAttribute(forceCompensation = true)
-public class RecoveryStoragePoolCommand extends ReconstructMasterDomainCommand
{
+public class RecoveryStoragePoolCommand extends
ReconstructMasterDomainCommand<RecoveryStoragePoolParameters> {
/**
* Constructor for command creation when compensation is applied on startup
@@ -42,11 +41,6 @@
super(parameters);
}
- private RecoveryStoragePoolParameters
getRecoveryStoragePoolParametersData() {
- VdcActionParametersBase tempVar = getParameters();
- return (RecoveryStoragePoolParameters) ((tempVar instanceof
RecoveryStoragePoolParameters) ? tempVar : null);
- }
-
@Override
public NGuid getStorageDomainId() {
super.setStorageDomainId(getMasterDomainIdFromDb());
@@ -56,10 +50,7 @@
@Override
protected boolean canDoAction() {
boolean returnValue = super.canDoAction() && checkStoragePool();
-
getReturnValue().getCanDoActionMessages().remove(VdcBllMessages.VAR__ACTION__RECONSTRUCT_MASTER.toString());
- addCanDoActionMessage(VdcBllMessages.VAR__ACTION__RECOVER_POOL);
- addCanDoActionMessage(VdcBllMessages.VAR__TYPE__STORAGE__DOMAIN);
if (returnValue) {
if (getStoragePool().getstatus() ==
StoragePoolStatus.Uninitialized) {
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_POOL_STATUS_ILLEGAL);
@@ -87,6 +78,12 @@
return returnValue;
}
+ @Override
+ protected void setActionMessageParameters() {
+ addCanDoActionMessage(VdcBllMessages.VAR__ACTION__RECOVER_POOL);
+ addCanDoActionMessage(VdcBllMessages.VAR__TYPE__STORAGE__DOMAIN);
+ }
+
protected void executeReconstruct(){
super.executeCommand();
}
@@ -96,8 +93,8 @@
try {
if
(StorageHelperDirector.getInstance().getItem(getStorageDomain().getstorage_type())
.connectStorageToDomainByVdsId(getNewMaster(false),
getVds().getId())) {
-
getRecoveryStoragePoolParametersData().setStorageDomainId(getStorageDomainId().getValue());
- ((EventQueue) EjbUtils.findBean(BeanType.EVENTQUEUE_MANAGER,
BeanProxyType.LOCAL)).submitEventSync(new
Event(getRecoveryStoragePoolParametersData().getStoragePoolId(),
+
getParameters().setStorageDomainId(getStorageDomainId().getValue());
+ ((EventQueue) EjbUtils.findBean(BeanType.EVENTQUEUE_MANAGER,
BeanProxyType.LOCAL)).submitEventSync(new
Event(getParameters().getStoragePoolId(),
_newMasterStorageDomainId,
null,
EventType.RECOVERY),
@@ -105,9 +102,9 @@
@Override
public EventResult call() {
StoragePoolIsoMap domainPoolMap =
- new
StoragePoolIsoMap(getRecoveryStoragePoolParametersData()
+ new StoragePoolIsoMap(getParameters()
.getNewMasterDomainId(),
-
getRecoveryStoragePoolParametersData().getStoragePoolId(),
+
getParameters().getStoragePoolId(),
StorageDomainStatus.Active);
DbFacade.getInstance()
.getStoragePoolIsoMapDao()
@@ -125,8 +122,8 @@
}
} finally {
if (!reconstructOpSucceeded) {
- getStoragePoolIsoMapDAO().remove(new
StoragePoolIsoMapId(getRecoveryStoragePoolParametersData()
- .getNewMasterDomainId(),
getRecoveryStoragePoolParametersData().getStoragePoolId()));
+ getStoragePoolIsoMapDAO().remove(new
StoragePoolIsoMapId(getParameters()
+ .getNewMasterDomainId(),
getParameters().getStoragePoolId()));
}
}
}
--
To view, visit http://gerrit.ovirt.org/11203
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I44e31df68e01e30e7c58c25dfcf31c7088fc392c
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Michael Kublin <mkub...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
