Lior Vernia has uploaded a new change for review. Change subject: engine: Check VDSM supported clusters to deserialize QoS ......................................................................
engine: Check VDSM supported clusters to deserialize QoS It is not in fact correct check the cluster's compatibility version to see if Host Network QoS is supported, since GetVdsCapabilities should work even if the VDSM is too old for the cluster's compatibility version, and in case there's QoS configured on a host we'd want it to be reported even if it resides in an older cluster. Change-Id: I8a5303222d51459019c1aaaf6754867cd234fe9d Bug-Url: https://bugzilla.redhat.com/1056155 Signed-off-by: Lior Vernia <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/68/23568/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java index 3ad69e0..4a4b1b8 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java @@ -6,6 +6,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; +import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -323,6 +324,8 @@ } public static void updateVDSDynamicData(VDS vds, Map<String, Object> xmlRpcStruct) { + vds.setSupportedClusterLevels(AssignStringValueFromArray(xmlRpcStruct, VdsProperties.supported_cluster_levels)); + updateNetworkData(vds, xmlRpcStruct); vds.setCpuThreads(AssignIntValue(xmlRpcStruct, VdsProperties.cpuThreads)); @@ -342,7 +345,6 @@ UpdatePackagesVersions(vds, xmlRpcStruct); - vds.setSupportedClusterLevels(AssignStringValueFromArray(xmlRpcStruct, VdsProperties.supported_cluster_levels)); vds.setSupportedEngines(AssignStringValueFromArray(xmlRpcStruct, VdsProperties.supported_engines)); vds.setIScsiInitiatorName(AssignStringValue(xmlRpcStruct, VdsProperties.iSCSIInitiatorName)); @@ -1255,7 +1257,7 @@ addBootProtocol(networkConfig, host, iface); } - if (FeatureSupported.hostNetworkQos(host.getVdsGroupCompatibilityVersion())) { + if (FeatureSupported.hostNetworkQos(Collections.max(host.getSupportedClusterVersionsSet()))) { NetworkQosMapper qosMapper = new NetworkQosMapper(network, VdsProperties.HOST_QOS_INBOUND, VdsProperties.HOST_QOS_OUTBOUND); iface.setQos(qosMapper.deserialize()); -- To view, visit http://gerrit.ovirt.org/23568 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8a5303222d51459019c1aaaf6754867cd234fe9d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Lior Vernia <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
