Daniel Erez has uploaded a new change for review. Change subject: core: exclude Cinder domains from monitoring ......................................................................
core: exclude Cinder domains from monitoring Exclude Cinder storage domains form domain monitoring (until adding an appropriate support): Altered: * storages_san_sp -> Getstorage_pool_iso_mapsByBystorage_pool_id * storages_sp -> GetStorageDomainIdsByStoragePoolIdAndStatus_rs Change-Id: If63e0156ed0c60e265d04f1dbb53f7c48b0e50cb Bug-Url: https://bugzilla.redhat.com/1185826 Signed-off-by: Daniel Erez <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsProxyData.java M packaging/dbscripts/storages_san_sp.sql M packaging/dbscripts/storages_sp.sql 3 files changed, 10 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/13/38913/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsProxyData.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsProxyData.java index c66cc0c..c964eb4 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsProxyData.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsProxyData.java @@ -312,6 +312,7 @@ for (final StorageDomain domainInDb : domainsInDb) { if (domainInDb.getStorageDomainType() != StorageDomainType.Master && domainInDb.getStatus() != StorageDomainStatus.Locked + && !domainInDb.getStorageType().isOpenStackDomain() && !domainsInVds.contains(domainInDb.getId())) { // domain not attached to pool anymore DbFacade.getInstance() diff --git a/packaging/dbscripts/storages_san_sp.sql b/packaging/dbscripts/storages_san_sp.sql index abd6aff..3d2c3bd 100644 --- a/packaging/dbscripts/storages_san_sp.sql +++ b/packaging/dbscripts/storages_san_sp.sql @@ -293,9 +293,11 @@ v_storage_pool_id UUID) RETURNS SETOF storage_pool_iso_map STABLE AS $procedure$ BEGIN - RETURN QUERY SELECT * + RETURN QUERY SELECT storage_pool_iso_map.* FROM storage_pool_iso_map - WHERE storage_pool_id = v_storage_pool_id; + INNER JOIN storage_domain_static on storage_pool_iso_map.storage_id = storage_domain_static.id + WHERE storage_pool_id = v_storage_pool_id + AND storage_domain_static.storage_type != 9; END; $procedure$ LANGUAGE plpgsql; diff --git a/packaging/dbscripts/storages_sp.sql b/packaging/dbscripts/storages_sp.sql index 86ac378..9200078 100644 --- a/packaging/dbscripts/storages_sp.sql +++ b/packaging/dbscripts/storages_sp.sql @@ -567,9 +567,11 @@ BEGIN RETURN QUERY SELECT storage_id - FROM storage_pool_iso_map - WHERE storage_pool_id = v_storage_pool_id - AND status = v_status; + FROM storage_pool_iso_map + INNER JOIN storage_domain_static on storage_pool_iso_map.storage_id = storage_domain_static.id + WHERE storage_pool_id = v_storage_pool_id + AND status = v_status + AND storage_domain_static.storage_type != 9; END; $procedure$ LANGUAGE plpgsql; -- To view, visit https://gerrit.ovirt.org/38913 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If63e0156ed0c60e265d04f1dbb53f7c48b0e50cb Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Daniel Erez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
