shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-18 10:04:20 +03:00
Code Releases Activity

lvmetad: add request level thread locking

Browse Source 
Use an rwlock for requests that read/write cache state.
Use a mutex for requests that read/write global info.
This commit is contained in:
David Teigland 2016-05-10 14:42:26 -05:00
parent 7ef152c072
commit 9f72a52302
1 changed files with 75 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
daemons/lvmetad/lvmetad-core.c
View File

@ -232,6 +232,8 @@ typedef struct {
char token[128]; char token[128];
uint32_t flags; /* GLFL_ */ uint32_t flags; /* GLFL_ */
pthread_mutex_t token_lock; pthread_mutex_t token_lock;
pthread_mutex_t info_lock;
pthread_rwlock_t cache_lock;
} lvmetad_state; } lvmetad_state;
static void destroy_metadata_hashes(lvmetad_state *s) static void destroy_metadata_hashes(lvmetad_state *s)
@ -2783,10 +2785,13 @@ static response dump(lvmetad_state *s)
static response handler(daemon_state s, client_handle h, request r) static response handler(daemon_state s, client_handle h, request r)
{ {
response res = { 0 };
lvmetad_state *state = s.private; lvmetad_state *state = s.private;
const char *rq = daemon_request_str(r, "request", "NONE"); const char *rq = daemon_request_str(r, "request", "NONE");
const char *token = daemon_request_str(r, "token", "NONE"); const char *token = daemon_request_str(r, "token", "NONE");
char prev_token[128] = { 0 }; char prev_token[128] = { 0 };
int cache_lock = 0;
int info_lock = 0;
pthread_mutex_lock(&state->token_lock); pthread_mutex_lock(&state->token_lock);
if (!strcmp(rq, "token_update")) { if (!strcmp(rq, "token_update")) {
@ -2813,49 +2818,89 @@ static response handler(daemon_state s, client_handle h, request r)
* TODO Add a stats call, with transaction count/rate, time since last * TODO Add a stats call, with transaction count/rate, time since last
* update &c. * update &c.
*/ */
if (!strcmp(rq, "pv_found") ||
!strcmp(rq, "pv_gone") ||
!strcmp(rq, "vg_update") ||
!strcmp(rq, "vg_remove") ||
!strcmp(rq, "set_vg_info") ||
!strcmp(rq, "pv_clear_all") ||
!strcmp(rq, "vg_clear_outdated_pvs")) {
pthread_rwlock_wrlock(&state->cache_lock);
cache_lock = 1;
goto do_rq;
}
if (!strcmp(rq, "pv_lookup") ||
!strcmp(rq, "vg_lookup") ||
!strcmp(rq, "pv_list") ||
!strcmp(rq, "vg_list") ||
!strcmp(rq, "dump")) {
pthread_rwlock_rdlock(&state->cache_lock);
cache_lock = 1;
goto do_rq;
}
if (!strcmp(rq, "set_global_info") ||
!strcmp(rq, "get_global_info")) {
pthread_mutex_lock(&state->info_lock);
info_lock = 1;
goto do_rq;
}
do_rq:
if (!strcmp(rq, "pv_found")) if (!strcmp(rq, "pv_found"))
return pv_found(state, r); res = pv_found(state, r);
if (!strcmp(rq, "pv_gone")) else if (!strcmp(rq, "pv_gone"))
return pv_gone(state, r); res = pv_gone(state, r);
if (!strcmp(rq, "pv_clear_all")) else if (!strcmp(rq, "pv_clear_all"))
return pv_clear_all(state, r); res = pv_clear_all(state, r);
if (!strcmp(rq, "pv_lookup")) else if (!strcmp(rq, "pv_lookup"))
return pv_lookup(state, r); res = pv_lookup(state, r);
if (!strcmp(rq, "vg_update")) else if (!strcmp(rq, "vg_update"))
return vg_update(state, r); res = vg_update(state, r);
if (!strcmp(rq, "vg_clear_outdated_pvs")) else if (!strcmp(rq, "vg_clear_outdated_pvs"))
return vg_clear_outdated_pvs(state, r); res = vg_clear_outdated_pvs(state, r);
if (!strcmp(rq, "vg_remove")) else if (!strcmp(rq, "vg_remove"))
return vg_remove(state, r); res = vg_remove(state, r);
if (!strcmp(rq, "vg_lookup")) else if (!strcmp(rq, "vg_lookup"))
return vg_lookup(state, r); res = vg_lookup(state, r);
if (!strcmp(rq, "pv_list")) else if (!strcmp(rq, "pv_list"))
return pv_list(state, r); res = pv_list(state, r);
if (!strcmp(rq, "vg_list")) else if (!strcmp(rq, "vg_list"))
return vg_list(state, r); res = vg_list(state, r);
if (!strcmp(rq, "set_global_info")) else if (!strcmp(rq, "set_global_info"))
return set_global_info(state, r); res = set_global_info(state, r);
if (!strcmp(rq, "get_global_info")) else if (!strcmp(rq, "get_global_info"))
return get_global_info(state, r); res = get_global_info(state, r);
if (!strcmp(rq, "set_vg_info")) else if (!strcmp(rq, "set_vg_info"))
return set_vg_info(state, r); res = set_vg_info(state, r);
if (!strcmp(rq, "dump")) else if (!strcmp(rq, "dump"))
return dump(state); res = dump(state);
return reply_fail("request not implemented"); else
res = reply_fail("request not implemented");
if (cache_lock)
pthread_rwlock_unlock(&state->cache_lock);
if (info_lock)
pthread_mutex_unlock(&state->info_lock);
return res;
} }
static int init(daemon_state *s) static int init(daemon_state *s)
@ -2871,6 +2916,8 @@ static int init(daemon_state *s)
pthread_mutex_init(&ls->lock.pvid_to_vgid, NULL); pthread_mutex_init(&ls->lock.pvid_to_vgid, NULL);
pthread_mutex_init(&ls->lock.vg_lock_map, NULL); pthread_mutex_init(&ls->lock.vg_lock_map, NULL);
pthread_mutex_init(&ls->token_lock, NULL); pthread_mutex_init(&ls->token_lock, NULL);
pthread_mutex_init(&ls->info_lock, NULL);
pthread_rwlock_init(&ls->cache_lock, NULL);
create_metadata_hashes(ls); create_metadata_hashes(ls);
ls->lock.vg = dm_hash_create(32); ls->lock.vg = dm_hash_create(32);