Mike Kolesnik has uploaded a new change for review. Change subject: engine: Report error only for non-pluggable devices ......................................................................
engine: Report error only for non-pluggable devices Error should be reported (as it states in the error itself) only for non pluggable devices, otherwise if the device is pluggable it's cool that it is unplugged in DB and VDSM. Change-Id: Id68197668fc2432bb7c26e6940fe8bf92bd3e674 Bug-Url: https://bugzilla.redhat.com/872165 Signed-off-by: Mike Kolesnik <mkole...@redhat.com> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/00/11700/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java index 070d7d2..00039b9 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java @@ -1139,7 +1139,7 @@ device.setAddress(""); addVmDeviceToList(device); log.debugFormat("VM {0} managed pluggable device was unplugged : {1}", vmId, device); - } else { + } else if (!devicePluggable(device)) { log.errorFormat("VM {0} managed non pluggable device was removed unexpectedly from libvirt: {1}", vmId, device); } @@ -1150,6 +1150,12 @@ } } + private boolean devicePluggable(VmDevice device) { + return (VmDeviceType.DISK.getName().equals(device.getDevice()) && VmDeviceType.DISK.getName().equals(device)) + || (VmDeviceType.BRIDGE.getName().equals(device.getDevice()) + && VmDeviceType.INTERFACE.getName().equals(device.getType())); + } + /** * Adds new devices recognized by libvirt * @param vmId -- To view, visit http://gerrit.ovirt.org/11700 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id68197668fc2432bb7c26e6940fe8bf92bd3e674 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Mike Kolesnik <mkole...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
