Commit 3d1c1f94 authored by Jim Harris's avatar Jim Harris
Browse files

reduce: don't try to clear io units for empty chunk maps 



Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Reported-by: Shuhei Matsumoto
Change-Id: Idcf427e32962236acfeb7dab793e27c44cdc6151

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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
parent 0b0af8f3

lib/reduce/reduce.c

+12 −8
Original line number Diff line number Diff line
@@ -182,6 +182,8 @@ _get_pm_total_chunks_size(uint64_t vol_size, uint64_t chunk_size, uint64_t backi 
static uint64_t *

_reduce_vol_get_chunk_map(struct spdk_reduce_vol *vol, uint64_t chunk_map_index)

{

	assert(chunk_map_index < _get_total_chunks(vol->params.vol_size, vol->params.chunk_size));



	return vol->pm_chunk_maps + (chunk_map_index * vol->backing_io_units_per_chunk);

}
@@ -728,6 +730,7 @@ _write_complete_req(void *_req, int reduce_errno) 
	logical_map_index = req->offset / vol->logical_blocks_per_chunk;



	old_chunk_map_index = vol->pm_logical_map[logical_map_index];

	if (old_chunk_map_index != REDUCE_EMPTY_MAP_ENTRY) {

		old_chunk = _reduce_vol_get_chunk_map(vol, old_chunk_map_index);

		for (i = 0; i < vol->backing_io_units_per_chunk; i++) {

			if (old_chunk[i] == REDUCE_EMPTY_MAP_ENTRY) {
@@ -738,6 +741,7 @@ _write_complete_req(void *_req, int reduce_errno) 
			old_chunk[i] = REDUCE_EMPTY_MAP_ENTRY;

		}

		spdk_bit_array_clear(vol->allocated_chunk_maps, old_chunk_map_index);

	}



	/*

	 * We don't need to persist the clearing of the old chunk map here.  The old chunk map