Sergey Gotliv has uploaded a new change for review. Change subject: engine: Disable iSCSI multipathing for datacenters < 3.4 ......................................................................
engine: Disable iSCSI multipathing for datacenters < 3.4 I had to fix a few issues in VDSM 3.4 in order to support configuration of iSCSI multipathing, therefore this feature should be disabled for earlier datacenter versions. Change-Id: I623cd917ca0871a9d3d09c2d30ec2dfc114d383e Signed-off-by: Sergey Gotliv <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/FeatureSupported.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java M packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql 5 files changed, 60 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/61/26661/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/FeatureSupported.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/FeatureSupported.java index 246eec3..401d4ae 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/FeatureSupported.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/FeatureSupported.java @@ -251,4 +251,13 @@ public static boolean mixedDomainTypesOnDataCenter(Version version) { return supportedInConfig(ConfigValues.MixedDomainTypesInDataCenter, version); } + + /** + * @param version + * Compatibility version to check for. + * @return <code>true</code> if iSCSI multipathing is supported for the given version. + */ + public static boolean isIscsiMultipathingSupported(Version version) { + return supportedInConfig(ConfigValues.IscsiMultipathingSupported, version); + } } 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 5e998c0..bbdccee 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 @@ -1647,5 +1647,9 @@ @DefaultValueAttribute("true") MixedDomainTypesInDataCenter, + @TypeConverterAttribute(Boolean.class) + @DefaultValueAttribute("true") + IscsiMultipathingSupported, + Invalid; } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java index 108f45e..fb46f72 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java @@ -114,7 +114,12 @@ SchedulerAllowOverBooking, SchedulerOverBookingThreshold, UserSessionTimeOutInterval(ConfigAuthType.User), - DefaultMaximumMigrationDowntime; + DefaultMaximumMigrationDowntime, + IsMigrationSupported(ConfigAuthType.User), + IsMemorySnapshotSupported(ConfigAuthType.User), + IsSuspendSupported(ConfigAuthType.User), + SerialNumberPolicySupported, + IscsiMultipathingSupported; public static enum ConfigAuthType { Admin, diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java index 3043522..95240bf 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java @@ -22,6 +22,7 @@ import org.ovirt.engine.core.common.businessentities.StorageType; import org.ovirt.engine.core.common.interfaces.SearchType; import org.ovirt.engine.core.common.mode.ApplicationMode; +import org.ovirt.engine.core.common.queries.ConfigurationValues; import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.queries.SearchParameters; import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; @@ -908,24 +909,33 @@ } private void updateIscsiBondListAvailability(StoragePool storagePool) { - AsyncDataProvider.getStorageConnectionsByDataCenterIdAndStorageType(new AsyncQuery(this, new INewAsyncCallback() { + boolean iscsiBondSupported = (Boolean) AsyncDataProvider.getConfigValuePreConverted( + ConfigurationValues.IscsiMultipathingSupported, + storagePool.getcompatibility_version().getValue() + ); - @Override - public void onSuccess(Object model, Object returnValue) { - boolean hasIscsiStorage = false; + if (iscsiBondSupported) { + AsyncDataProvider.getStorageConnectionsByDataCenterIdAndStorageType(new AsyncQuery(this, new INewAsyncCallback() { - ArrayList<StorageServerConnections> connections = (ArrayList<StorageServerConnections>) returnValue; + @Override + public void onSuccess(Object model, Object returnValue) { + boolean hasIscsiStorage = false; - for (StorageServerConnections connection : connections) { - if (connection.getstorage_type() == StorageType.ISCSI) { - hasIscsiStorage = true; - break; + ArrayList<StorageServerConnections> connections = (ArrayList<StorageServerConnections>) returnValue; + + for (StorageServerConnections connection : connections) { + if (connection.getstorage_type() == StorageType.ISCSI) { + hasIscsiStorage = true; + break; + } } - } - iscsiBondListModel.setIsAvailable(hasIscsiStorage); - } - }), storagePool.getId(), StorageType.ISCSI); + iscsiBondListModel.setIsAvailable(hasIscsiStorage); + } + }), storagePool.getId(), StorageType.ISCSI); + } else { + iscsiBondListModel.setIsAvailable(false); + } } @Override diff --git a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql index a3482db..0da8853 100644 --- a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -218,6 +218,7 @@ select fn_db_add_config_value('DefaultRouteSupported','false','3.1'); select fn_db_add_config_value('DefaultRouteSupported','false','3.2'); select fn_db_add_config_value('DefaultRouteSupported','false','3.3'); +<<<<<<< HEAD -- Mixed domain types in a data center support select fn_db_add_config_value('MixedDomainTypesInDataCenter','false','3.0'); @@ -226,6 +227,23 @@ select fn_db_add_config_value('MixedDomainTypesInDataCenter','false','3.3'); select fn_db_add_config_value('MixedDomainTypesInDataCenter','true','3.4'); +select fn_db_add_config_value('SerialNumberPolicySupported','false','3.0'); +select fn_db_add_config_value('SerialNumberPolicySupported','false','3.1'); +select fn_db_add_config_value('SerialNumberPolicySupported','false','3.2'); +select fn_db_add_config_value('SerialNumberPolicySupported','false','3.3'); +select fn_db_add_config_value('SerialNumberPolicySupported','false','3.4'); + +select fn_db_add_config_value('OvfStoreOnAnyDomain','false','3.0'); +select fn_db_add_config_value('OvfStoreOnAnyDomain','false','3.1'); +select fn_db_add_config_value('OvfStoreOnAnyDomain','false','3.2'); +select fn_db_add_config_value('OvfStoreOnAnyDomain','false','3.3'); +select fn_db_add_config_value('OvfStoreOnAnyDomain','false','3.4'); + +select fn_db_add_config_value('IscsiMultipathingSupported','false','3.0'); +select fn_db_add_config_value('IscsiMultipathingSupported','false','3.1'); +select fn_db_add_config_value('IscsiMultipathingSupported','false','3.2'); +select fn_db_add_config_value('IscsiMultipathingSupported','false','3.3'); + -- by default use no proxy select fn_db_add_config_value('SpiceProxyDefault','','general'); -- To view, visit http://gerrit.ovirt.org/26661 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I623cd917ca0871a9d3d09c2d30ec2dfc114d383e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Sergey Gotliv <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
