Martin Mucha has uploaded a new change for review. Change subject: core: do not fail when there's no mac in pool on engine startup. ......................................................................
core: do not fail when there's no mac in pool on engine startup. Change-Id: Icc486d04748d3a49291746c57955db2aaae2f389 Bug-Url: https://bugzilla.redhat.com/1165025 Signed-off-by: Martin Mucha <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManagerRanges.java 1 file changed, 13 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/06/35506/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManagerRanges.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManagerRanges.java index 243941e..74a2a1c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManagerRanges.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManagerRanges.java @@ -46,19 +46,25 @@ log.infoFormat("Start initializing " + getClass().getSimpleName()); this.macsStorage = createMacsStorage(rangesString); - List<VmNic> interfaces = getVmNicInterfacesFromDb(); + addMacsFromDbToPool(); - for (VmNic iface : interfaces) { - if (iface.getMacAddress() != null) { - forceAddMacWithoutLocking(iface.getMacAddress()); - } - } + logWhenMacPoolIsEmpty(); initialized = true; log.infoFormat("Finished initializing. Available MACs in pool: {0}", macsStorage.getAvailableMacsCount()); } catch (Exception ex) { log.errorFormat("Error in initializing MAC Addresses pool manager.", ex); } finally { lockObj.writeLock().unlock(); + } + } + + protected void addMacsFromDbToPool() { + List<VmNic> interfaces = getVmNicInterfacesFromDb(); + + for (VmNic iface : interfaces) { + if (iface.getMacAddress() != null) { + forceAddMacWithoutLocking(iface.getMacAddress()); + } } } @@ -69,11 +75,7 @@ macsStorage.addRange(range.getMinimumLong(), range.getMaximumLong()); } - if (macsStorage.availableMacExist()) { - return macsStorage; - } else { - throw new VdcBLLException(VdcBllErrors.MAC_POOL_INITIALIZATION_FAILED); - } + return macsStorage; } private List<VmNic> getVmNicInterfacesFromDb() { -- To view, visit http://gerrit.ovirt.org/35506 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icc486d04748d3a49291746c57955db2aaae2f389 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Mucha <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
