anmolbabu has uploaded a new change for review. Change subject: webadmin,engine : allow user to set tuned profile ......................................................................
webadmin,engine : allow user to set tuned profile Allow user to set tuned profile. Change-Id: I4ef3f957dfcc40cef8de541898fbc08d698d0ce7 Signed-off-by: Anmol Babu <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterTunedProfilesQuery.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSGroup.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/VdcQueryType.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAODbFacadeImpl.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.ui.xml M ovirt-engine.spec.in A packaging/dbscripts/upgrade/03_06_1260_add_tuned_profile_column_to_vds_groups.sql M packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql M packaging/dbscripts/vds_groups_sp.sql M pom.xml 16 files changed, 113 insertions(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/69/40569/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java index 90442bd..de5304d 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java @@ -60,6 +60,7 @@ import org.ovirt.ovirt_host_deploy.constants.Const; import org.ovirt.ovirt_host_deploy.constants.Displays; import org.ovirt.ovirt_host_deploy.constants.GlusterEnv; +import org.ovirt.ovirt_host_deploy.constants.TuneEnv; import org.ovirt.ovirt_host_deploy.constants.KdumpEnv; import org.ovirt.ovirt_host_deploy.constants.OpenStackEnv; import org.ovirt.ovirt_host_deploy.constants.VdsmEnv; @@ -470,6 +471,18 @@ return true; }}, new Callable<Boolean>() { public Boolean call() throws Exception { + VDSGroup vdsGroup = DbFacade.getInstance().getVdsGroupDao().get( + _vds.getVdsGroupId() + ); + String tunedProfile = vdsGroup.supportsGlusterService() ? vdsGroup.getGlusterTunedProfile() : null; + if (tunedProfile == null || tunedProfile.isEmpty()) { + _parser.cliNoop(); + } else { + _parser.cliEnvironmentSet(TuneEnv.TUNED_PROFILE, tunedProfile); + } + return true; + }}, + new Callable<Boolean>() { public Boolean call() throws Exception { /** * Legacy logic * Force reboot only if not node. diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterTunedProfilesQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterTunedProfilesQuery.java new file mode 100644 index 0000000..40d626c --- /dev/null +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterTunedProfilesQuery.java @@ -0,0 +1,21 @@ +package org.ovirt.engine.core.bll.gluster; + +import java.util.Arrays; + +import org.ovirt.engine.core.bll.QueriesCommandBase; +import org.ovirt.engine.core.common.config.Config; +import org.ovirt.engine.core.common.config.ConfigValues; +import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; + +public class GetGlusterTunedProfilesQuery<P extends VdcQueryParametersBase> extends QueriesCommandBase<P> { + + public GetGlusterTunedProfilesQuery(P parameters) { + super(parameters); + } + + @Override + protected void executeQueryCommand() { + getQueryReturnValue().setReturnValue(Arrays.asList(Config.<String> getValue(ConfigValues.GlusterTunedProfile).split(","))); + } + +} diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSGroup.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSGroup.java index 2a66cdc..1d577b7 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSGroup.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSGroup.java @@ -103,6 +103,7 @@ private FencingPolicy fencingPolicy; + private String glusterTunedProfile; public VDSGroup() { migrateOnError = MigrateOnErrorOptions.YES; @@ -386,6 +387,14 @@ this.fencingPolicy = fencingPolicy; } + public String getGlusterTunedProfile() { + return glusterTunedProfile; + } + + public void setGlusterTunedProfile(String glusterTunedProfile) { + this.glusterTunedProfile = glusterTunedProfile; + } + @Override public int hashCode() { final int prime = 31; @@ -418,6 +427,7 @@ result = prime * result + (customSerialNumber == null ? 0 : customSerialNumber.hashCode()); result = prime * result + (groupHostsAndVms == null ? 0 : groupHostsAndVms.hashCode()); result = prime * result + (fencingPolicy == null ? 0 : fencingPolicy.hashCode()); + result = prime * result + (glusterTunedProfile == null ? 0 : glusterTunedProfile.hashCode()); return result; } @@ -472,7 +482,8 @@ && ObjectUtils.objectsEqual(customSerialNumber, other.customSerialNumber) && ObjectUtils.objectsEqual(groupHostsAndVms, other.groupHostsAndVms) && ObjectUtils.objectsEqual(requiredRngSources, other.requiredRngSources) - && ObjectUtils.objectsEqual(fencingPolicy, other.fencingPolicy); + && ObjectUtils.objectsEqual(fencingPolicy, other.fencingPolicy) + && ObjectUtils.objectsEqual(glusterTunedProfile, other.glusterTunedProfile); } } 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 10c6951..d510e47 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 @@ -1464,6 +1464,10 @@ @DefaultValueAttribute("true") GlusterVolumeSnapshotSupported, + @TypeConverterAttribute(String.class) + @DefaultValueAttribute("") + GlusterTunedProfile, + @TypeConverterAttribute(Boolean.class) @DefaultValueAttribute("true") GlusterBrickProvisioningEnabled, diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java index ad9173e..d133f3d 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java @@ -345,6 +345,7 @@ GetGlusterStorageDevices, GetGlusterVolumeSnapshotScheduleByVolumeId, GetUnusedGlusterBricks, + GetGlusterTunedProfiles, GetDefaultConfigurationVersion(VdcQueryAuthType.User), OsRepository(VdcQueryAuthType.User), diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAODbFacadeImpl.java index e8777a4..a5db0d4 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAODbFacadeImpl.java @@ -232,7 +232,8 @@ .addValue("skip_fencing_if_sd_active", group.getFencingPolicy().isSkipFencingIfSDActive()) .addValue("skip_fencing_if_connectivity_broken", group.getFencingPolicy().isSkipFencingIfConnectivityBroken()) .addValue("hosts_with_broken_connectivity_threshold", group.getFencingPolicy().getHostsWithBrokenConnectivityThreshold()) - .addValue("fencing_enabled", group.getFencingPolicy().isFencingEnabled()); + .addValue("fencing_enabled", group.getFencingPolicy().isFencingEnabled()) + .addValue("gluster_tuned_profile", group.getGlusterTunedProfile()); return parameterSource; } @@ -297,6 +298,7 @@ entity.getFencingPolicy().setSkipFencingIfConnectivityBroken(rs.getBoolean("skip_fencing_if_connectivity_broken")); entity.getFencingPolicy().setHostsWithBrokenConnectivityThreshold(rs.getInt("hosts_with_broken_connectivity_threshold")); entity.getFencingPolicy().setFencingEnabled(rs.getBoolean("fencing_enabled")); + entity.setGlusterTunedProfile(rs.getString("gluster_tuned_profile")); return entity; } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java index 584fec9..fb7492d 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java @@ -404,6 +404,8 @@ clusterModel.getArchitecture().setSelectedItem(cluster.getArchitecture()); clusterModel.getSerialNumberPolicy().setSelectedSerialNumberPolicy(cluster.getSerialNumberPolicy()); clusterModel.getSerialNumberPolicy().getCustomSerialNumber().setEntity(cluster.getCustomSerialNumber()); + clusterModel.getGlusterTunedProfile().setSelectedItem(cluster.getGlusterTunedProfile()); + clusterModel.getGlusterTunedProfile().setIsChangable(cluster.getGroupHostsAndVms().getHosts() == 0); if (cluster.supportsTrustedService()) { @@ -760,6 +762,8 @@ cluster.setSerialNumberPolicy(model.getSerialNumberPolicy().getSelectedSerialNumberPolicy()); cluster.setCustomSerialNumber(model.getSerialNumberPolicy().getCustomSerialNumber().getEntity()); + cluster.setGlusterTunedProfile(model.getGlusterTunedProfile().getSelectedItem()); + cluster.getRequiredRngSources().clear(); if (Boolean.TRUE.equals(model.getRngRandomSourceRequired().getEntity())) { cluster.getRequiredRngSources().add(VmRngDevice.Source.RANDOM); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java index bc009d5..6a1b67e 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java @@ -53,6 +53,15 @@ { private Map<Guid, PolicyUnit> policyUnitMap; private ListModel<ClusterPolicy> clusterPolicy; + private ListModel<String> glusterTunedProfile; + + public ListModel<String> getGlusterTunedProfile() { + return glusterTunedProfile; + } + + public void setGlusterTunedProfile(ListModel<String> glusterTunedProfile) { + this.glusterTunedProfile = glusterTunedProfile; + } public ListModel<ClusterPolicy> getClusterPolicy() { return clusterPolicy; @@ -817,6 +826,22 @@ super(); } + public void initTunedProfiles() { + this.startProgress(null); + Frontend.getInstance().runQuery(VdcQueryType.GetGlusterTunedProfiles, new VdcQueryParametersBase(), new AsyncQuery(new INewAsyncCallback() { + @Override + public void onSuccess(Object model, Object returnValue) { + ClusterModel.this.stopProgress(); + List<String> glusterTunedProfiles = new ArrayList<>(); + if (((VdcQueryReturnValue) returnValue).getSucceeded()) { + glusterTunedProfiles.addAll((List<String>)(((VdcQueryReturnValue) returnValue).getReturnValue())); + } + glusterTunedProfile.setItems(glusterTunedProfiles, glusterTunedProfile.getSelectedItem()); + glusterTunedProfile.setIsAvailable(glusterTunedProfile.getItems().size() > 0); + } + })); + } + public void init(final boolean isEdit) { setIsEdit(isEdit); setName(new EntityModel<String>()); @@ -827,6 +852,7 @@ setEnableOptionalReason(new EntityModel<Boolean>(false)); getEnableOptionalReason().setIsAvailable(ApplicationModeHelper.isModeSupported(ApplicationMode.VirtOnly)); setAllowClusterWithVirtGlusterEnabled(true); + setGlusterTunedProfile(new ListModel<String>()); AsyncDataProvider.getAllowClusterWithVirtGlusterEnabled(new AsyncQuery(this, new INewAsyncCallback() { @Override public void onSuccess(Object model, Object returnValue) { @@ -892,6 +918,10 @@ } } }); + getGlusterTunedProfile().setIsAvailable(getEnableGlusterService().getEntity()); + if (getEnableGlusterService().getEntity()) { + initTunedProfiles(); + } getEnableOvirtService().setEntity(ApplicationModeHelper.isModeSupported(ApplicationMode.VirtOnly)); getEnableOvirtService().setIsAvailable(ApplicationModeHelper.getUiMode() != ApplicationMode.VirtOnly && ApplicationModeHelper.isModeSupported(ApplicationMode.VirtOnly)); @@ -971,7 +1001,7 @@ getEnableGlusterService().setEntity(ApplicationModeHelper.getUiMode() == ApplicationMode.GlusterOnly); getEnableGlusterService().setIsAvailable(ApplicationModeHelper.getUiMode() != ApplicationMode.GlusterOnly && ApplicationModeHelper.isModeSupported(ApplicationMode.GlusterOnly)); - + getGlusterTunedProfile().setIsAvailable(getEnableGlusterService().getEntity()); setOptimizationNone(new EntityModel<Integer>()); setOptimizationForServer(new EntityModel<Integer>()); setOptimizationForDesktop(new EntityModel<Integer>()); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java index 14facc6..295fb37 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java @@ -800,6 +800,9 @@ @DefaultStringValue("General") String clusterPopupGeneralTabLabel(); + @DefaultStringValue("Gluster Tuned Profile") + String glusterTunedProfileLabel(); + @DefaultStringValue("Data Center") String clusterPopupDataCenterLabel(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.java index 22354ad..5ba1a3b 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.java @@ -190,6 +190,11 @@ EntityModelCheckBoxEditor rngHwrngSourceRequired; @UiField + @Path(value = "glusterTunedProfile.selectedItem") + @WithElementId + ListModelListBoxEditor<String> glusterTunedProfileEditor; + + @UiField @WithElementId DialogTab optimizationTab; @@ -442,6 +447,7 @@ enableGlusterServiceEditor.setLabel(constants.clusterEnableGlusterServiceLabel()); enableOvirtServiceOptionEditor.setLabel(constants.clusterEnableOvirtServiceLabel()); enableGlusterServiceOptionEditor.setLabel(constants.clusterEnableGlusterServiceLabel()); + glusterTunedProfileEditor.setLabel(constants.glusterTunedProfileLabel()); importGlusterConfigurationEditor.setLabel(constants.clusterImportGlusterConfigurationLabel()); importGlusterExplanationLabel.setText(constants.clusterImportGlusterConfigurationExplanationLabel()); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.ui.xml b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.ui.xml index a95c3f9..73c96fb 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.ui.xml +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.ui.xml @@ -190,6 +190,7 @@ <ge:EntityModelCheckBoxEditor ui:field="rngRandomSourceRequired" /> <ge:EntityModelCheckBoxEditor ui:field="rngHwrngSourceRequired" /> </g:FlowPanel> + <e:ListModelListBoxEditor ui:field="glusterTunedProfileEditor" /> </g:FlowPanel> </t:content> </t:DialogTab> diff --git a/ovirt-engine.spec.in b/ovirt-engine.spec.in index b03ab1b..3420ef7 100644 --- a/ovirt-engine.spec.in +++ b/ovirt-engine.spec.in @@ -314,7 +314,7 @@ Requires: mod_ssl Requires: novnc Requires: openssl -Requires: ovirt-host-deploy-java >= 1.3.0 +Requires: ovirt-host-deploy-java >= 1.4.0 Requires: python-cheetah Requires: vdsm-jsonrpc-java >= 1.0.15 Requires: spice-html5 @@ -580,8 +580,8 @@ Requires: %{name}-sdk-python >= 3.5.2.1 Requires: %{name}-setup-plugin-ovirt-engine = %{version}-%{release} Requires: openssh-server -Requires: ovirt-host-deploy >= 1.3.0 -Requires: ovirt-host-deploy-offline >= 1.3.0 +Requires: ovirt-host-deploy >= 1.4.0 +Requires: ovirt-host-deploy-offline >= 1.4.0 Requires: vdsm-jsonrpc-java >= 1.0.15 %description setup-plugin-allinone diff --git a/packaging/dbscripts/upgrade/03_06_1260_add_tuned_profile_column_to_vds_groups.sql b/packaging/dbscripts/upgrade/03_06_1260_add_tuned_profile_column_to_vds_groups.sql new file mode 100644 index 0000000..20eb377 --- /dev/null +++ b/packaging/dbscripts/upgrade/03_06_1260_add_tuned_profile_column_to_vds_groups.sql @@ -0,0 +1 @@ +select fn_db_add_column('vds_groups', 'gluster_tuned_profile', 'VARCHAR(50)'); \ No newline at end of file diff --git a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql index 0c3c450..4dab94f 100644 --- a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -201,6 +201,7 @@ select fn_db_add_config_value('GlusterGeoReplicationEnabled', 'false', '3.5'); select fn_db_add_config_value('GlusterRefreshRateGeoRepDiscoveryInSecs', '3600', 'general'); select fn_db_add_config_value('GlusterRefreshRateGeoRepStatusInSecs', '300', 'general'); +select fn_db_add_config_value('GlusterTunedProfile', 'rhs-high-throughput,rhs-virtualization', 'general'); -- Gluster Disk Provisioning -- diff --git a/packaging/dbscripts/vds_groups_sp.sql b/packaging/dbscripts/vds_groups_sp.sql index ff6bd55..c8994a3 100644 --- a/packaging/dbscripts/vds_groups_sp.sql +++ b/packaging/dbscripts/vds_groups_sp.sql @@ -40,17 +40,18 @@ v_skip_fencing_if_sd_active BOOLEAN, v_skip_fencing_if_connectivity_broken BOOLEAN, v_hosts_with_broken_connectivity_threshold SMALLINT, - v_fencing_enabled BOOLEAN + v_fencing_enabled BOOLEAN, + v_gluster_tuned_profile VARCHAR(50) ) RETURNS VOID AS $procedure$ BEGIN INSERT INTO vds_groups(vds_group_id,description, name, free_text_comment, cpu_name, storage_pool_id, max_vds_memory_over_commit, count_threads_as_cores, compatibility_version, transparent_hugepages, migrate_on_error, virt_service, gluster_service, tunnel_migration, emulated_machine, detect_emulated_machine, trusted_service, ha_reservation, optional_reason, cluster_policy_id, - cluster_policy_custom_properties, enable_balloon, architecture, optimization_type, spice_proxy, enable_ksm, serial_number_policy, custom_serial_number, required_rng_sources, skip_fencing_if_sd_active, skip_fencing_if_connectivity_broken, hosts_with_broken_connectivity_threshold, fencing_enabled) + cluster_policy_custom_properties, enable_balloon, architecture, optimization_type, spice_proxy, enable_ksm, serial_number_policy, custom_serial_number, required_rng_sources, skip_fencing_if_sd_active, skip_fencing_if_connectivity_broken, hosts_with_broken_connectivity_threshold, fencing_enabled, gluster_tuned_profile) VALUES(v_vds_group_id,v_description, v_name, v_free_text_comment, v_cpu_name, v_storage_pool_id, v_max_vds_memory_over_commit, v_count_threads_as_cores, v_compatibility_version, v_transparent_hugepages, v_migrate_on_error, v_virt_service, v_gluster_service, v_tunnel_migration, v_emulated_machine, v_detect_emulated_machine, v_trusted_service, v_ha_reservation, v_optional_reason, v_cluster_policy_id, v_cluster_policy_custom_properties, v_enable_balloon, - v_architecture, v_optimization_type, v_spice_proxy, v_enable_ksm, v_serial_number_policy, v_custom_serial_number, v_required_rng_sources, v_skip_fencing_if_sd_active, v_skip_fencing_if_connectivity_broken, v_hosts_with_broken_connectivity_threshold, v_fencing_enabled); + v_architecture, v_optimization_type, v_spice_proxy, v_enable_ksm, v_serial_number_policy, v_custom_serial_number, v_required_rng_sources, v_skip_fencing_if_sd_active, v_skip_fencing_if_connectivity_broken, v_hosts_with_broken_connectivity_threshold, v_fencing_enabled, v_gluster_tuned_profile); END; $procedure$ LANGUAGE plpgsql; @@ -90,7 +91,8 @@ v_skip_fencing_if_sd_active BOOLEAN, v_skip_fencing_if_connectivity_broken BOOLEAN, v_hosts_with_broken_connectivity_threshold SMALLINT, - v_fencing_enabled BOOLEAN + v_fencing_enabled BOOLEAN, + v_gluster_tuned_profile VARCHAR(50) ) RETURNS VOID @@ -113,7 +115,8 @@ skip_fencing_if_sd_active = v_skip_fencing_if_sd_active, skip_fencing_if_connectivity_broken = v_skip_fencing_if_connectivity_broken, hosts_with_broken_connectivity_threshold = v_hosts_with_broken_connectivity_threshold, - fencing_enabled = v_fencing_enabled + fencing_enabled = v_fencing_enabled, + gluster_tuned_profile = v_gluster_tuned_profile WHERE vds_group_id = v_vds_group_id; END; $procedure$ LANGUAGE plpgsql; diff --git a/pom.xml b/pom.xml index 8db867d..9a0fe4e 100644 --- a/pom.xml +++ b/pom.xml @@ -72,7 +72,7 @@ <cxf.version>2.2.7</cxf.version> <sshd-core.version>0.11.0</sshd-core.version> <otopi.version>1.2.0</otopi.version> - <ovirt-host-deploy.version>1.3.0</ovirt-host-deploy.version> + <ovirt-host-deploy.version>1.4.0-master-SNAPSHOT</ovirt-host-deploy.version> <org.ovirt.engine.api.ovirt-engine-extensions-api.version>0.0.0-SNAPSHOT</org.ovirt.engine.api.ovirt-engine-extensions-api.version> <slf4j.version>1.7.5</slf4j.version> <slf4j-jdk14.version>1.5.6</slf4j-jdk14.version> -- To view, visit https://gerrit.ovirt.org/40569 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4ef3f957dfcc40cef8de541898fbc08d698d0ce7 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5-gluster Gerrit-Owner: anmolbabu <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
