Yaniv Bronhaim has uploaded a new change for review. Change subject: Verify vdsm cluster level support before send getHardwareInfo request ......................................................................
Verify vdsm cluster level support before send getHardwareInfo request Without verifying vdsm cluster support level the engine sends API request that does not exist in vdsm. This raises exception in engine. This path adds verification for vdsm cluster support. Change-Id: I240786444bdf393f6df4e53daf94d0ee197ecb73 Bug-Id: https://bugzilla.redhat.com/show_bug.cgi?id=894317 Signed-off-by: Yaniv Bronhaim <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/27/11027/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java index e81ef75..608949d 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java @@ -513,7 +513,8 @@ if (vdsBrokerCommand.getVDSReturnValue().getSucceeded()) { // Verify version capabilities if (Config.<Boolean> GetValue(ConfigValues.HardwareInfoEnabled, vds.getvds_group_compatibility_version() - .getValue())) { + .getValue()) && + Config.<Boolean> GetValue(ConfigValues.HardwareInfoEnabled, vds.getsupported_cluster_levels())) { VDSReturnValue ret = ResourceManager.getInstance().runVdsCommand(VDSCommandType.GetHardwareInfo, new VdsIdAndVdsVDSCommandParametersBase(vds)); if (!ret.getSucceeded()) { -- To view, visit http://gerrit.ovirt.org/11027 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I240786444bdf393f6df4e53daf94d0ee197ecb73 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
