Federico Simoncelli has uploaded a new change for review.
Change subject: core: improve use of updateStorageDomainFormat
......................................................................
core: improve use of updateStorageDomainFormat
Change-Id: I57a85ed4ef208d1161e8bf0cd436b2e9f036a385
Signed-off-by: Federico Simoncelli <fsimo...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AttachStorageDomainToPoolCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RecoveryStoragePoolCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java
3 files changed, 22 insertions(+), 15 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/04/36804/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AttachStorageDomainToPoolCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AttachStorageDomainToPoolCommand.java
index 5cd734e..2bbf80b 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AttachStorageDomainToPoolCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AttachStorageDomainToPoolCommand.java
@@ -181,9 +181,8 @@
}
// upgrade the domain format to the storage pool
format
- if (sdType == StorageDomainType.Data || sdType ==
StorageDomainType.Master) {
- updateStorageDomainFormat(getStorageDomain());
- }
+
updateStorageDomainFormatIfNeeded(getStorageDomain());
+
registerAllOvfDisks(getAllOVFDisks());
// Update unregistered entities
for (OvfEntityData ovf :
unregisteredEntitiesFromOvfDisk) {
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 584cec0..bbe81f1 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
@@ -128,7 +128,7 @@
}
if (returnVal.getSucceeded()) {
-
updateStorageDomainFormat(loadTargetedMasterDomain());
+
updateStorageDomainFormatIfNeeded(loadTargetedMasterDomain());
}
setSucceeded(returnVal.getSucceeded());
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java
index 6fdd662..3db635e 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java
@@ -342,18 +342,26 @@
}
}
- protected void updateStorageDomainFormat(StorageDomain domain) {
- StorageDomainType sdType = domain.getStorageDomainType();
- if (sdType == StorageDomainType.Data || sdType ==
StorageDomainType.Master) {
- final StorageDomainStatic storageStaticData =
domain.getStorageStaticData();
- final StorageFormatType targetFormat =
getStoragePool().getStoragePoolFormatType();
+ protected void updateStorageDomainFormatIfNeeded(StorageDomain domain) {
+ final StorageDomainType sdType = domain.getStorageDomainType();
- if (storageStaticData.getStorageFormat() != targetFormat) {
- log.info("Updating storage domain '{}' (type '{}') to format
'{}'",
- getStorageDomain().getId(), sdType, targetFormat);
- storageStaticData.setStorageFormat(targetFormat);
- getStorageDomainStaticDAO().update(storageStaticData);
- }
+ if (sdType != StorageDomainType.Data && sdType !=
StorageDomainType.Master) {
+ log.debug("Skipping format update for domain '{}' (type '{}')",
+ getStorageDomain().getId(), sdType);
+ return;
+ }
+
+ final StorageDomainStatic storageStaticData =
domain.getStorageStaticData();
+ final StorageFormatType targetFormat =
getStoragePool().getStoragePoolFormatType();
+
+ if (storageStaticData.getStorageFormat() != targetFormat) {
+ log.info("Updating storage domain '{}' (type '{}') to format '{}'",
+ getStorageDomain().getId(), sdType, targetFormat);
+ storageStaticData.setStorageFormat(targetFormat);
+ getStorageDomainStaticDAO().update(storageStaticData);
+ } else {
+ log.debug("Skipping format update for domain '{}' format is '{}'",
+ getStorageDomain().getId(),
storageStaticData.getStorageFormat());
}
}
--
To view, visit http://gerrit.ovirt.org/36804
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I57a85ed4ef208d1161e8bf0cd436b2e9f036a385
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
