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

lvmlockd: cosemtic improvements to logging

Browse Source 
Also pass our name to sanlock so it appears in
the sanlock status output.
This commit is contained in:
David Teigland 2016-01-15 15:34:49 -06:00
parent 95ead96004
commit 06346eab84
3 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
daemons/lvmlockd/lvmlockd-core.c
View File

@ -741,24 +741,6 @@ static const char *op_str(int x)
}; };
} }
static const char *mode_str(int x)
{
switch (x) {
case LD_LK_IV:
return "iv";
case LD_LK_UN:
return "un";
case LD_LK_NL:
return "nl";
case LD_LK_SH:
return "sh";
case LD_LK_EX:
return "ex";
default:
return ".";
};
}
int last_string_from_args(char *args_in, char *last) int last_string_from_args(char *args_in, char *last)
{ {
const char *args = args_in; const char *args = args_in;
@ -1365,7 +1347,7 @@ static int res_convert(struct lockspace *ls, struct resource *r,
r->last_client_id = act->client_id; r->last_client_id = act->client_id;
log_debug("S %s R %s res_convert cl %u mode %d", ls->name, r->name, act->client_id, act->mode); log_debug("S %s R %s res_convert cl %u mode %s", ls->name, r->name, act->client_id, mode_str(act->mode));
if (act->mode == LD_LK_EX && lk->mode == LD_LK_SH && r->sh_count > 1) if (act->mode == LD_LK_EX && lk->mode == LD_LK_SH && r->sh_count > 1)
return -EAGAIN; return -EAGAIN;

17
daemons/lvmlockd/lvmlockd-internal.h
View File

@ -351,6 +351,23 @@ int lockspaces_empty(void);
int last_string_from_args(char *args_in, char *last); int last_string_from_args(char *args_in, char *last);
int version_from_args(char *args, unsigned int *major, unsigned int *minor, unsigned int *patch); int version_from_args(char *args, unsigned int *major, unsigned int *minor, unsigned int *patch);
static inline const char *mode_str(int x)
{
switch (x) {
case LD_LK_IV:
return "iv";
case LD_LK_UN:
return "un";
case LD_LK_NL:
return "nl";
case LD_LK_SH:
return "sh";
case LD_LK_EX:
return "ex";
default:
return ".";
};
}
#ifdef LOCKDDLM_SUPPORT #ifdef LOCKDDLM_SUPPORT

17
daemons/lvmlockd/lvmlockd-sanlock.c
View File

@ -1324,6 +1324,7 @@ int lm_lock_sanlock(struct lockspace *ls, struct resource *r, int ld_mode,
struct lm_sanlock *lms = (struct lm_sanlock *)ls->lm_data; struct lm_sanlock *lms = (struct lm_sanlock *)ls->lm_data;
struct rd_sanlock *rds = (struct rd_sanlock *)r->lm_data; struct rd_sanlock *rds = (struct rd_sanlock *)r->lm_data;
struct sanlk_resource *rs; struct sanlk_resource *rs;
struct sanlk_options opt;
uint64_t lock_lv_offset; uint64_t lock_lv_offset;
uint32_t flags = 0; uint32_t flags = 0;
struct val_blk vb; struct val_blk vb;
@ -1397,8 +1398,8 @@ int lm_lock_sanlock(struct lockspace *ls, struct resource *r, int ld_mode,
rs->flags |= SANLK_RES_PERSISTENT; rs->flags |= SANLK_RES_PERSISTENT;
log_debug("S %s R %s lock_san acquire %s:%llu", log_debug("S %s R %s lock_san %s at %s:%llu",
ls->name, r->name, rs->disks[0].path, ls->name, r->name, mode_str(ld_mode), rs->disks[0].path,
(unsigned long long)rs->disks[0].offset); (unsigned long long)rs->disks[0].offset);
if (daemon_test) { if (daemon_test) {
@ -1424,7 +1425,10 @@ int lm_lock_sanlock(struct lockspace *ls, struct resource *r, int ld_mode,
flags |= SANLK_ACQUIRE_OWNER_NOWAIT; flags |= SANLK_ACQUIRE_OWNER_NOWAIT;
#endif #endif
rv = sanlock_acquire(lms->sock, -1, flags, 1, &rs, NULL); memset(&opt, 0, sizeof(opt));
sprintf(opt.owner_name, "%s", "lvmlockd");
rv = sanlock_acquire(lms->sock, -1, flags, 1, &rs, &opt);
if (rv == -EAGAIN) { if (rv == -EAGAIN) {
/* /*
@ -1584,7 +1588,8 @@ int lm_convert_sanlock(struct lockspace *ls, struct resource *r,
uint32_t flags = 0; uint32_t flags = 0;
int rv; int rv;
log_debug("S %s R %s convert_san", ls->name, r->name); log_debug("S %s R %s convert_san %s to %s",
ls->name, r->name, mode_str(r->mode), mode_str(ld_mode));
if (daemon_test) if (daemon_test)
goto rs_flag; goto rs_flag;
@ -1688,8 +1693,8 @@ int lm_unlock_sanlock(struct lockspace *ls, struct resource *r,
struct val_blk vb; struct val_blk vb;
int rv; int rv;
log_debug("S %s R %s unlock_san r_version %u flags %x", log_debug("S %s R %s unlock_san %s r_version %u flags %x",
ls->name, r->name, r_version, lmu_flags); ls->name, r->name, mode_str(r->mode), r_version, lmu_flags);
if (daemon_test) { if (daemon_test) {
if (rds->vb && r_version && (r->mode == LD_LK_EX)) { if (rds->vb && r_version && (r->mode == LD_LK_EX)) {