Commit ee8af4e9 authored by Jim Harris's avatar Jim Harris
Browse files

blob: fix _spdk_bs_load_ctx_fail ordering 



Finish the sequence first, before calling _spdk_bs_free().
Otherwise synchronous bs_devs (like we use in the unit
tests) cause the sequence memory to get freed via
_spdk_bs_free() and then we try to finish the sequence.

This eliminates the need for g_scheduler_delay and
_bs_flush_scheduler() in the blob unit tests.  But don't
remove them - they will be useful in upcoming unit tests
for queued persist operations.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I09aac3ae4d3a56ff8e04a5b822fcd6746f13afc3

Reviewed-on: https://review.gerrithub.io/401267


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarMaciej Szwed <maciej.szwed@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 758a42f6

lib/blob/blobstore.c

+1 −1
Original line number Diff line number Diff line
@@ -2070,6 +2070,7 @@ _spdk_bs_load_ctx_fail(spdk_bs_sequence_t *seq, struct spdk_bs_load_ctx *ctx, in 
	assert(bserrno != 0);



	spdk_dma_free(ctx->super);

	spdk_bs_sequence_finish(seq, bserrno);

	/*

	 * Only free the blobstore when a load fails.  If an unload fails (for some reason)

	 *  we want to keep the blobstore in case the caller wants to try again.
@@ -2078,7 +2079,6 @@ _spdk_bs_load_ctx_fail(spdk_bs_sequence_t *seq, struct spdk_bs_load_ctx *ctx, in 
		_spdk_bs_free(ctx->bs);

	}

	free(ctx);

	spdk_bs_sequence_finish(seq, bserrno);

}



static void

test/unit/lib/blob/blob.c/blob_ut.c

+3 −24
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ _bs_send_msg(spdk_thread_fn fn, void *ctx, void *thread_ctx) 
	}

}



#if 0

static void

_bs_flush_scheduler(void)

{
@@ -112,6 +113,7 @@ _bs_flush_scheduler(void) 
		free(ops);

	}

}

#endif



static void

bs_op_complete(void *cb_arg, int bserrno)
@@ -1354,8 +1356,6 @@ bs_load(void) 
	size_t value_len;

	struct spdk_bs_opts opts;



	g_scheduler_delay = true;



	dev = init_dev();

	spdk_bs_opts_init(&opts);

	strncpy(opts.bstype.bstype, "TESTTYPE", SPDK_BLOBSTORE_TYPE_LENGTH);
@@ -1452,7 +1452,6 @@ bs_load(void) 
	spdk_bs_unload(g_bs, bs_op_complete, NULL);

	CU_ASSERT(g_bserrno == 0);

	g_bs = NULL;

	g_scheduler_delay = false;

}



static void
@@ -1461,8 +1460,6 @@ bs_type(void) 
	struct spdk_bs_dev *dev;

	struct spdk_bs_opts opts;



	g_scheduler_delay = true;



	dev = init_dev();

	spdk_bs_opts_init(&opts);

	strncpy(opts.bstype.bstype, "TESTTYPE", SPDK_BLOBSTORE_TYPE_LENGTH);
@@ -1521,7 +1518,6 @@ bs_type(void) 
	spdk_bs_unload(g_bs, bs_op_complete, NULL);

	CU_ASSERT(g_bserrno == 0);

	g_bs = NULL;

	g_scheduler_delay = false;

}



static void
@@ -1532,8 +1528,6 @@ bs_super_block(void) 
	struct spdk_bs_opts opts;

	struct spdk_bs_super_block_ver1 super_block_v1;



	g_scheduler_delay = true;



	dev = init_dev();

	spdk_bs_opts_init(&opts);

	strncpy(opts.bstype.bstype, "TESTTYPE", SPDK_BLOBSTORE_TYPE_LENGTH);
@@ -1584,7 +1578,6 @@ bs_super_block(void) 
	spdk_bs_unload(g_bs, bs_op_complete, NULL);

	CU_ASSERT(g_bserrno == 0);

	g_bs = NULL;

	g_scheduler_delay = false;

}



/*
@@ -1867,11 +1860,6 @@ bs_destroy(void) 
	struct spdk_bs_dev *dev;

	struct spdk_bs_opts opts;



	g_scheduler_delay = true;



	_bs_flush_scheduler();

	CU_ASSERT(TAILQ_EMPTY(&g_scheduled_ops));



	/* Initialize a new blob store */

	dev = init_dev();

	spdk_bs_opts_init(&opts);
@@ -1882,9 +1870,6 @@ bs_destroy(void) 
	/* Destroy the blob store */

	g_bserrno = -1;

	spdk_bs_destroy(g_bs, bs_op_complete, NULL);

	/* Callback is called after device is destroyed in next scheduler run. */

	_bs_flush_scheduler();

	CU_ASSERT(TAILQ_EMPTY(&g_scheduled_ops));

	CU_ASSERT(g_bserrno == 0);



	/* Loading an non-existent blob store should fail. */
@@ -1894,7 +1879,6 @@ bs_destroy(void) 


	spdk_bs_load(dev, &opts, bs_op_with_handle_complete, NULL);

	CU_ASSERT(g_bserrno != 0);

	g_scheduler_delay = false;

}



/* Try to hit all of the corner cases associated with serializing
@@ -2071,15 +2055,10 @@ super_block_crc(void) 
	super_block->crc = 0;

	dev = init_dev();



	g_scheduler_delay = true;

	/* Load an existing blob store */

	g_bserrno = 0;

	spdk_bs_load(dev, &opts, bs_op_with_handle_complete, NULL);



	CU_ASSERT(g_bserrno == -EILSEQ);

	_bs_flush_scheduler();

	CU_ASSERT(TAILQ_EMPTY(&g_scheduled_ops));



	g_scheduler_delay = false;

}



/* For blob dirty shutdown test case we do the following sub-test cases: