Lior Vernia has posted comments on this change. Change subject: engine: Ignore outdated vdsm entries in cluster version >= 3.6 ......................................................................
Patch Set 5: (3 comments) http://gerrit.ovirt.org/#/c/36343/5/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java File backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java: Line 1435: } else { Line 1436: Map<String, Object> config = (Map<String, Object>) bond.get("cfg"); Line 1437: bondOptions = (config == null) ? null : config.get("BONDING_OPTS"); Line 1438: } Line 1439: iface.setBondOptions(bondOptions == null ? null : bondOptions.toString()); > since the iface is a new entity, it isn't required to set null to it. Done Line 1440: Line 1441: addBootProtocol(bond, vds, iface); Line 1442: } Line 1443: } Line 1580: boolean bridgedNetwork = isBridgedNetwork(network); Line 1581: iface.setBridged(bridgedNetwork); Line 1582: setGatewayIfNecessary(iface, host, net.getGateway()); Line 1583: Line 1584: if (bridgedNetwork && !FeatureSupported.cfgEntriesDeprecated(host.getVdsGroupCompatibilityVersion())) { > why to check for FeatureSupported here ? Apparently vdsm wants to drop reporting this data on networks - everything nowadays should also be reported already on the corresponding device. Actually, gateway assignment should depend on that as well... Line 1585: addBootProtocol(network, host, iface); Line 1586: } Line 1587: Line 1588: if (FeatureSupported.hostNetworkQos(Collections.max(host.getSupportedClusterVersionsSet()))) { Line 1621: } Line 1622: } Line 1623: } Line 1624: Line 1625: private static void addBootProtocol(Map<String, Object> entry, VDS host, VdsNetworkInterface iface) { > this method became too complex. I'd separate the logic of resolving the pro Done Line 1626: boolean cfgDeprecated = FeatureSupported.cfgEntriesDeprecated(host.getVdsGroupCompatibilityVersion()); Line 1627: if (!cfgDeprecated) { Line 1628: entry = (Map<String, Object>) entry.get("cfg"); Line 1629: if (entry == null) { -- To view, visit http://gerrit.ovirt.org/36343 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If434111561aefab3d5d358a97331bcf3159f3484 Gerrit-PatchSet: 5 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Lior Vernia <lver...@redhat.com> Gerrit-Reviewer: Alona Kaplan <alkap...@redhat.com> Gerrit-Reviewer: Dan Kenigsberg <dan...@redhat.com> Gerrit-Reviewer: Eli Mesika <emes...@redhat.com> Gerrit-Reviewer: Lior Vernia <lver...@redhat.com> Gerrit-Reviewer: Moti Asayag <masa...@redhat.com> Gerrit-Reviewer: Ondřej Svoboda <osvob...@redhat.com> Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
