If we fail to create LUN, try again on next configuration reload.
Sponsored by: The FreeBSD Foundation
This commit is contained in:
parent
fe845cdb48
commit
d5e316e5e8
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=264534
@ -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) {
|
TAILQ_FOREACH_SAFE(oldtarg, &oldconf->conf_targets, t_next, tmptarg) {
|
||||||
/*
|
/*
|
||||||
* First, remove any targets present in the old configuration
|
* 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) {
|
TAILQ_FOREACH(newtarg, &newconf->conf_targets, t_next) {
|
||||||
oldtarg = target_find(oldconf, newtarg->t_name);
|
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) {
|
if (oldtarg != NULL) {
|
||||||
oldlun = lun_find(oldtarg, newlun->l_lun);
|
oldlun = lun_find(oldtarg, newlun->l_lun);
|
||||||
if (oldlun != NULL) {
|
if (oldlun != NULL) {
|
||||||
@ -1376,6 +1383,7 @@ conf_apply(struct conf *oldconf, struct conf *newconf)
|
|||||||
if (error != 0) {
|
if (error != 0) {
|
||||||
log_warnx("failed to add lun %d, target %s",
|
log_warnx("failed to add lun %d, target %s",
|
||||||
newlun->l_lun, newtarg->t_name);
|
newlun->l_lun, newtarg->t_name);
|
||||||
|
lun_delete(newlun);
|
||||||
cumulated_error++;
|
cumulated_error++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user