Roy Golan has posted comments on this change. Change subject: core: disable the mixing of RHEL6 and RHEL7 in one cluster ......................................................................
Patch Set 3: (2 comments) http://gerrit.ovirt.org/#/c/34411/3/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VirtMonitoringStrategy.java File backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VirtMonitoringStrategy.java: Line 74: if (vds.getStatus() != VDSStatus.NonOperational) { Line 75: String[] hostOsInfo = vds.getHostOs().split("-"); Line 76: String osName = hostOsInfo[0].trim(); Line 77: String newVersion = hostOsInfo[1].trim(); Line 78: if (osName.equals("RHEL")) { or just check if ("RHEL".equals(osName)) Line 79: VDS beforeRhel = vdsDao.getFirstUpRhelForVdsGroup(vdsGroup.getId()); Line 80: boolean firstHostInCluster = beforeRhel == null; Line 81: if (!firstHostInCluster) { Line 82: // if not first host in cluster, need to check if the version is the same Line 80: boolean firstHostInCluster = beforeRhel == null; Line 81: if (!firstHostInCluster) { Line 82: // if not first host in cluster, need to check if the version is the same Line 83: String[] prevOsInfo = beforeRhel.getHostOs().split("-"); Line 84: String prevVersion = prevOsInfo[1].trim(); also all checks here should do equals with the string constant like "7".equals(...) Line 85: boolean addingRhel6toRhel7 = newVersion.startsWith("6") && prevVersion.startsWith("7"); Line 86: boolean addingRhel7toRhel6 = newVersion.startsWith("7") && prevVersion.startsWith("6"); Line 87: if (addingRhel7toRhel6 || addingRhel6toRhel7) { Line 88: Map<String, String> customLogValues = new HashMap<>(); -- To view, visit http://gerrit.ovirt.org/34411 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ieb6d41b1921a6caf946cba44a6c92ef86fef6bc8 Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tomas Jelinek <tjeli...@redhat.com> Gerrit-Reviewer: Arik Hadas <aha...@redhat.com> Gerrit-Reviewer: Omer Frenkel <ofren...@redhat.com> Gerrit-Reviewer: Roy Golan <rgo...@redhat.com> Gerrit-Reviewer: Tomas Jelinek <tjeli...@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
