Re: [libvirt] [PATCH 03/11] Stop iSCSI targets automatically logging back in after logout

The Linux iSCSI initiator toolchain has the dubious feature that if you ever run the 'sendtargets' command to merely query what targets are available from a server, the results will be recorded in /var/lib/iscsi. Any time the '/etc/init.d/iscsi' script runs in the future, it will then automatically login to all those targets. /etc/init.d/iscsi is automatically run whenever a NIC comes online.

To stop this stupid behaviour, we need to run iscsiadm --portal $PORTAL --target $TARGET --op update --name node.startup --value manual

+static int +virStorageBackendISCSIGetTargets(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, + char **const groups, + void *data) +{ + struct virStorageBackendISCSITargetList *list = data; + char *target; + + if (!(target = strdup(groups[1]))) { + virReportOOMError(); + return -1; + } + + if (VIR_REALLOC_N(list->targets, list->ntargets + 1) < 0) {

static int -virStorageBackendISCSIScanTargets(const char *portal) +virStorageBackendISCSIScanTargets(const char *portal, + const char *initiatoriqn, + size_t *ntargetsret, + char ***targetsret) { - const char *const sendtargets[] = { - ISCSIADM, "--mode", "discovery", "--type", "sendtargets", "--portal", portal, NULL + /** + * + * The output of sendtargets is very simple, just two columns, + * portal then target name + * + * 192.168.122.185:3260,1 iqn.2004-04.com:fedora14:iscsi.demo0.bf6d84 + * 192.168.122.185:3260,1 iqn.2004-04.com:fedora14:iscsi.demo1.bf6d84 + * 192.168.122.185:3260,1 iqn.2004-04.com:fedora14:iscsi.demo2.bf6d84 + * 192.168.122.185:3260,1 iqn.2004-04.com:fedora14:iscsi.demo3.bf6d84 + */ + const char *regexes[] = { + "^\\s*(\\S+)\\s+(\\S+)\\s*$"

+ }; + int vars[] = { 2 }; + const char *const cmdsendtarget[] = { + ISCSIADM, "--mode", "discovery", "--type", "sendtargets", + "--portal", portal, NULL }; - if (virRun(sendtargets, NULL) < 0) { + struct virStorageBackendISCSITargetList list; + int i; + int exitstatus; + + memset(&list, 0, sizeof(list)); + + if (virStorageBackendRunProgRegex(NULL, /* No pool for callback */ + cmdsendtarget, + 1, + regexes, + vars, + virStorageBackendISCSIGetTargets, + &list, + &exitstatus) < 0) { virStorageReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to run %s to get target list"), - sendtargets[0]); + "%s", _("lvs command failed"));