Idan Shaby has uploaded a new change for review. Change subject: Revert "core: Store iSCSI Target Address instead of IP Address in DB" ......................................................................
Revert "core: Store iSCSI Target Address instead of IP Address in DB" This reverts commit c6c9bdb239042ca0ab4543d154d5144740ba4379. The idea of working with the original address we get from the user instead of the IP address we get from VDSM works fine in case that the iscsi server has only one NIC. When it has more than one (Multipath, for example) the VDSM sends all the addresses it discovered, and we override all of them with the original address we got from the user. This makes the login to all of the other targets fail (except for the first one). Thus, working with the original address is not possible. Change-Id: I3974820e9039f05aa716752330c1b2ec13591137 Signed-off-by: Idan Shaby <[email protected]> Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1086310 --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/DiscoverSendTargetsVDSCommand.java 1 file changed, 1 insertion(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/91/35291/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/DiscoverSendTargetsVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/DiscoverSendTargetsVDSCommand.java index 334fe67..faf0c76 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/DiscoverSendTargetsVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/DiscoverSendTargetsVDSCommand.java @@ -5,13 +5,9 @@ import org.ovirt.engine.core.common.businessentities.StorageServerConnections; import org.ovirt.engine.core.common.vdscommands.DiscoverSendTargetsVDSCommandParameters; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class DiscoverSendTargetsVDSCommand<P extends DiscoverSendTargetsVDSCommandParameters> extends VdsBrokerCommand<P> { - - private static final Logger log = LoggerFactory.getLogger(DiscoverSendTargetsVDSCommand.class); protected IQNListReturnForXmlRpc _result; public DiscoverSendTargetsVDSCommand(P parameters) { @@ -47,16 +43,10 @@ String[] address = tokens[0].split(":"); String[] literals = tokens[1].split(" "); + con.setconnection(address[0]); con.setport(address[1]); con.setportal(literals[0]); con.setiqn(literals[1]); - - // address[0] is the IP address of the target as returned from VDSM. - // Since we want to use the original address from the user's input (which can also be a host name), - // and since VDSM always returns the IP address of the target, we don't want to override it - // by calling con.setconnection(address[0]). - log.info("Connection to {} requested, VDSM returned {}.", con.getconnection(), address[0]); - connections.add(con); } -- To view, visit http://gerrit.ovirt.org/35291 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3974820e9039f05aa716752330c1b2ec13591137 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Idan Shaby <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
