Tal Nisan has submitted this change and it was merged. Change subject: core, vdsbroker: Refresh volume after extension during Live Merge ...................................................................... core, vdsbroker: Refresh volume after extension during Live Merge When merging a larger (extended) volume into a smaller base volume, the ExtendImageSize command may be run on a different host than the Merge command. In this case the host running Merge may be unaware of the size change, resulting in a failure. To prevent this, ExtendImageSize will now send a RefreshVolume request if a base volume is extended. The refresh is done on all hosts with the volume in use because they otherwise have no way of knowing about the new size. In addition, we will send a refresh request during live merge recovery to allow recovery from a failure due to the above size discrepancy when a merge is retried. Change-Id: I043c7f14359d1befb3e442958760d2a0dc4c9882 Bug-Url: https://bugzilla.redhat.com/1274323 Signed-off-by: Greg Padgett <gpadgett@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MergeExtendCommand.java A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RefreshVolumeCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/ExtendImageSizeCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/ImagesHandler.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/RefreshVolumeParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/RefreshVolumeVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java M backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java A backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/RefreshVolumeVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java 15 files changed, 308 insertions(+), 33 deletions(-) Approvals: Greg Padgett: Verified Jenkins CI: Passed CI tests Daniel Erez: Looks good to me, but someone else must approve Liron Aravot: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/47671 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I043c7f14359d1befb3e442958760d2a0dc4c9882 Gerrit-PatchSet: 20 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Greg Padgett <gpadgett@redhat.com> Gerrit-Reviewer: Adam Litke <alitke@redhat.com> Gerrit-Reviewer: Ala Hino <ahino@redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini@redhat.com> Gerrit-Reviewer: Daniel Erez <derez@redhat.com> Gerrit-Reviewer: Freddy Rolland <frolland@redhat.com> Gerrit-Reviewer: Greg Padgett <gpadgett@redhat.com> Gerrit-Reviewer: Idan Shaby <ishaby@redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Liron Aravot <laravot@redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipchuk@redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan@redhat.com> Gerrit-Reviewer: gerrit-hooks <automation@ovirt.org>