Commit 38f23f9
authored
CA-411122: do not call set-iscsi-initiator with an empty string for IQN (#6474)
Back in 2018 a4a94b3 rejected empty
IQNs in set_iscsi_iqn API calls. However hosts are created with an empty
IQN, and if this code runs too early then it will attempt to call
`set-iscsi-initiator` with an empty string for the IQN:
```
/opt/xensource/libexec/set-iscsi-initiator myhost
```
About a second later the script is called again with the correct value.
This could potentially result in the iscsid service being restarted
multiple times (and if a restart is still pending when restart is called
a 2nd time I'm not sure it'll take effect, so we might be left with an
empty initiator, I have also seen a GFS2 SR plug failure following
this).
It is best to avoid setting empty initiators. The exception would be
raised and ignore due to the log_and_ignore in the caller.
Also log wherever the IQN is set using %S, so that we notice if it ends
up containing some extra whitespace characters.2 files changed
+5
-0
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2790 | 2790 | | |
2791 | 2791 | | |
2792 | 2792 | | |
| 2793 | + | |
2793 | 2794 | | |
2794 | 2795 | | |
2795 | 2796 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
497 | 497 | | |
498 | 498 | | |
499 | 499 | | |
| 500 | + | |
| 501 | + | |
500 | 502 | | |
501 | 503 | | |
502 | 504 | | |
503 | 505 | | |
| 506 | + | |
504 | 507 | | |
505 | 508 | | |
506 | 509 | | |
| |||
541 | 544 | | |
542 | 545 | | |
543 | 546 | | |
| 547 | + | |
544 | 548 | | |
545 | 549 | | |
546 | 550 | | |
| |||
0 commit comments