Liron Aravot has uploaded a new change for review. Change subject: core: prevent master version update on storage pool update ......................................................................
core: prevent master version update on storage pool update When updating storage pool the update may revert the master version to a previous one, updates to the master version should be done through a dedicated stored procedure. Change-Id: Ibcbbdace9b4a1a4803489c661f3510e2d7e91f5c Signed-off-by: Liron Aravot <[email protected]> --- M backend/manager/dbscripts/storages_sp.sql M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StoragePoolDAODbFacadeImpl.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StoragePoolDAOTest.java 3 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/57/11657/1 diff --git a/backend/manager/dbscripts/storages_sp.sql b/backend/manager/dbscripts/storages_sp.sql index abea8ae..980b4e2 100644 --- a/backend/manager/dbscripts/storages_sp.sql +++ b/backend/manager/dbscripts/storages_sp.sql @@ -30,7 +30,6 @@ v_storage_pool_type INTEGER, v_status INTEGER, v_storage_pool_format_type VARCHAR(50), - v_master_domain_version INTEGER, v_spm_vds_id UUID , v_compatibility_version VARCHAR(40), v_quota_enforcement_type INTEGER) @@ -41,7 +40,7 @@ BEGIN UPDATE storage_pool SET description = v_description,name = v_name,storage_pool_type = v_storage_pool_type, - status = v_status,storage_pool_format_type = v_storage_pool_format_type,master_domain_version = v_master_domain_version, + status = v_status,storage_pool_format_type = v_storage_pool_format_type, spm_vds_id = v_spm_vds_id,compatibility_version = v_compatibility_version, _update_date = LOCALTIMESTAMP,quota_enforcement_type=v_quota_enforcement_type WHERE id = v_id; diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StoragePoolDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StoragePoolDAODbFacadeImpl.java index 08e3759..6f875dd 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StoragePoolDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StoragePoolDAODbFacadeImpl.java @@ -324,8 +324,6 @@ .addValue("storage_pool_type", pool.getstorage_pool_type()) .addValue("status", pool.getstatus()) .addValue("storage_pool_format_type", pool.getStoragePoolFormatType()) - .addValue("master_domain_version", - pool.getmaster_domain_version()) .addValue("spm_vds_id", pool.getspm_vds_id()) .addValue("compatibility_version", pool.getcompatibility_version()) diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StoragePoolDAOTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StoragePoolDAOTest.java index e4e6e4c..c477c52 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StoragePoolDAOTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StoragePoolDAOTest.java @@ -243,11 +243,14 @@ public void testUpdate() { existingPool.setdescription("Farkle"); existingPool.setStoragePoolFormatType(StorageFormatType.V1); + existingPool.setmaster_domain_version(existingPool.getmaster_domain_version() + 1); dao.update(existingPool); storage_pool result = dao.get(existingPool.getId()); + existingPool.setmaster_domain_version(existingPool.getmaster_domain_version() - 1); + assertEquals(existingPool.getmaster_domain_version(), result.getmaster_domain_version()); assertGetResult(result); } -- To view, visit http://gerrit.ovirt.org/11657 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibcbbdace9b4a1a4803489c661f3510e2d7e91f5c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Liron Aravot <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
