Lior Vernia has uploaded a new change for review. Change subject: engine: Guard against old VDSM sending QoS as string ......................................................................
engine: Guard against old VDSM sending QoS as string When no QoS was defined on a host, old versions (between 3.3 and 3.4) of VDSM would send empty strings in the inbound/outbound entries, where in fact they should have sent integers (and in the case of no QoS no entries at all). This guards against such entries. Change-Id: I8b68989bd6e8ca1ebf6e2f23e8bea3769f4ce5a9 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, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/26/23026/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 199b657..3ad69e0 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 @@ -1255,9 +1255,11 @@ addBootProtocol(networkConfig, host, iface); } - NetworkQosMapper qosMapper = - new NetworkQosMapper(network, VdsProperties.HOST_QOS_INBOUND, VdsProperties.HOST_QOS_OUTBOUND); - iface.setQos(qosMapper.deserialize()); + if (FeatureSupported.hostNetworkQos(host.getVdsGroupCompatibilityVersion())) { + NetworkQosMapper qosMapper = + new NetworkQosMapper(network, VdsProperties.HOST_QOS_INBOUND, VdsProperties.HOST_QOS_OUTBOUND); + iface.setQos(qosMapper.deserialize()); + } } } -- To view, visit http://gerrit.ovirt.org/23026 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8b68989bd6e8ca1ebf6e2f23e8bea3769f4ce5a9 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
