Michael Kublin has submitted this change and it was merged. Change subject: core: Use the hostSpmId during reconstructMaster ...................................................................... core: Use the hostSpmId during reconstructMaster In this patch: * disconnectStoragePool before reconstructMaster only when the storage format is V1 or V2 * Use the additional parameter spmHostId for reconstructMaster (this is accepted and ignored by old VDSM versions as the "options" parameter) Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com&gt; Change-Id: Id8c4fceeda898e020a4153ccd36aa078eb200ac3 --- M backend/manager/dbscripts/upgrade/pre_upgrade/config.sql M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ReconstructMasterDomainCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ReconstructMasterVDSCommandParameters.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IIrsServer.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerConnector.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerWrapper.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ReconstructMasterVDSCommand.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 11 files changed, 59 insertions(+), 27 deletions(-) Approvals: Michael Kublin: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/4967 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id8c4fceeda898e020a4153ccd36aa078eb200ac3 Gerrit-PatchSet: 13 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com&gt; Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com&gt; Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com&gt; Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com&gt; Gerrit-Reviewer: Doron Fediuck <dfediuck(a)redhat.com&gt; Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com&gt; Gerrit-Reviewer: Livnat Peer <lpeer(a)redhat.com&gt; Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com&gt; Gerrit-Reviewer: Michael Kublin <mkublin(a)redhat.com&gt; Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com&gt; Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com&gt; Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com&gt;