Michael Kublin has uploaded a new change for review. Change subject: core: Removing auto-recovery code for storage domains ......................................................................
core: Removing auto-recovery code for storage domains Because of change which were done at error storage flows no need for speciall code in auto-recovery, when domain will be seen by vdsm it will be automaticlly switched to Active status. These is possible because of no more disconnect and deactivate is send when domain in error state Change-Id: I04f25dca8888b19711a840aed150227437972d65 Signed-off-by: Michael Kublin <[email protected]> --- M backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AutoRecoveryManager.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AutoRecoveryManagerTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java 4 files changed, 2 insertions(+), 33 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/15/8015/1 diff --git a/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql b/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql index 73a167e..2d3c3be 100644 --- a/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -603,6 +603,7 @@ select fn_db_update_config_value('VmGracefulShutdownMessage','The Engine is shutting down this Virtual Machine','general'); select fn_db_update_config_value('DisconnectPoolOnReconstruct','0,2,3','general'); select fn_db_update_config_value('SupportBridgesReportByVDSM','false','3.1'); +select fn_db_update_config_value('AutoRecoveryAllowedTypes','{\"hosts\":\"false\"}','general'); ------------------------------------------------------------------------------------ diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AutoRecoveryManager.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AutoRecoveryManager.java index 36f18e0..7b4ada1 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AutoRecoveryManager.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AutoRecoveryManager.java @@ -4,13 +4,11 @@ import java.util.Map; import org.ovirt.engine.core.bll.interfaces.BackendInternal; -import org.ovirt.engine.core.common.action.StorageDomainPoolParametersBase; import org.ovirt.engine.core.common.action.VdcActionParametersBase; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.action.VdsActionParameters; import org.ovirt.engine.core.common.businessentities.BusinessEntity; import org.ovirt.engine.core.common.businessentities.VDS; -import org.ovirt.engine.core.common.businessentities.storage_domains; import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.compat.Guid; @@ -61,17 +59,6 @@ return params; } }, "hosts"); - check(dbFacade.getStorageDomainDAO(), - VdcActionType.ActivateStorageDomain, - new DoWithClosure<storage_domains, VdcActionParametersBase>() { - @Override - public VdcActionParametersBase doWith(final storage_domains arg) { - final StorageDomainPoolParametersBase params = new StorageDomainPoolParametersBase( - arg.getId(), new Guid(arg.getstorage_pool_id().getUuid())); - params.setRunSilent(true); - return params; - } - }, "storage domains"); } /** diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AutoRecoveryManagerTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AutoRecoveryManagerTest.java index 3cdc9b8..fe18cbe 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AutoRecoveryManagerTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AutoRecoveryManagerTest.java @@ -26,12 +26,9 @@ import org.ovirt.engine.core.common.action.VdcActionParametersBase; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.VDS; -import org.ovirt.engine.core.common.businessentities.storage_domains; import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; -import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.dbbroker.DbFacade; -import org.ovirt.engine.core.dao.StorageDomainDAO; import org.ovirt.engine.core.dao.VdsDAO; import org.ovirt.engine.core.utils.MockConfigRule; @@ -48,7 +45,6 @@ // Entities needing recovery private List<VDS> vdss = new ArrayList<VDS>(); - private List<storage_domains> storageDomains = new ArrayList<storage_domains>(); @Before public void setup() { @@ -62,38 +58,23 @@ vdss.add(vds); when(vdsDaoMock.listFailedAutorecoverables()).thenReturn(vdss); when(dbFacadeMock.getVdsDAO()).thenReturn(vdsDaoMock); - - storage_domains domain = new storage_domains(); - domain.setstorage_pool_id(Guid.NewGuid()); - storageDomains.add(domain); - final StorageDomainDAO storageDomainDaoMock = mock(StorageDomainDAO.class); - when(storageDomainDaoMock.listFailedAutorecoverables()).thenReturn(storageDomains); - when(dbFacadeMock.getStorageDomainDAO()).thenReturn(storageDomainDaoMock); } @Test public void onTimerFullConfig() { - Config.<Map<String, String>> GetValue(ConfigValues.AutoRecoveryAllowedTypes).put("storage domains", - Boolean.TRUE.toString()); Config.<Map<String, String>> GetValue(ConfigValues.AutoRecoveryAllowedTypes).put("hosts", Boolean.TRUE.toString()); manager.onTimer(); verify(backendMock, times(vdss.size())).runInternalAction(eq(VdcActionType.ActivateVds), any(VdcActionParametersBase.class)); - verify(backendMock, times(storageDomains.size())).runInternalAction(eq(VdcActionType.ActivateStorageDomain), - any(VdcActionParametersBase.class)); } @Test public void onTimerFalseConfig() { - Config.<Map<String, String>> GetValue(ConfigValues.AutoRecoveryAllowedTypes).put("storage domains", - Boolean.FALSE.toString()); Config.<Map<String, String>> GetValue(ConfigValues.AutoRecoveryAllowedTypes).put("hosts", Boolean.FALSE.toString()); manager.onTimer(); verify(backendMock, never()).runInternalAction(eq(VdcActionType.ActivateVds), - any(VdcActionParametersBase.class)); - verify(backendMock, never()).runInternalAction(eq(VdcActionType.ActivateStorageDomain), any(VdcActionParametersBase.class)); } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java index d2c1a66..51a413c 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java @@ -1392,7 +1392,7 @@ @Reloadable @TypeConverterAttribute(Map.class) - @DefaultValueAttribute("{\"storage domains\":\"false\",\"hosts\":\"false\"}") + @DefaultValueAttribute("{\"hosts\":\"false\"}") AutoRecoveryAllowedTypes(371), // <HW UUID>_<lowest MAC> -- To view, visit http://gerrit.ovirt.org/8015 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I04f25dca8888b19711a840aed150227437972d65 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Michael Kublin <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
