Vered Volansky has uploaded a new change for review. Change subject: core: cleanup - removed unused code ......................................................................
core: cleanup - removed unused code As part of storage allocation checks refactoring, some deprecated methods are no longer used. Some lingered in the code, and are now removed. Change-Id: I2b9f46e6763d84adce2fbc98c9375a4146b22873 Related-To:https://bugzilla.redhat.com/960934 Signed-off-by: Vered Volansky <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/StorageDomainValidator.java 2 files changed, 0 insertions(+), 46 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/74/33474/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java index 1db25db..b522b15 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java @@ -676,48 +676,6 @@ * * @param storagePoolId * The storage pool where the search for a domain will be made - * @param sizeRequested - * The free size we need to have in the domain, in gigabytes - * @param domain2reservedSpaceInDomain - * Maps storage domain to size we already reserved on it - * @return storage domain in the given pool with at least the required amount of free space, - * or null if no such storage domain exists in the pool - * - * This method is deprecated. Instead use findStorageDomainForMemory(Guid storagePoolId, List<DiskImage> disksList), - * and prepare the relevant dikslisk (probably dummies to reflect size). - */ - @Deprecated - public static StorageDomain findStorageDomainForMemory(Guid storagePoolId, long sizeRequested, - Map<StorageDomain, Integer> domain2reservedSpaceInDomain) { - List<StorageDomain> domainsInPool = DbFacade.getInstance().getStorageDomainDao().getAllForStoragePool(storagePoolId); - for (StorageDomain currDomain : domainsInPool) { - long reservedSizeForDisks = domain2reservedSpaceInDomain.containsKey(currDomain) ? - domain2reservedSpaceInDomain.get(currDomain) : 0; - long sizeNeeded = sizeRequested + reservedSizeForDisks; - if (currDomain.getStorageDomainType().isDataDomain() - && currDomain.getStatus() == StorageDomainStatus.Active - && doesStorageDomainHaveSpaceForRequest(currDomain, sizeNeeded)) { - return currDomain; - } - } - return null; - } - - /** - * This method is deprecated. Instead use doesStorageDomainHaveSpaceForRequest(StorageDomain storageDomain, List<DiskImage> disksList). - */ - @Deprecated - private static boolean doesStorageDomainHaveSpaceForRequest(StorageDomain storageDomain, long sizeRequested) { - // not calling validate in order not to add the messages per domain - return (new StorageDomainValidator(storageDomain).isDomainHasSpaceForRequest(sizeRequested)).isValid(); - } - - /** - * Returns a <code>StorageDomain</code> in the given <code>StoragePool</code> that has - * at least as much as requested free space and can be used to store memory images - * - * @param storagePoolId - * The storage pool where the search for a domain will be made * @param disksList * Disks for which space is needed * @return storage domain in the given pool with at least the required amount of free space, diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/StorageDomainValidator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/StorageDomainValidator.java index 699eb3a..85fb37b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/StorageDomainValidator.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/StorageDomainValidator.java @@ -94,10 +94,6 @@ return ValidationResult.VALID; } - private DbFacade getDbFacade() { - return DbFacade.getInstance(); - } - private static Integer getLowDiskSpaceThreshold() { return Config.<Integer> getValue(ConfigValues.FreeSpaceCriticalLowInGB); } -- To view, visit http://gerrit.ovirt.org/33474 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2b9f46e6763d84adce2fbc98c9375a4146b22873 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Vered Volansky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
