github/ocf
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix error handling in cache unplug

Browse Source 
Errors not related to cache disk I/O failure should force
cache stop to return with error without deinitializing cache
instance.

Signed-off-by: Adam Rutkowski <adam.j.rutkowski@intel.com>
This commit is contained in:
Adam Rutkowski 2019-04-08 19:29:42 -04:00
parent aad1c05aee
commit a6e7ee528e
1 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/mngt/ocf_mngt_cache.c
View File

@ -1980,7 +1980,7 @@ struct ocf_mngt_cache_stop_context {
ocf_cache_t cache; ocf_cache_t cache;
ocf_ctx_t ctx; ocf_ctx_t ctx;
char cache_name[OCF_CACHE_NAME_SIZE]; char cache_name[OCF_CACHE_NAME_SIZE];
int error; int cache_write_error;
}; };
static void ocf_mngt_cache_stop_wait_io(ocf_pipeline_t pipeline, static void ocf_mngt_cache_stop_wait_io(ocf_pipeline_t pipeline,
@ -2022,7 +2022,16 @@ static void ocf_mngt_cache_stop_unplug_complete(void *priv, int error)
{ {
struct ocf_mngt_cache_stop_context *context = priv; struct ocf_mngt_cache_stop_context *context = priv;
context->error = error; /* short-circut execution in case of critical error */
if (error && error != -OCF_ERR_WRITE_CACHE) {
ocf_pipeline_finish(context->pipeline, error);
return;
}
/* in case of non-critical (disk write) error just remember its value */
if (error)
context->cache_write_error = error;
ocf_pipeline_next(context->pipeline); ocf_pipeline_next(context->pipeline);
} }
@ -2061,20 +2070,22 @@ static void ocf_mngt_cache_stop_finish(ocf_pipeline_t pipeline,
ocf_cache_t cache = context->cache; ocf_cache_t cache = context->cache;
ocf_ctx_t ctx = context->ctx; ocf_ctx_t ctx = context->ctx;
if (error) if (!error) {
context->error = error; env_mutex_lock(&ctx->lock);
/* Mark device uninitialized */
cache->valid_ocf_cache_device_t = 0;
/* Remove cache from the list */
list_del(&cache->list);
env_mutex_unlock(&ctx->lock);
} else {
env_bit_clear(ocf_cache_state_stopping, &cache->cache_state);
env_bit_set(ocf_cache_state_running, &cache->cache_state);
}
env_mutex_lock(&ctx->lock); if (context->cache_write_error) {
/* Mark device uninitialized */
cache->valid_ocf_cache_device_t = 0;
/* Remove cache from the list */
list_del(&cache->list);
env_mutex_unlock(&ctx->lock);
if (context->error == -OCF_ERR_WRITE_CACHE) {
ocf_log(ctx, log_warn, "Stopped cache %s with errors\n", ocf_log(ctx, log_warn, "Stopped cache %s with errors\n",
context->cache_name); context->cache_name);
} else if (context->error) { } else if (error) {
ocf_log(ctx, log_err, "Stopping cache %s failed\n", ocf_log(ctx, log_err, "Stopping cache %s failed\n",
context->cache_name); context->cache_name);
} else { } else {
@ -2082,12 +2093,15 @@ static void ocf_mngt_cache_stop_finish(ocf_pipeline_t pipeline,
context->cache_name); context->cache_name);
} }
context->cmpl(cache, context->priv, context->error); context->cmpl(cache, context->priv,
error ?: context->cache_write_error);
ocf_pipeline_destroy(context->pipeline); ocf_pipeline_destroy(context->pipeline);
/* Finally release cache instance */ if (!error) {
ocf_mngt_cache_put(cache); /* Finally release cache instance */
ocf_mngt_cache_put(cache);
}
} }
struct ocf_pipeline_properties ocf_mngt_cache_stop_pipeline_properties = { struct ocf_pipeline_properties ocf_mngt_cache_stop_pipeline_properties = {