Some more debug stuff
Added two debugfs entries... one to dump o2hb livenodes and the other to dump osb.
$ cat /sys/kernel/debug/ocfs2/BC4F4550BEA74F92BDCC746AAD2EC0BF/fs_state
Device => Id: 8,65 Uuid: BC4F4550BEA74F92BDCC746AAD2EC0BF Gen: 0xA02024F2 Label: sunil-xattr
Volume => State: 1 Flags: 0x0
Sizes => Block: 4096 Cluster: 4096
Features => Compat: 0x1 Incompat: 0x350 ROcompat: 0x1
Mount => Opts: 0x1 AtimeQuanta: 60
Cluster => Stack: o2cb Name: BC4F4550BEA74F92BDCC746AAD2EC0BF Version: 1.0
DownCnvt => Pid: 7330 Count: 0 WakeSeq: 149 WorkSeq: 149
Recovery => Pid: -1 Nodes: None
Commit => Pid: 7335 Interval: 0 Needs: 1
Journal => State: 1 NumTxns: 32521 TxnId: 67
Stats => GlobalAllocs: 140 LocalAllocs: 192825 SubAllocs: 73299 LAWinMoves: 140 SAExtends: 72
Steal => Slot: -1 NumStolen: 0
Slots => Num Node RecoGen
* 0 92 2
1 96 0
2 -1 0
3 -1 0Sunil
PATCH 1/4 ocfs2/hb: Exposes list of heartbeating nodes via debugfs
Patch creates a debugfs file, o2hb/livesnodes, which when read will expose the aggregate list of heartbeating node across all heartbeat regions.
--- fs/ocfs2/cluster/heartbeat.c | 140 +++++++++++++++++++++++++++++++++++++++- fs/ocfs2/cluster/heartbeat.h | 3 +- fs/ocfs2/cluster/nodemanager.c | 9 ++- 3 files changed, 148 insertions(+), 4 deletions(-)
fs/ocfs2/cluster/heartbeat.c +139 -1
@@ -33,6 +33,7 @@#include <linux/random.h> #include <linux/crc32.h> #include <linux/time.h> +#include <linux/debugfs.h> #include "heartbeat.h" #include "tcp.h"
@@ -60,6 +61,11 @@ static unsigned long o2hb_live_node_bitmap[BITS_TO_LONGS(O2NM_MAX_NODES)];static LIST_HEAD (o2hb_node_events);static DECLARE_WAIT_QUEUE_HEAD (o2hb_steady_queue); +#define O2HB_DEBUG_DIR "o2hb" +#define O2HB_DEBUG_LIVENODES "livenodes" +static struct dentry *o2hb_debug_dir; +static struct dentry *o2hb_debug_livenodes; +static LIST_HEAD (o2hb_all_regions); static struct o2hb_callback {
@@ -905,7 +911,121 @@ static int o2hb_thread(void *data)return 0 ; } -void o2hb_init (void ) +#ifdef CONFIG_DEBUG_FS +struct o2hb_debug_buffer { +int len; +char *buf; +}; + +static int o2hb_debug_open (struct inode *inode,struct file *file) +{ +unsigned long map[BITS_TO_LONGS (O2NM_MAX_NODES )]; +struct o2hb_debug_buffer *odb =NULL ; +int i =-1 ; +int out =0 ; + + odb =kzalloc (sizeof (struct o2hb_debug_buffer ),GFP_KERNEL ); +if (!odb) + goto bail; + + odb->len =PAGE_SIZE ; + odb->buf =kmalloc (odb->len,GFP_KERNEL ); +if (!odb->buf) { +kfree (odb); + goto bail; + } + +o2hb_fill_node_map (map,sizeof (map)); + +while ((i =find_next_bit (map,O2NM_MAX_NODES , i +1 )) <O2NM_MAX_NODES ) + out +=snprintf (odb->buf + out, odb->len - out,"%d " , i); + out +=snprintf (odb->buf + out, odb->len - out,"\n" ); + + odb->len = out; + + file->private_data = odb; + +return 0 ; +bail: +return -ENOMEM ; +} + +static int o2hb_debug_release (struct inode *inode,struct file *file) +{ +struct o2hb_debug_buffer *odb = + (struct o2hb_debug_buffer *)file->private_data; + +kfree (odb->buf); +kfree (odb); + +return 0 ; +} + +static ssize_t o2hb_debug_read (struct file *file,char __user *buf, +size_t nbytes,loff_t *ppos) +{ +struct o2hb_debug_buffer *odb = + (struct o2hb_debug_buffer *)file->private_data; + +return simple_read_from_buffer (buf, nbytes, ppos, odb->buf, odb->len); +} + +static loff_t o2hb_debug_llseek (struct file *file,loff_t off,int whence) +{ +struct o2hb_debug_buffer *odb = + (struct o2hb_debug_buffer *)file->private_data; +loff_t new =-1 ; + +switch (whence) { +case 0 : + new = off; +break ; +case 1 : + new = file->f_pos + off; +break ; + } + +if (new <0 || new > odb->len) +return -EINVAL ; + +return (file->f_pos = new); +} +#else +static int o2hb_debug_open (struct inode *inode,struct file *file) +{ +return 0 ; +} +static int o2hb_debug_release (struct inode *inode,struct file *file) +{ +return 0 ; +} +static ssize_t o2hb_debug_read (struct file *file,char __user *buf, +size_t nbytes,loff_t *ppos) +{ +return 0 ; +} +static loff_t o2hb_debug_llseek (struct file *file,loff_t off,int whence) +{ +return 0 ; +} +#endif /* CONFIG_DEBUG_FS */ + +static struct file_operations o2hb_debug_fops = { + .open = o2hb_debug_open, + .release = o2hb_debug_release, + .read = o2hb_debug_read, + .llseek = o2hb_debug_llseek, +}; + +void o2hb_exit (void ) +{ +if (o2hb_debug_livenodes) +debugfs_remove (o2hb_debug_livenodes); +if (o2hb_debug_dir) +debugfs_remove (o2hb_debug_dir); +} + +int o2hb_init (void ) {int i;
@@ -918,6 +1038,24 @@ void o2hb_init(void)INIT_LIST_HEAD (&o2hb_node_events);memset (o2hb_live_node_bitmap,0 ,sizeof (o2hb_live_node_bitmap)); + + o2hb_debug_dir =debugfs_create_dir (O2HB_DEBUG_DIR ,NULL ); +if (!o2hb_debug_dir) { +mlog_errno (-ENOMEM ); +return -ENOMEM ; + } + + o2hb_debug_livenodes =debugfs_create_file (O2HB_DEBUG_LIVENODES , +S_IFREG |S_IRUSR , + o2hb_debug_dir,NULL , + &o2hb_debug_fops); +if (!o2hb_debug_livenodes) { +mlog_errno (-ENOMEM ); +debugfs_remove (o2hb_debug_dir); +return -ENOMEM ; + } + +return 0 ; }/* if we're already in a callback then we're already serialized by the sem */
fs/ocfs2/cluster/heartbeat.h +2 -1
@@ -75,7 +75,8 @@ void o2hb_unregister_callback(const char *region_uuid, struct o2hb_callback_func *hc);void o2hb_fill_node_map (unsigned long *map,unsigned bytes); -void o2hb_init (void ); +void o2hb_exit (void ); +int o2hb_init (void );int o2hb_check_node_heartbeating (u8 node_num);int o2hb_check_node_heartbeating_from_callback (u8 node_num);int o2hb_check_local_node_heartbeating (void );
fs/ocfs2/cluster/nodemanager.c +7 -2
@@ -881,6 +881,7 @@ static void __exit exit_o2nm(void)o2cb_sys_shutdown ();o2net_exit (); +o2hb_exit (); }static int __init init_o2nm (void )
@@ -889,11 +890,13 @@ static int __init init_o2nm(void)cluster_print_version (); -o2hb_init (); + ret =o2hb_init (); +if (ret) + goto out; ret =o2net_init ();if (ret) - goto out; + goto out_o2hb; ret =o2net_register_hb_callbacks ();if (ret)
@@ -916,6 +919,8 @@ out_callbacks:o2net_unregister_hb_callbacks (); out_o2net:o2net_exit (); +out_o2hb: +o2hb_exit (); out:return ret; }
Signature · 1 line
1.5.4.3
PATCH 1/4 ocfs2/hb: Exposes list of heartbeating nodes via debugfs
Sunil,
since ocfs2_debug_buffer is so simple a structure and all its members are initialized below. I think substituting kzalloc by kmalloc is better.
but it's not performance critical, kzalloc is also OK. :-P
regards,
wengang.
Quoted 234 lines · Sunil Mushran
Patch creates a debugfs file, o2hb/livesnodes, which when read will expose the aggregate list of heartbeating node across all heartbeat regions.
Signed-off-by Sunil Mushran <[email protected]>--- fs/ocfs2/cluster/heartbeat.c | 140 +++++++++++++++++++++++++++++++++++++++- fs/ocfs2/cluster/heartbeat.h | 3 +- fs/ocfs2/cluster/nodemanager.c | 9 ++- 3 files changed, 148 insertions(+), 4 deletions(-)fs/ocfs2/cluster/heartbeat.c +139
-1@@ -33,6 +33,7 @@#include <linux/random.h> #include <linux/crc32.h> #include <linux/time.h> +#include <linux/debugfs.h> #include "heartbeat.h" #include "tcp.h" @@ -60,6 +61,11 @@ static unsigned long o2hb_live_node_bitmap[BITS_TO_LONGS(O2NM_MAX_NODES)];static LIST_HEAD (o2hb_node_events);static DECLARE_WAIT_QUEUE_HEAD (o2hb_steady_queue); +#define O2HB_DEBUG_DIR "o2hb" +#define O2HB_DEBUG_LIVENODES "livenodes" +static struct dentry *o2hb_debug_dir; +static struct dentry *o2hb_debug_livenodes; +static LIST_HEAD (o2hb_all_regions); static struct o2hb_callback {@@ -905,7 +911,121 @@ static int o2hb_thread(void *data)return 0 ; } -void o2hb_init (void ) +#ifdef CONFIG_DEBUG_FS +struct o2hb_debug_buffer { +int len; +char *buf; +}; + +static int o2hb_debug_open (struct inode *inode,struct file *file) +{ +unsigned long map[BITS_TO_LONGS (O2NM_MAX_NODES )]; +struct o2hb_debug_buffer *odb =NULL ; +int i =-1 ; +int out =0 ; + + odb =kzalloc (sizeof (struct o2hb_debug_buffer ),GFP_KERNEL ); +if (!odb) + goto bail; + + odb->len =PAGE_SIZE ; + odb->buf =kmalloc (odb->len,GFP_KERNEL ); +if (!odb->buf) { +kfree (odb); + goto bail; + } + +o2hb_fill_node_map (map,sizeof (map)); + +while ((i =find_next_bit (map,O2NM_MAX_NODES , i +1 )) <O2NM_MAX_NODES ) + out +=snprintf (odb->buf + out, odb->len - out,"%d " , i); + out +=snprintf (odb->buf + out, odb->len - out,"\n" ); + + odb->len = out; + + file->private_data = odb; + +return 0 ; +bail: +return -ENOMEM ; +} + +static int o2hb_debug_release (struct inode *inode,struct file *file) +{ +struct o2hb_debug_buffer *odb = + (struct o2hb_debug_buffer *)file->private_data; + +kfree (odb->buf); +kfree (odb); + +return 0 ; +} + +static ssize_t o2hb_debug_read (struct file *file,char __user *buf, +size_t nbytes,loff_t *ppos) +{ +struct o2hb_debug_buffer *odb = + (struct o2hb_debug_buffer *)file->private_data; + +return simple_read_from_buffer (buf, nbytes, ppos, odb->buf, odb->len); +} + +static loff_t o2hb_debug_llseek (struct file *file,loff_t off,int whence) +{ +struct o2hb_debug_buffer *odb = + (struct o2hb_debug_buffer *)file->private_data; +loff_t new =-1 ; + +switch (whence) { +case 0 : + new = off; +break ; +case 1 : + new = file->f_pos + off; +break ; + } + +if (new <0 || new > odb->len) +return -EINVAL ; + +return (file->f_pos = new); +} +#else +static int o2hb_debug_open (struct inode *inode,struct file *file) +{ +return 0 ; +} +static int o2hb_debug_release (struct inode *inode,struct file *file) +{ +return 0 ; +} +static ssize_t o2hb_debug_read (struct file *file,char __user *buf, +size_t nbytes,loff_t *ppos) +{ +return 0 ; +} +static loff_t o2hb_debug_llseek (struct file *file,loff_t off,int whence) +{ +return 0 ; +} +#endif /* CONFIG_DEBUG_FS */ + +static struct file_operations o2hb_debug_fops = { + .open = o2hb_debug_open, + .release = o2hb_debug_release, + .read = o2hb_debug_read, + .llseek = o2hb_debug_llseek, +}; + +void o2hb_exit (void ) +{ +if (o2hb_debug_livenodes) +debugfs_remove (o2hb_debug_livenodes); +if (o2hb_debug_dir) +debugfs_remove (o2hb_debug_dir); +} + +int o2hb_init (void ) {int i;@@ -918,6 +1038,24 @@ void o2hb_init(void)INIT_LIST_HEAD (&o2hb_node_events);memset (o2hb_live_node_bitmap,0 ,sizeof (o2hb_live_node_bitmap)); + + o2hb_debug_dir =debugfs_create_dir (O2HB_DEBUG_DIR ,NULL ); +if (!o2hb_debug_dir) { +mlog_errno (-ENOMEM ); +return -ENOMEM ; + } + + o2hb_debug_livenodes =debugfs_create_file (O2HB_DEBUG_LIVENODES , +S_IFREG |S_IRUSR , + o2hb_debug_dir,NULL , + &o2hb_debug_fops); +if (!o2hb_debug_livenodes) { +mlog_errno (-ENOMEM ); +debugfs_remove (o2hb_debug_dir); +return -ENOMEM ; + } + +return 0 ; }/* if we're already in a callback then we're already serialized by the sem */ fs/ocfs2/cluster/heartbeat.h +2
-1@@ -75,7 +75,8 @@ void o2hb_unregister_callback(const char *region_uuid, struct o2hb_callback_func *hc);void o2hb_fill_node_map (unsigned long *map,unsigned bytes); -void o2hb_init (void ); +void o2hb_exit (void ); +int o2hb_init (void );int o2hb_check_node_heartbeating (u8 node_num);int o2hb_check_node_heartbeating_from_callback (u8 node_num);int o2hb_check_local_node_heartbeating (void );fs/ocfs2/cluster/nodemanager.c +7
-2@@ -881,6 +881,7 @@ static void __exit exit_o2nm(void)o2cb_sys_shutdown ();o2net_exit (); +o2hb_exit (); }static int __init init_o2nm (void )@@ -889,11 +890,13 @@ static int __init init_o2nm(void)cluster_print_version (); -o2hb_init (); + ret =o2hb_init (); +if (ret) + goto out; ret =o2net_init ();if (ret) - goto out; + goto out_o2hb; ret =o2net_register_hb_callbacks ();if (ret)@@ -916,6 +919,8 @@ out_callbacks:o2net_unregister_hb_callbacks (); out_o2net:o2net_exit (); +out_o2hb: +o2hb_exit (); out:return ret; }
Signature · 7 lines
Wengang Wang Member of Technical Staff Oracle Asia R&D Center Open Source Technologies Development Tel: +86 10 8278 6265 Mobile: +86 13381078925
PATCH 2/4 ocfs2: Moves struct ocfs2_slot_info to a header file
In reply to Sunil MushranMoves the definition of struct ocfs2_slot_info from slot_map.c to ocfs2.h.
--- fs/ocfs2/ocfs2.h | 16 +++++++++++++++- fs/ocfs2/slot_map.c | 17 ----------------- 2 files changed, 15 insertions(+), 18 deletions(-)
fs/ocfs2/ocfs2.h +15 -1
@@ -192,8 +192,22 @@ enum ocfs2_mount_options#define OCFS2_OSB_ERROR_FS 0x0004#define OCFS2_DEFAULT_ATIME_QUANTUM 60 +struct ocfs2_slot { +int sl_valid; +unsigned int sl_node_num; +}; + +struct ocfs2_slot_info { +int si_extended; +int si_slots_per_block; +struct inode *si_inode; +unsigned int si_blocks; +struct buffer_head **si_bh; +unsigned int si_num_slots; +struct ocfs2_slot *si_slots; +}; +struct ocfs2_journal ; -struct ocfs2_slot_info ;struct ocfs2_recovery_map ;struct ocfs2_super {
fs/ocfs2/slot_map.c +0 -17
@@ -42,23 +42,6 @@#include "buffer_head_io.h" - -struct ocfs2_slot { -int sl_valid; -unsigned int sl_node_num; -}; - -struct ocfs2_slot_info { -int si_extended; -int si_slots_per_block; -struct inode *si_inode; -unsigned int si_blocks; -struct buffer_head **si_bh; -unsigned int si_num_slots; -struct ocfs2_slot *si_slots; -}; - -static int __ocfs2_node_num_to_slot (struct ocfs2_slot_info *si,unsigned int node_num);
Signature · 1 line
1.5.4.3
PATCH 3/4 ocfs2: Moves struct recovery_map to a header file
In reply to Sunil MushranMoves the definition of struct recovery_map from journal.c to ocfs2.h.
--- fs/ocfs2/journal.c | 11 ----------- fs/ocfs2/ocfs2.h | 11 ++++++++++- 2 files changed, 10 insertions(+), 12 deletions(-)
fs/ocfs2/journal.c +0 -11
@@ -64,17 +64,6 @@ static int ocfs2_recover_orphans(struct ocfs2_super *osb, int slot);static int ocfs2_commit_thread (void *arg); - -/* -* The recovery_list is a simple linked list of node numbers to recover. -* It is protected by the recovery_lock. -*/ - -struct ocfs2_recovery_map { -unsigned int rm_used; -unsigned int *rm_entries; -}; -int ocfs2_recovery_init (struct ocfs2_super *osb) {struct ocfs2_recovery_map *rm;
fs/ocfs2/ocfs2.h +10 -1
@@ -207,8 +207,17 @@ struct ocfs2_slot_info {struct ocfs2_slot *si_slots; }; +/* +* The recovery_list is a simple linked list of node numbers to recover. +* It is protected by the recovery_lock. +*/ + +struct ocfs2_recovery_map { +unsigned int rm_used; +unsigned int *rm_entries; +}; +struct ocfs2_journal ; -struct ocfs2_recovery_map ;struct ocfs2_super {struct task_struct *commit_task;
Signature · 1 line
1.5.4.3
PATCH 4/4 ocfs2: Exposes the file system state via debugfs
In reply to Sunil MushranPatch creates a per mount debugfs file, fs_state, which when read will expose information like, cluster stack in use, states of the downconvert, recovery and commit threads, number of journal txns, some allocation stats, list of all slots, etc.
--- fs/ocfs2/ocfs2.h | 1 + fs/ocfs2/super.c | 217 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 218 insertions(+), 0 deletions(-)
fs/ocfs2/ocfs2.h +1 -0
@@ -298,6 +298,7 @@ struct ocfs2_superstruct ocfs2_dlm_debug *osb_dlm_debug;struct dentry *osb_debug_root; +struct dentry *osb_ctxt;wait_queue_head_t recovery_event;
fs/ocfs2/super.c +217 -0
235 lines not on this page · raw message
Signature · 1 line
1.5.4.3