Commit 4c1757ff authored by Peng Lian's avatar Peng Lian Committed by Tomasz Zawadzki
Browse files

nvmf: update discovery log when removing hostnqn 



In NVMF Revision spec 1.1a, discovery log should be updated
when removing hostnqn of subsystem.

Update unit test to check the discovery log when removing
hostnqn and destroying subsystem.

Signed-off-by: default avatarPeng Lian <peng.lian@smartx.com>
Change-Id: I51c597a2493295a677a7aa68e4f13a887f7e1140
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/10668


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
parent 17a662f9

lib/nvmf/subsystem.c

+5 −0
Original line number Diff line number Diff line
@@ -860,6 +860,11 @@ spdk_nvmf_subsystem_remove_host(struct spdk_nvmf_subsystem *subsystem, const cha 
	}



	nvmf_subsystem_remove_host(subsystem, host);



	if (!TAILQ_EMPTY(&subsystem->listeners)) {

		nvmf_update_discovery_log(subsystem->tgt, hostnqn);

	}



	pthread_mutex_unlock(&subsystem->mutex);



	return 0;

test/unit/lib/nvmf/ctrlr_discovery.c/ctrlr_discovery_ut.c

+23 −0
Original line number Diff line number Diff line
@@ -370,9 +370,32 @@ test_discovery_log(void) 
	nvmf_get_discovery_log_page(&tgt, hostnqn, &iov, 1,

				    offsetof(struct spdk_nvmf_discovery_log_page, entries[0]), sizeof(*entry), &trid);

	CU_ASSERT(entry->trtype == 42);



	/* remove the host and verify that the discovery log contains nothing */

	rc = spdk_nvmf_subsystem_remove_host(subsystem, hostnqn);

	CU_ASSERT(rc == 0);



	/* Get only the header, no entries */

	memset(buffer, 0xCC, sizeof(buffer));

	disc_log = (struct spdk_nvmf_discovery_log_page *)buffer;

	nvmf_get_discovery_log_page(&tgt, hostnqn, &iov, 1, 0, sizeof(*disc_log),

				    &trid);

	CU_ASSERT(disc_log->genctr != 0);

	CU_ASSERT(disc_log->numrec == 0);



	/* destroy the subsystem and verify that the discovery log contains nothing */

	subsystem->state = SPDK_NVMF_SUBSYSTEM_INACTIVE;

	rc = spdk_nvmf_subsystem_destroy(subsystem, NULL, NULL);

	CU_ASSERT(rc == 0);



	/* Get only the header, no entries */

	memset(buffer, 0xCC, sizeof(buffer));

	disc_log = (struct spdk_nvmf_discovery_log_page *)buffer;

	nvmf_get_discovery_log_page(&tgt, hostnqn, &iov, 1, 0, sizeof(*disc_log),

				    &trid);

	CU_ASSERT(disc_log->genctr != 0);

	CU_ASSERT(disc_log->numrec == 0);



	free(tgt.subsystems);

}