dlm: add log_info config option
This config option can be used to disable the LOG_INFO recovery messages. Signed-off-by: Zhilong Liu <zlliu@suse.com> Signed-off-by: David Teigland <teigland@redhat.com>
This commit is contained in:
parent
33688abb28
commit
505ee5283c
|
@ -73,6 +73,7 @@ struct dlm_cluster {
|
||||||
unsigned int cl_toss_secs;
|
unsigned int cl_toss_secs;
|
||||||
unsigned int cl_scan_secs;
|
unsigned int cl_scan_secs;
|
||||||
unsigned int cl_log_debug;
|
unsigned int cl_log_debug;
|
||||||
|
unsigned int cl_log_info;
|
||||||
unsigned int cl_protocol;
|
unsigned int cl_protocol;
|
||||||
unsigned int cl_timewarn_cs;
|
unsigned int cl_timewarn_cs;
|
||||||
unsigned int cl_waitwarn_us;
|
unsigned int cl_waitwarn_us;
|
||||||
|
@ -95,6 +96,7 @@ enum {
|
||||||
CLUSTER_ATTR_TOSS_SECS,
|
CLUSTER_ATTR_TOSS_SECS,
|
||||||
CLUSTER_ATTR_SCAN_SECS,
|
CLUSTER_ATTR_SCAN_SECS,
|
||||||
CLUSTER_ATTR_LOG_DEBUG,
|
CLUSTER_ATTR_LOG_DEBUG,
|
||||||
|
CLUSTER_ATTR_LOG_INFO,
|
||||||
CLUSTER_ATTR_PROTOCOL,
|
CLUSTER_ATTR_PROTOCOL,
|
||||||
CLUSTER_ATTR_TIMEWARN_CS,
|
CLUSTER_ATTR_TIMEWARN_CS,
|
||||||
CLUSTER_ATTR_WAITWARN_US,
|
CLUSTER_ATTR_WAITWARN_US,
|
||||||
|
@ -166,6 +168,7 @@ CLUSTER_ATTR(recover_timer, 1);
|
||||||
CLUSTER_ATTR(toss_secs, 1);
|
CLUSTER_ATTR(toss_secs, 1);
|
||||||
CLUSTER_ATTR(scan_secs, 1);
|
CLUSTER_ATTR(scan_secs, 1);
|
||||||
CLUSTER_ATTR(log_debug, 0);
|
CLUSTER_ATTR(log_debug, 0);
|
||||||
|
CLUSTER_ATTR(log_info, 0);
|
||||||
CLUSTER_ATTR(protocol, 0);
|
CLUSTER_ATTR(protocol, 0);
|
||||||
CLUSTER_ATTR(timewarn_cs, 1);
|
CLUSTER_ATTR(timewarn_cs, 1);
|
||||||
CLUSTER_ATTR(waitwarn_us, 0);
|
CLUSTER_ATTR(waitwarn_us, 0);
|
||||||
|
@ -180,6 +183,7 @@ static struct configfs_attribute *cluster_attrs[] = {
|
||||||
[CLUSTER_ATTR_TOSS_SECS] = &cluster_attr_toss_secs,
|
[CLUSTER_ATTR_TOSS_SECS] = &cluster_attr_toss_secs,
|
||||||
[CLUSTER_ATTR_SCAN_SECS] = &cluster_attr_scan_secs,
|
[CLUSTER_ATTR_SCAN_SECS] = &cluster_attr_scan_secs,
|
||||||
[CLUSTER_ATTR_LOG_DEBUG] = &cluster_attr_log_debug,
|
[CLUSTER_ATTR_LOG_DEBUG] = &cluster_attr_log_debug,
|
||||||
|
[CLUSTER_ATTR_LOG_INFO] = &cluster_attr_log_info,
|
||||||
[CLUSTER_ATTR_PROTOCOL] = &cluster_attr_protocol,
|
[CLUSTER_ATTR_PROTOCOL] = &cluster_attr_protocol,
|
||||||
[CLUSTER_ATTR_TIMEWARN_CS] = &cluster_attr_timewarn_cs,
|
[CLUSTER_ATTR_TIMEWARN_CS] = &cluster_attr_timewarn_cs,
|
||||||
[CLUSTER_ATTR_WAITWARN_US] = &cluster_attr_waitwarn_us,
|
[CLUSTER_ATTR_WAITWARN_US] = &cluster_attr_waitwarn_us,
|
||||||
|
@ -365,6 +369,7 @@ static struct config_group *make_cluster(struct config_group *g,
|
||||||
cl->cl_toss_secs = dlm_config.ci_toss_secs;
|
cl->cl_toss_secs = dlm_config.ci_toss_secs;
|
||||||
cl->cl_scan_secs = dlm_config.ci_scan_secs;
|
cl->cl_scan_secs = dlm_config.ci_scan_secs;
|
||||||
cl->cl_log_debug = dlm_config.ci_log_debug;
|
cl->cl_log_debug = dlm_config.ci_log_debug;
|
||||||
|
cl->cl_log_info = dlm_config.ci_log_info;
|
||||||
cl->cl_protocol = dlm_config.ci_protocol;
|
cl->cl_protocol = dlm_config.ci_protocol;
|
||||||
cl->cl_timewarn_cs = dlm_config.ci_timewarn_cs;
|
cl->cl_timewarn_cs = dlm_config.ci_timewarn_cs;
|
||||||
cl->cl_waitwarn_us = dlm_config.ci_waitwarn_us;
|
cl->cl_waitwarn_us = dlm_config.ci_waitwarn_us;
|
||||||
|
@ -850,6 +855,7 @@ int dlm_our_addr(struct sockaddr_storage *addr, int num)
|
||||||
#define DEFAULT_TOSS_SECS 10
|
#define DEFAULT_TOSS_SECS 10
|
||||||
#define DEFAULT_SCAN_SECS 5
|
#define DEFAULT_SCAN_SECS 5
|
||||||
#define DEFAULT_LOG_DEBUG 0
|
#define DEFAULT_LOG_DEBUG 0
|
||||||
|
#define DEFAULT_LOG_INFO 1
|
||||||
#define DEFAULT_PROTOCOL 0
|
#define DEFAULT_PROTOCOL 0
|
||||||
#define DEFAULT_TIMEWARN_CS 500 /* 5 sec = 500 centiseconds */
|
#define DEFAULT_TIMEWARN_CS 500 /* 5 sec = 500 centiseconds */
|
||||||
#define DEFAULT_WAITWARN_US 0
|
#define DEFAULT_WAITWARN_US 0
|
||||||
|
@ -865,6 +871,7 @@ struct dlm_config_info dlm_config = {
|
||||||
.ci_toss_secs = DEFAULT_TOSS_SECS,
|
.ci_toss_secs = DEFAULT_TOSS_SECS,
|
||||||
.ci_scan_secs = DEFAULT_SCAN_SECS,
|
.ci_scan_secs = DEFAULT_SCAN_SECS,
|
||||||
.ci_log_debug = DEFAULT_LOG_DEBUG,
|
.ci_log_debug = DEFAULT_LOG_DEBUG,
|
||||||
|
.ci_log_info = DEFAULT_LOG_INFO,
|
||||||
.ci_protocol = DEFAULT_PROTOCOL,
|
.ci_protocol = DEFAULT_PROTOCOL,
|
||||||
.ci_timewarn_cs = DEFAULT_TIMEWARN_CS,
|
.ci_timewarn_cs = DEFAULT_TIMEWARN_CS,
|
||||||
.ci_waitwarn_us = DEFAULT_WAITWARN_US,
|
.ci_waitwarn_us = DEFAULT_WAITWARN_US,
|
||||||
|
|
|
@ -31,6 +31,7 @@ struct dlm_config_info {
|
||||||
int ci_toss_secs;
|
int ci_toss_secs;
|
||||||
int ci_scan_secs;
|
int ci_scan_secs;
|
||||||
int ci_log_debug;
|
int ci_log_debug;
|
||||||
|
int ci_log_info;
|
||||||
int ci_protocol;
|
int ci_protocol;
|
||||||
int ci_timewarn_cs;
|
int ci_timewarn_cs;
|
||||||
int ci_waitwarn_us;
|
int ci_waitwarn_us;
|
||||||
|
|
|
@ -65,8 +65,16 @@ struct dlm_mhandle;
|
||||||
printk(KERN_ERR "dlm: "fmt"\n" , ##args)
|
printk(KERN_ERR "dlm: "fmt"\n" , ##args)
|
||||||
#define log_error(ls, fmt, args...) \
|
#define log_error(ls, fmt, args...) \
|
||||||
printk(KERN_ERR "dlm: %s: " fmt "\n", (ls)->ls_name , ##args)
|
printk(KERN_ERR "dlm: %s: " fmt "\n", (ls)->ls_name , ##args)
|
||||||
|
|
||||||
#define log_rinfo(ls, fmt, args...) \
|
#define log_rinfo(ls, fmt, args...) \
|
||||||
printk(KERN_INFO "dlm: %s: " fmt "\n", (ls)->ls_name , ##args);
|
do { \
|
||||||
|
if (dlm_config.ci_log_info) \
|
||||||
|
printk(KERN_INFO "dlm: %s: " fmt "\n", \
|
||||||
|
(ls)->ls_name, ##args); \
|
||||||
|
else if (dlm_config.ci_log_debug) \
|
||||||
|
printk(KERN_DEBUG "dlm: %s: " fmt "\n", \
|
||||||
|
(ls)->ls_name , ##args); \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
#define log_debug(ls, fmt, args...) \
|
#define log_debug(ls, fmt, args...) \
|
||||||
do { \
|
do { \
|
||||||
|
|
Loading…
Reference in New Issue