| Message ID | 20230620132703.20648-4-dwagner@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | More fixes for FC enabling | expand |
On Jun 20, 2023 / 15:27, Daniel Wagner wrote: > The host might have enabled the udev/systemd auto connect feature. > This disturbs the blktests for the fc transport. nvme-cli is able > to distinguish between the different invocations via the --context > option. In order to get this working we have to use the default > hostnqn and hostid and not randon generated IDs for every single Nit: s/randon/random/, probably. Other than that this patch looks good to me. > run. > > Signed-off-by: Daniel Wagner <dwagner@suse.de> > --- > tests/nvme/041 | 8 ++------ > tests/nvme/042 | 8 ++------ > tests/nvme/043 | 8 ++------ > tests/nvme/044 | 8 ++------ > tests/nvme/045 | 8 ++------ > 5 files changed, 10 insertions(+), 30 deletions(-) > > diff --git a/tests/nvme/041 b/tests/nvme/041 > index 308655dd6090..5b04b99b128e 100755 > --- a/tests/nvme/041 > +++ b/tests/nvme/041 > @@ -30,12 +30,8 @@ test() { > > echo "Running ${TEST_NAME}" > > - hostid="$(uuidgen)" > - if [ -z "$hostid" ] ; then > - echo "uuidgen failed" > - return 1 > - fi > - hostnqn="nqn.2014-08.org.nvmexpress:uuid:${hostid}" > + hostid="${def_hostid}" > + hostnqn="${def_hostnqn}" > hostkey="$(nvme gen-dhchap-key -n ${subsys_name} 2> /dev/null)" > if [ -z "$hostkey" ] ; then > echo "nvme gen-dhchap-key failed" > diff --git a/tests/nvme/042 b/tests/nvme/042 > index fed2efead013..8df5ed37aacc 100755 > --- a/tests/nvme/042 > +++ b/tests/nvme/042 > @@ -32,12 +32,8 @@ test() { > > echo "Running ${TEST_NAME}" > > - hostid="$(uuidgen)" > - if [ -z "$hostid" ] ; then > - echo "uuidgen failed" > - return 1 > - fi > - hostnqn="nqn.2014-08.org.nvmexpress:uuid:${hostid}" > + hostid="${def_hostid}" > + hostnqn="${def_hostnqn}" > > _setup_nvmet > > diff --git a/tests/nvme/043 b/tests/nvme/043 > index a030884aa4ed..b591e39d0706 100755 > --- a/tests/nvme/043 > +++ b/tests/nvme/043 > @@ -33,12 +33,8 @@ test() { > > echo "Running ${TEST_NAME}" > > - hostid="$(uuidgen)" > - if [ -z "$hostid" ] ; then > - echo "uuidgen failed" > - return 1 > - fi > - hostnqn="nqn.2014-08.org.nvmexpress:uuid:${hostid}" > + hostid="${def_hostid}" > + hostnqn="${def_hostnqn}" > > _setup_nvmet > > diff --git a/tests/nvme/044 b/tests/nvme/044 > index 9928bcc55397..fca0897af27b 100755 > --- a/tests/nvme/044 > +++ b/tests/nvme/044 > @@ -32,12 +32,8 @@ test() { > > echo "Running ${TEST_NAME}" > > - hostid="$(uuidgen)" > - if [ -z "$hostid" ] ; then > - echo "uuidgen failed" > - return 1 > - fi > - hostnqn="nqn.2014-08.org.nvmexpress:uuid:${hostid}" > + hostid="${def_hostid}" > + hostnqn="${def_hostnqn}" > > hostkey="$(nvme gen-dhchap-key -n ${subsys_name} 2> /dev/null)" > if [ -z "$hostkey" ] ; then > diff --git a/tests/nvme/045 b/tests/nvme/045 > index 26a55335a92c..eca629a18691 100755 > --- a/tests/nvme/045 > +++ b/tests/nvme/045 > @@ -36,12 +36,8 @@ test() { > > echo "Running ${TEST_NAME}" > > - hostid="$(uuidgen)" > - if [ -z "$hostid" ] ; then > - echo "uuidgen failed" > - return 1 > - fi > - hostnqn="nqn.2014-08.org.nvmexpress:uuid:${hostid}" > + hostid="${def_hostid}" > + hostnqn="${def_hostnqn}" > > hostkey="$(nvme gen-dhchap-key -n ${subsys_name} 2> /dev/null)" > if [ -z "$hostkey" ] ; then > -- > 2.41.0 >
On 20/06/2023 16:27, Daniel Wagner wrote: > The host might have enabled the udev/systemd auto connect feature. > This disturbs the blktests for the fc transport. nvme-cli is able > to distinguish between the different invocations via the --context > option. In order to get this working we have to use the default > hostnqn and hostid and not randon generated IDs for every single > run. > In the bellow tests the hostnqn and hostid are randomly generated for each test, so how will it disturb the udev/systemd ? I'm not sure how will this change fix something and not sure why --context is mentioned here. Seems like a good explanation to this patch is to used a dedicated hostnqn and hostid for blktests instead of randomly generate it. > Signed-off-by: Daniel Wagner <dwagner@suse.de> > --- > tests/nvme/041 | 8 ++------ > tests/nvme/042 | 8 ++------ > tests/nvme/043 | 8 ++------ > tests/nvme/044 | 8 ++------ > tests/nvme/045 | 8 ++------ > 5 files changed, 10 insertions(+), 30 deletions(-) > > diff --git a/tests/nvme/041 b/tests/nvme/041 > index 308655dd6090..5b04b99b128e 100755 > --- a/tests/nvme/041 > +++ b/tests/nvme/041 > @@ -30,12 +30,8 @@ test() { > > echo "Running ${TEST_NAME}" > > - hostid="$(uuidgen)" > - if [ -z "$hostid" ] ; then > - echo "uuidgen failed" > - return 1 > - fi > - hostnqn="nqn.2014-08.org.nvmexpress:uuid:${hostid}" > + hostid="${def_hostid}" > + hostnqn="${def_hostnqn}" > hostkey="$(nvme gen-dhchap-key -n ${subsys_name} 2> /dev/null)" > if [ -z "$hostkey" ] ; then > echo "nvme gen-dhchap-key failed" > diff --git a/tests/nvme/042 b/tests/nvme/042 > index fed2efead013..8df5ed37aacc 100755 > --- a/tests/nvme/042 > +++ b/tests/nvme/042 > @@ -32,12 +32,8 @@ test() { > > echo "Running ${TEST_NAME}" > > - hostid="$(uuidgen)" > - if [ -z "$hostid" ] ; then > - echo "uuidgen failed" > - return 1 > - fi > - hostnqn="nqn.2014-08.org.nvmexpress:uuid:${hostid}" > + hostid="${def_hostid}" > + hostnqn="${def_hostnqn}" > > _setup_nvmet > > diff --git a/tests/nvme/043 b/tests/nvme/043 > index a030884aa4ed..b591e39d0706 100755 > --- a/tests/nvme/043 > +++ b/tests/nvme/043 > @@ -33,12 +33,8 @@ test() { > > echo "Running ${TEST_NAME}" > > - hostid="$(uuidgen)" > - if [ -z "$hostid" ] ; then > - echo "uuidgen failed" > - return 1 > - fi > - hostnqn="nqn.2014-08.org.nvmexpress:uuid:${hostid}" > + hostid="${def_hostid}" > + hostnqn="${def_hostnqn}" > > _setup_nvmet > > diff --git a/tests/nvme/044 b/tests/nvme/044 > index 9928bcc55397..fca0897af27b 100755 > --- a/tests/nvme/044 > +++ b/tests/nvme/044 > @@ -32,12 +32,8 @@ test() { > > echo "Running ${TEST_NAME}" > > - hostid="$(uuidgen)" > - if [ -z "$hostid" ] ; then > - echo "uuidgen failed" > - return 1 > - fi > - hostnqn="nqn.2014-08.org.nvmexpress:uuid:${hostid}" > + hostid="${def_hostid}" > + hostnqn="${def_hostnqn}" > > hostkey="$(nvme gen-dhchap-key -n ${subsys_name} 2> /dev/null)" > if [ -z "$hostkey" ] ; then > diff --git a/tests/nvme/045 b/tests/nvme/045 > index 26a55335a92c..eca629a18691 100755 > --- a/tests/nvme/045 > +++ b/tests/nvme/045 > @@ -36,12 +36,8 @@ test() { > > echo "Running ${TEST_NAME}" > > - hostid="$(uuidgen)" > - if [ -z "$hostid" ] ; then > - echo "uuidgen failed" > - return 1 > - fi > - hostnqn="nqn.2014-08.org.nvmexpress:uuid:${hostid}" > + hostid="${def_hostid}" > + hostnqn="${def_hostnqn}" > > hostkey="$(nvme gen-dhchap-key -n ${subsys_name} 2> /dev/null)" > if [ -z "$hostkey" ] ; then
On Thu, Jul 06, 2023 at 07:06:28PM +0300, Max Gurtovoy wrote: > > > On 20/06/2023 16:27, Daniel Wagner wrote: > > The host might have enabled the udev/systemd auto connect feature. > > This disturbs the blktests for the fc transport. nvme-cli is able > > to distinguish between the different invocations via the --context > > option. In order to get this working we have to use the default > > hostnqn and hostid and not randon generated IDs for every single > > run. > > > > In the bellow tests the hostnqn and hostid are randomly generated for each > test, so how will it disturb the udev/systemd ? No, random hostnqn should work as well. The only requirement is that the hostnqn(s) used by blktest are unique. > I'm not sure how will this change fix something and not sure why --context > is mentioned here. Sorry about that. I should have updated the commit message. A left over from a earlier version. > Seems like a good explanation to this patch is to used a dedicated hostnqn > and hostid for blktests instead of randomly generate it. Okay, I'll update the commit message to reflect this. I suppose I could also look into getting rid of the local variables in the tests.
diff --git a/tests/nvme/041 b/tests/nvme/041 index 308655dd6090..5b04b99b128e 100755 --- a/tests/nvme/041 +++ b/tests/nvme/041 @@ -30,12 +30,8 @@ test() { echo "Running ${TEST_NAME}" - hostid="$(uuidgen)" - if [ -z "$hostid" ] ; then - echo "uuidgen failed" - return 1 - fi - hostnqn="nqn.2014-08.org.nvmexpress:uuid:${hostid}" + hostid="${def_hostid}" + hostnqn="${def_hostnqn}" hostkey="$(nvme gen-dhchap-key -n ${subsys_name} 2> /dev/null)" if [ -z "$hostkey" ] ; then echo "nvme gen-dhchap-key failed" diff --git a/tests/nvme/042 b/tests/nvme/042 index fed2efead013..8df5ed37aacc 100755 --- a/tests/nvme/042 +++ b/tests/nvme/042 @@ -32,12 +32,8 @@ test() { echo "Running ${TEST_NAME}" - hostid="$(uuidgen)" - if [ -z "$hostid" ] ; then - echo "uuidgen failed" - return 1 - fi - hostnqn="nqn.2014-08.org.nvmexpress:uuid:${hostid}" + hostid="${def_hostid}" + hostnqn="${def_hostnqn}" _setup_nvmet diff --git a/tests/nvme/043 b/tests/nvme/043 index a030884aa4ed..b591e39d0706 100755 --- a/tests/nvme/043 +++ b/tests/nvme/043 @@ -33,12 +33,8 @@ test() { echo "Running ${TEST_NAME}" - hostid="$(uuidgen)" - if [ -z "$hostid" ] ; then - echo "uuidgen failed" - return 1 - fi - hostnqn="nqn.2014-08.org.nvmexpress:uuid:${hostid}" + hostid="${def_hostid}" + hostnqn="${def_hostnqn}" _setup_nvmet diff --git a/tests/nvme/044 b/tests/nvme/044 index 9928bcc55397..fca0897af27b 100755 --- a/tests/nvme/044 +++ b/tests/nvme/044 @@ -32,12 +32,8 @@ test() { echo "Running ${TEST_NAME}" - hostid="$(uuidgen)" - if [ -z "$hostid" ] ; then - echo "uuidgen failed" - return 1 - fi - hostnqn="nqn.2014-08.org.nvmexpress:uuid:${hostid}" + hostid="${def_hostid}" + hostnqn="${def_hostnqn}" hostkey="$(nvme gen-dhchap-key -n ${subsys_name} 2> /dev/null)" if [ -z "$hostkey" ] ; then diff --git a/tests/nvme/045 b/tests/nvme/045 index 26a55335a92c..eca629a18691 100755 --- a/tests/nvme/045 +++ b/tests/nvme/045 @@ -36,12 +36,8 @@ test() { echo "Running ${TEST_NAME}" - hostid="$(uuidgen)" - if [ -z "$hostid" ] ; then - echo "uuidgen failed" - return 1 - fi - hostnqn="nqn.2014-08.org.nvmexpress:uuid:${hostid}" + hostid="${def_hostid}" + hostnqn="${def_hostnqn}" hostkey="$(nvme gen-dhchap-key -n ${subsys_name} 2> /dev/null)" if [ -z "$hostkey" ] ; then
The host might have enabled the udev/systemd auto connect feature. This disturbs the blktests for the fc transport. nvme-cli is able to distinguish between the different invocations via the --context option. In order to get this working we have to use the default hostnqn and hostid and not randon generated IDs for every single run. Signed-off-by: Daniel Wagner <dwagner@suse.de> --- tests/nvme/041 | 8 ++------ tests/nvme/042 | 8 ++------ tests/nvme/043 | 8 ++------ tests/nvme/044 | 8 ++------ tests/nvme/045 | 8 ++------ 5 files changed, 10 insertions(+), 30 deletions(-)