diff options
author | trasz <trasz@FreeBSD.org> | 2014-04-16 11:06:45 +0000 |
---|---|---|
committer | trasz <trasz@FreeBSD.org> | 2014-04-16 11:06:45 +0000 |
commit | a926ac6eae67b539d4dd4a4b8be3ec7f0e808df2 (patch) | |
tree | c8600797845de9969ce9f4c2253b4f586ad56b09 /usr.sbin | |
parent | dcde441db642a39b3622a5f96db0d08335117b5c (diff) | |
download | FreeBSD-src-a926ac6eae67b539d4dd4a4b8be3ec7f0e808df2.zip FreeBSD-src-a926ac6eae67b539d4dd4a4b8be3ec7f0e808df2.tar.gz |
If we fail to create LUN, try again on next configuration reload.
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/ctld/ctld.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/usr.sbin/ctld/ctld.c b/usr.sbin/ctld/ctld.c index 947e4d2..3300d53 100644 --- a/usr.sbin/ctld/ctld.c +++ b/usr.sbin/ctld/ctld.c @@ -1222,6 +1222,13 @@ conf_apply(struct conf *oldconf, struct conf *newconf) } } + /* + * XXX: If target or lun removal fails, we should somehow "move" + * the old lun or target into newconf, so that subsequent + * conf_apply() will try to remove them again. That would + * be somewhat hairy, and lun deletion doesn't really happen, + * so leave it as it is for now. + */ TAILQ_FOREACH_SAFE(oldtarg, &oldconf->conf_targets, t_next, tmptarg) { /* * First, remove any targets present in the old configuration @@ -1344,7 +1351,7 @@ conf_apply(struct conf *oldconf, struct conf *newconf) TAILQ_FOREACH(newtarg, &newconf->conf_targets, t_next) { oldtarg = target_find(oldconf, newtarg->t_name); - TAILQ_FOREACH(newlun, &newtarg->t_luns, l_next) { + TAILQ_FOREACH_SAFE(newlun, &newtarg->t_luns, l_next, tmplun) { if (oldtarg != NULL) { oldlun = lun_find(oldtarg, newlun->l_lun); if (oldlun != NULL) { @@ -1376,6 +1383,7 @@ conf_apply(struct conf *oldconf, struct conf *newconf) if (error != 0) { log_warnx("failed to add lun %d, target %s", newlun->l_lun, newtarg->t_name); + lun_delete(newlun); cumulated_error++; } } |