October 2012 - cluster-commits - Fedora mailing-lists

gfs2-utils: master - GFS2: Fix a compiler warning in pass2's check_dentry
by Bob Peterson 31 Oct '12

31 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=78cbff1fab… Commit: 78cbff1fab4806178f69bca3e21dc9f3a396176f Parent: 544e8ad99a5d47eaad9e027e52bb6cc1e85075d2 Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Wed Oct 31 07:30:33 2012 -0500 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Wed Oct 31 07:30:33 2012 -0500 GFS2: Fix a compiler warning in pass2's check_dentry This patch initializes variable "q" to 0 to get around a compiler warning. --- gfs2/fsck/pass2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/gfs2/fsck/pass2.c b/gfs2/fsck/pass2.c index 7935f8b..3053711 100644 --- a/gfs2/fsck/pass2.c +++ b/gfs2/fsck/pass2.c @@ -296,7 +296,7 @@ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent, uint32_t *count, void *priv) { struct gfs2_sbd *sdp = ip->i_sbd; - uint8_t q; + uint8_t q = 0; char tmp_name[MAX_FILENAME]; struct gfs2_inum entry; struct dir_status *ds = (struct dir_status *) priv;

1 0

gfs2-utils: master - fsck.gfs2: Fix build failure
by Andrew Price 31 Oct '12

31 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=544e8ad99a… Commit: 544e8ad99a5d47eaad9e027e52bb6cc1e85075d2 Parent: 885d165e685456f6c8fa4bab43c502e469ceded7 Author: Andrew Price <anprice(a)redhat.com> AuthorDate: Wed Oct 31 11:11:22 2012 +0000 Committer: Andrew Price <anprice(a)redhat.com> CommitterDate: Wed Oct 31 11:11:22 2012 +0000 fsck.gfs2: Fix build failure gfs2/fsck/pass2.c:264: undefined reference to `inode_read' Update the call to lgfs2_inode_read() Signed-off-by: Andrew Price <anprice(a)redhat.com> --- gfs2/fsck/pass2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/gfs2/fsck/pass2.c b/gfs2/fsck/pass2.c index 177b01a..7935f8b 100644 --- a/gfs2/fsck/pass2.c +++ b/gfs2/fsck/pass2.c @@ -261,7 +261,7 @@ static int bad_formal_ino(struct gfs2_inode *ip, struct gfs2_dirent *dent, /* We have a directory pointing to another directory, but the formal inode number still doesn't match. If that directory has a '..' pointing back, just fix up the no_formal_ino. */ - child_ip = inode_read(sdp, entry.no_addr); + child_ip = lgfs2_inode_read(sdp, entry.no_addr); error = dir_search(child_ip, "..", 2, NULL, &childs_dotdot); if (!error && childs_dotdot.no_addr == ip->i_di.di_num.no_addr) { log_err( _("The entry points to another directory with intact "

1 0

cluster: RHEL6 - fsck.gfs2: Check for formal inode number mismatch
by Bob Peterson 30 Oct '12

30 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=44547c338ae73… Commit: 44547c338ae73be3c724629c97802e4ea2e942b1 Parent: 1b420aa98fce71f123480dd4eae31e0eb466e864 Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Wed Sep 26 12:21:21 2012 -0500 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Tue Oct 30 10:40:54 2012 -0500 fsck.gfs2: Check for formal inode number mismatch This patch checks for directory entries that disagree with the dinode regarding the formal inode number. Directory entries found in this state are removed. rhbz#860048 --- gfs2/fsck/fsck.h | 8 +- gfs2/fsck/inode_hash.c | 13 ++-- gfs2/fsck/inode_hash.h | 2 +- gfs2/fsck/link.c | 19 +++-- gfs2/fsck/link.h | 2 +- gfs2/fsck/lost_n_found.c | 30 +++---- gfs2/fsck/pass1.c | 12 ++-- gfs2/fsck/pass1b.c | 10 +- gfs2/fsck/pass2.c | 218 ++++++++++++++++++++++++++++++---------------- gfs2/fsck/pass3.c | 79 +++++++++-------- gfs2/fsck/pass4.c | 58 +++++++------ gfs2/fsck/util.c | 15 ++-- 12 files changed, 274 insertions(+), 192 deletions(-) diff --git a/gfs2/fsck/fsck.h b/gfs2/fsck/fsck.h index edd73d7..e4f84c1 100644 --- a/gfs2/fsck/fsck.h +++ b/gfs2/fsck/fsck.h @@ -28,7 +28,7 @@ struct inode_info { struct osi_node node; - uint64_t inode; + struct gfs2_inum di_num; uint32_t di_nlink; /* the number of links the inode * thinks it has */ uint32_t counted_links; /* the number of links we've found */ @@ -37,9 +37,9 @@ struct inode_info struct dir_info { struct osi_node node; - uint64_t dinode; + struct gfs2_inum dinode; uint64_t treewalk_parent; - uint64_t dotdot_parent; + struct gfs2_inum dotdot_parent; uint8_t checked:1; }; @@ -122,7 +122,7 @@ extern void dirtree_delete(struct dir_info *b); /* FIXME: Hack to get this going for pass2 - this should be pulled out * of pass1 and put somewhere else... */ -struct dir_info *dirtree_insert(uint64_t dblock); +struct dir_info *dirtree_insert(struct gfs2_inum inum); extern struct gfs2_options opts; extern struct gfs2_inode *lf_dip; /* Lost and found directory inode */ diff --git a/gfs2/fsck/inode_hash.c b/gfs2/fsck/inode_hash.c index 2ba1d05..ac88057 100644 --- a/gfs2/fsck/inode_hash.c +++ b/gfs2/fsck/inode_hash.c @@ -16,9 +16,9 @@ struct inode_info *inodetree_find(uint64_t block) while (node) { struct inode_info *data = (struct inode_info *)node; - if (block < data->inode) + if (block < data->di_num.no_addr) node = node->osi_left; - else if (block > data->inode) + else if (block > data->di_num.no_addr) node = node->osi_right; else return data; @@ -26,7 +26,7 @@ struct inode_info *inodetree_find(uint64_t block) return NULL; } -struct inode_info *inodetree_insert(uint64_t dblock) +struct inode_info *inodetree_insert(struct gfs2_inum di_num) { struct osi_node **newn = &inodetree.osi_node, *parent = NULL; struct inode_info *data; @@ -36,9 +36,9 @@ struct inode_info *inodetree_insert(uint64_t dblock) struct inode_info *cur = (struct inode_info *)*newn; parent = *newn; - if (dblock < cur->inode) + if (di_num.no_addr < cur->di_num.no_addr) newn = &((*newn)->osi_left); - else if (dblock > cur->inode) + else if (di_num.no_addr > cur->di_num.no_addr) newn = &((*newn)->osi_right); else return cur; @@ -54,7 +54,8 @@ struct inode_info *inodetree_insert(uint64_t dblock) return NULL; } /* Add new node and rebalance tree. */ - data->inode = dblock; + data->di_num.no_addr = di_num.no_addr; + data->di_num.no_formal_ino = di_num.no_formal_ino; osi_link_node(&data->node, parent, newn); osi_insert_color(&data->node, &inodetree); diff --git a/gfs2/fsck/inode_hash.h b/gfs2/fsck/inode_hash.h index e18022d..ba18ab2 100644 --- a/gfs2/fsck/inode_hash.h +++ b/gfs2/fsck/inode_hash.h @@ -4,7 +4,7 @@ struct inode_info; extern struct inode_info *inodetree_find(uint64_t block); -extern struct inode_info *inodetree_insert(uint64_t dblock); +extern struct inode_info *inodetree_insert(struct gfs2_inum di_num); extern void inodetree_delete(struct inode_info *b); #endif /* _INODE_HASH_H */ diff --git a/gfs2/fsck/link.c b/gfs2/fsck/link.c index 47365d8..c2b1a95 100644 --- a/gfs2/fsck/link.c +++ b/gfs2/fsck/link.c @@ -14,14 +14,13 @@ int set_di_nlink(struct gfs2_inode *ip) { struct inode_info *ii; - uint64_t inode_no = ip->i_di.di_num.no_addr; /*log_debug( _("Setting link count to %u for %" PRIu64 " (0x%" PRIx64 ")\n"), count, inode_no, inode_no);*/ /* If the list has entries, look for one that matches inode_no */ - ii = inodetree_find(inode_no); + ii = inodetree_find(ip->i_di.di_num.no_addr); if (!ii) - ii = inodetree_insert(inode_no); + ii = inodetree_insert(ip->i_di.di_num); if (ii) ii->di_nlink = ip->i_di.di_nlink; else @@ -29,29 +28,33 @@ int set_di_nlink(struct gfs2_inode *ip) return 0; } -int incr_link_count(uint64_t inode_no, uint64_t referenced_from, +int incr_link_count(struct gfs2_inum no, struct gfs2_inode *ip, const char *why) { struct inode_info *ii = NULL; + uint64_t referenced_from = ip ? ip->i_di.di_num.no_addr : 0; - ii = inodetree_find(inode_no); + ii = inodetree_find(no.no_addr); /* If the list has entries, look for one that matches inode_no */ if (ii) { + if (ii->di_num.no_formal_ino != no.no_formal_ino) + return 1; + ii->counted_links++; log_debug( _("Dir (0x%llx) incremented counted " "links to %u for (0x%llx) via %s\n"), (unsigned long long)referenced_from, - ii->counted_links, (unsigned long long)inode_no, + ii->counted_links, (unsigned long long)no.no_addr, why); return 0; } log_debug( _("Ref: (0x%llx) No match found when incrementing " "link for (0x%llx)!\n"), (unsigned long long)referenced_from, - (unsigned long long)inode_no); + (unsigned long long)no.no_addr); /* If no match was found, add a new entry and set its * counted links to 1 */ - ii = inodetree_insert(inode_no); + ii = inodetree_insert(no); if (ii) ii->counted_links = 1; else diff --git a/gfs2/fsck/link.h b/gfs2/fsck/link.h index ad040e6..842afb9 100644 --- a/gfs2/fsck/link.h +++ b/gfs2/fsck/link.h @@ -2,7 +2,7 @@ #define _LINK_H int set_di_nlink(struct gfs2_inode *ip); -int incr_link_count(uint64_t inode_no, uint64_t referenced_from, +int incr_link_count(struct gfs2_inum no, struct gfs2_inode *ip, const char *why); int decr_link_count(uint64_t inode_no, uint64_t referenced_from, const char *why); diff --git a/gfs2/fsck/lost_n_found.c b/gfs2/fsck/lost_n_found.c index d0e036a..06ee485 100644 --- a/gfs2/fsck/lost_n_found.c +++ b/gfs2/fsck/lost_n_found.c @@ -29,18 +29,19 @@ static void add_dotdot(struct gfs2_inode *ip) /* If there's a pre-existing .. directory entry, we have to back out the links. */ di = dirtree_find(ip->i_di.di_num.no_addr); - if (di && valid_block(sdp, di->dotdot_parent)) { + if (di && valid_block(sdp, di->dotdot_parent.no_addr)) { struct gfs2_inode *dip; log_debug(_("Directory %lld (0x%llx) already had a " "\"..\" link to %lld (0x%llx).\n"), (unsigned long long)ip->i_di.di_num.no_addr, (unsigned long long)ip->i_di.di_num.no_addr, - (unsigned long long)di->dotdot_parent, - (unsigned long long)di->dotdot_parent); - decr_link_count(di->dotdot_parent, ip->i_di.di_num.no_addr, + (unsigned long long)di->dotdot_parent.no_addr, + (unsigned long long)di->dotdot_parent.no_addr); + decr_link_count(di->dotdot_parent.no_addr, + ip->i_di.di_num.no_addr, _(".. unlinked, moving to lost+found")); - dip = fsck_load_inode(sdp, di->dotdot_parent); + dip = fsck_load_inode(sdp, di->dotdot_parent.no_addr); if (dip->i_di.di_nlink > 0) { dip->i_di.di_nlink--; set_di_nlink(dip); /* keep inode tree in sync */ @@ -65,7 +66,7 @@ static void add_dotdot(struct gfs2_inode *ip) "'..' = 0x%llx\n"), (unsigned long long)ip->i_di.di_num.no_addr, (unsigned long long)ip->i_di.di_num.no_addr, - (unsigned long long)di->dotdot_parent); + (unsigned long long)di->dotdot_parent.no_addr); else log_debug(_("Couldn't find directory %lld (0x%llx) " "in directory tree.\n"), @@ -184,14 +185,13 @@ int add_inode_to_lf(struct gfs2_inode *ip){ _("lost+found dinode"), gfs2_inode_dir); /* root inode links to lost+found */ - incr_link_count(sdp->md.rooti->i_di.di_num.no_addr, - lf_dip->i_di.di_num.no_addr, _("root")); + incr_link_count(sdp->md.rooti->i_di.di_num, + lf_dip, _("root")); /* lost+found link for '.' from itself */ - incr_link_count(lf_dip->i_di.di_num.no_addr, - lf_dip->i_di.di_num.no_addr, "\".\""); + incr_link_count(lf_dip->i_di.di_num, + lf_dip, "\".\""); /* lost+found link for '..' back to root */ - incr_link_count(lf_dip->i_di.di_num.no_addr, - sdp->md.rooti->i_di.di_num.no_addr, + incr_link_count(lf_dip->i_di.di_num, sdp->md.rooti, "\"..\""); if (sdp->gfs1) lf_dip->i_di.__pad1 = GFS_FILE_DIR; @@ -274,12 +274,10 @@ int add_inode_to_lf(struct gfs2_inode *ip){ reprocess_inode(lf_dip, "lost+found"); /* This inode is linked from lost+found */ - incr_link_count(ip->i_di.di_num.no_addr, lf_dip->i_di.di_num.no_addr, - _("from lost+found")); + incr_link_count(ip->i_di.di_num, lf_dip, _("from lost+found")); /* If it's a directory, lost+found is back-linked to it via .. */ if (mode == S_IFDIR) - incr_link_count(lf_dip->i_di.di_num.no_addr, - ip->i_di.di_num.no_addr, _("to lost+found")); + incr_link_count(lf_dip->i_di.di_num, ip, _("to lost+found")); log_notice( _("Added inode #%llu (0x%llx) to lost+found\n"), (unsigned long long)ip->i_di.di_num.no_addr, diff --git a/gfs2/fsck/pass1.c b/gfs2/fsck/pass1.c index 52d4082..d1209e6 100644 --- a/gfs2/fsck/pass1.c +++ b/gfs2/fsck/pass1.c @@ -1360,7 +1360,7 @@ static int check_system_inode(struct gfs2_sbd *sdp, filename, mark); ds.q = mark; if (mark == gfs2_inode_dir) - dirtree_insert((*sysinode)->i_di.di_num.no_addr); + dirtree_insert((*sysinode)->i_di.di_num); } } else log_info( _("System inode for '%s' is corrupt or missing.\n"), @@ -1387,7 +1387,7 @@ static int check_system_inode(struct gfs2_sbd *sdp, filename, mark); ds.q = mark; if (mark == gfs2_inode_dir) - dirtree_insert((*sysinode)->i_di.di_num.no_addr); + dirtree_insert((*sysinode)->i_di.di_num); } else { log_err( _("Cannot continue without valid %s inode\n"), filename); @@ -1501,13 +1501,13 @@ static int check_system_inodes(struct gfs2_sbd *sdp) /* gfs1 has four dinodes that are set in the superblock and therefore not linked to anything else. We need to adjust the link counts so pass4 doesn't get confused. */ - incr_link_count(sdp->md.statfs->i_di.di_num.no_addr, 0, + incr_link_count(sdp->md.statfs->i_di.di_num, NULL, _("gfs1 statfs inode")); - incr_link_count(sdp->md.jiinode->i_di.di_num.no_addr, 0, + incr_link_count(sdp->md.jiinode->i_di.di_num, NULL, _("gfs1 jindex inode")); - incr_link_count(sdp->md.riinode->i_di.di_num.no_addr, 0, + incr_link_count(sdp->md.riinode->i_di.di_num, NULL, _("gfs1 rindex inode")); - incr_link_count(sdp->md.qinode->i_di.di_num.no_addr, 0, + incr_link_count(sdp->md.qinode->i_di.di_num, NULL, _("gfs1 quota inode")); return 0; } diff --git a/gfs2/fsck/pass1b.c b/gfs2/fsck/pass1b.c index 39c3289..e519c20 100644 --- a/gfs2/fsck/pass1b.c +++ b/gfs2/fsck/pass1b.c @@ -526,12 +526,12 @@ static int resolve_dup_references(struct gfs2_sbd *sdp, struct duptree *b, check_inode_eattr(ip, &clear_dup_fxns); /* If the dup was in data or metadata, clear the dinode */ if (id->reftypecount[ref_as_data] || - id->reftypecount[ref_as_meta]) + id->reftypecount[ref_as_meta]) { check_metatree(ip, &clear_dup_fxns); - - fsck_blockmap_set(ip, ip->i_di.di_num.no_addr, - _("duplicate referencing bad"), - gfs2_inode_invalid); + fsck_blockmap_set(ip, ip->i_di.di_num.no_addr, + _("duplicate referencing bad"), + gfs2_inode_invalid); + } fsck_inode_put(&ip); /* out, brelse, free */ (dh->ref_inode_count)--; /* FIXME: other option should be to duplicate the diff --git a/gfs2/fsck/pass2.c b/gfs2/fsck/pass2.c index c772be3..0c1c2f5 100644 --- a/gfs2/fsck/pass2.c +++ b/gfs2/fsck/pass2.c @@ -13,43 +13,46 @@ #include "eattr.h" #include "metawalk.h" #include "link.h" +#include "inode_hash.h" #define MAX_FILENAME 256 /* Set children's parent inode in dir_info structure - ext2 does not set * dotdot inode here, but instead in pass3 - should we? */ -static int set_parent_dir(struct gfs2_sbd *sdp, uint64_t childblock, - uint64_t parentblock) +static int set_parent_dir(struct gfs2_sbd *sdp, struct gfs2_inum child, + struct gfs2_inum parent) { struct dir_info *di; - di = dirtree_find(childblock); + di = dirtree_find(child.no_addr); if (!di) { log_err( _("Unable to find block %llu (0x%llx" ") in dir_info list\n"), - (unsigned long long)childblock, - (unsigned long long)childblock); + (unsigned long long)child.no_addr, + (unsigned long long)child.no_addr); return -1; } - if (di->dinode == childblock) { + if (di->dinode.no_addr == child.no_addr && + di->dinode.no_formal_ino == child.no_formal_ino) { if (di->treewalk_parent) { - log_err( _("Another directory at block %" PRIu64 - " (0x%" PRIx64 ") already contains this " - "child %lld (%llx) - checking parent %" - PRIu64 " (0x%" PRIx64 ")\n"), - di->treewalk_parent, di->treewalk_parent, - (unsigned long long)childblock, - (unsigned long long)childblock, - parentblock, parentblock); + log_err( _("Another directory at block %llx (0x%llx) " + "already contains this child %lld (%llx) - " + "checking parent %llx (0x%llx)\n"), + (unsigned long long)di->treewalk_parent, + (unsigned long long)di->treewalk_parent, + (unsigned long long)child.no_addr, + (unsigned long long)child.no_addr, + (unsigned long long)parent.no_addr, + (unsigned long long)parent.no_addr); return 1; } log_debug( _("Child %lld (0x%llx) has parent %lld (0x%llx)\n"), - (unsigned long long)childblock, - (unsigned long long)childblock, - (unsigned long long)parentblock, - (unsigned long long)parentblock); - di->treewalk_parent = parentblock; + (unsigned long long)child.no_addr, + (unsigned long long)child.no_addr, + (unsigned long long)parent.no_addr, + (unsigned long long)parent.no_addr); + di->treewalk_parent = parent.no_addr; } return 0; @@ -57,7 +60,7 @@ static int set_parent_dir(struct gfs2_sbd *sdp, uint64_t childblock, /* Set's the child's '..' directory inode number in dir_info structure */ static int set_dotdot_dir(struct gfs2_sbd *sdp, uint64_t childblock, - uint64_t parentblock) + struct gfs2_inum parent) { struct dir_info *di; @@ -67,29 +70,30 @@ static int set_dotdot_dir(struct gfs2_sbd *sdp, uint64_t childblock, ") in dir_info tree\n"), childblock, childblock); return -1; } - if (di->dinode != childblock) { + if (di->dinode.no_addr != childblock) { log_debug("'..' doesn't point to what we found: childblock " "(0x%llx) != dinode (0x%llx)\n", (unsigned long long)childblock, - (unsigned long long)di->dinode); + (unsigned long long)di->dinode.no_addr); return -1; } /* Special case for root inode because we set it earlier */ - if (di->dotdot_parent && - sdp->md.rooti->i_di.di_num.no_addr != di->dinode) { + if (di->dotdot_parent.no_addr && + sdp->md.rooti->i_di.di_num.no_addr != di->dinode.no_addr) { /* This should never happen */ log_crit( _("Dotdot parent already set for block %llu (0x%llx)" "-> %llu (0x%llx)\n"), (unsigned long long)childblock, (unsigned long long)childblock, - (unsigned long long)di->dotdot_parent, - (unsigned long long)di->dotdot_parent); + (unsigned long long)di->dotdot_parent.no_addr, + (unsigned long long)di->dotdot_parent.no_addr); return -1; } log_debug("Setting '..' for directory block (0x%llx) to parent " "(0x%llx)\n", (unsigned long long)childblock, - (unsigned long long)parentblock); - di->dotdot_parent = parentblock; + (unsigned long long)parent.no_addr); + di->dotdot_parent.no_addr = parent.no_addr; + di->dotdot_parent.no_formal_ino = parent.no_formal_ino; return 0; } @@ -219,6 +223,69 @@ struct metawalk_fxns pass2_fxns_delete = { .check_eattr_extentry = delete_eattr_extentry, }; +/* bad_formal_ino - handle mismatches in formal inode number + * Returns: 0 if the dirent was repaired + * 1 if the caller should delete the dirent + */ +static int bad_formal_ino(struct gfs2_inode *ip, struct gfs2_dirent *dent, + struct gfs2_inum entry, const char *tmp_name, + uint8_t q, struct gfs2_dirent *de, + struct gfs2_buffer_head *bh) +{ + struct inode_info *ii; + struct gfs2_inode *child_ip; + struct gfs2_inum childs_dotdot; + struct gfs2_sbd *sdp = ip->i_sbd; + int error; + + ii = inodetree_find(entry.no_addr); + log_err( _("Directory entry '%s' pointing to block %llu (0x%llx) in " + "directory %llu (0x%llx) has the wrong 'formal' inode " + "number.\n"), tmp_name, (unsigned long long)entry.no_addr, + (unsigned long long)entry.no_addr, + (unsigned long long)ip->i_di.di_num.no_addr, + (unsigned long long)ip->i_di.di_num.no_addr); + log_err( _("The directory entry has %llu (0x%llx) but the inode has " + "%llu (0x%llx)\n"), (unsigned long long)entry.no_formal_ino, + (unsigned long long)entry.no_formal_ino, + (unsigned long long)ii->di_num.no_formal_ino, + (unsigned long long)ii->di_num.no_formal_ino); + if (q != gfs2_inode_dir) { + if (query( _("Remove the corrupt directory entry? (y/n) "))) + return 1; + log_err( _("Corrupt directory entry not removed.\n")); + return 0; + } + /* We have a directory pointing to another directory, but the + formal inode number still doesn't match. If that directory + has a '..' pointing back, just fix up the no_formal_ino. */ + child_ip = inode_read(sdp, entry.no_addr); + error = dir_search(child_ip, "..", 2, NULL, &childs_dotdot); + if (!error && childs_dotdot.no_addr == ip->i_di.di_num.no_addr) { + log_err( _("The entry points to another directory with intact " + "linkage.\n")); + if (query( _("Fix the bad directory entry? (y/n) "))) { + log_err( _("Fixing the corrupt directory entry.\n")); + entry.no_formal_ino = ii->di_num.no_formal_ino; + de->de_inum.no_formal_ino = entry.no_formal_ino; + gfs2_dirent_out(de, (char *)dent); + bmodified(bh); + incr_link_count(entry, ip, _("fixed reference")); + set_parent_dir(sdp, entry, ip->i_di.di_num); + } else { + log_err( _("Directory entry not fixed.\n")); + } + } else { + if (query( _("Remove the corrupt directory entry? (y/n) "))) { + inode_put(&child_ip); + return 1; + } + log_err( _("Corrupt directory entry not removed.\n")); + } + inode_put(&child_ip); + return 0; +} + /* FIXME: should maybe refactor this a bit - but need to deal with * FIXMEs internally first */ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent, @@ -227,9 +294,9 @@ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent, uint32_t *count, void *priv) { struct gfs2_sbd *sdp = ip->i_sbd; - uint8_t q; + uint8_t q = 0; char tmp_name[MAX_FILENAME]; - uint64_t entryblock; + struct gfs2_inum entry; struct dir_status *ds = (struct dir_status *) priv; int error; struct gfs2_inode *entry_ip = NULL; @@ -246,7 +313,8 @@ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent, clear_eattrs.check_eattr_entry = clear_eattr_entry; clear_eattrs.check_eattr_extentry = clear_eattr_extentry; - entryblock = de->de_inum.no_addr; + entry.no_addr = de->de_inum.no_addr; + entry.no_formal_ino = de->de_inum.no_formal_ino; /* Start of checks */ memset(tmp_name, 0, MAX_FILENAME); @@ -255,7 +323,7 @@ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent, else strncpy(tmp_name, filename, MAX_FILENAME - 1); - if (!valid_block(ip->i_sbd, entryblock)) { + if (!valid_block(ip->i_sbd, entry.no_addr)) { log_err( _("Block # referenced by directory entry %s in inode " "%lld (0x%llx) is invalid\n"), tmp_name, (unsigned long long)ip->i_di.di_num.no_addr, @@ -268,7 +336,7 @@ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent, (*count)++; ds->entry_count++; /* can't do this because the block is out of range: - incr_link_count(entryblock); */ + incr_link_count(entry); */ return 0; } } @@ -310,7 +378,7 @@ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent, tmp_name); } - q = block_type(entryblock); + q = block_type(entry.no_addr); /* Get the status of the directory inode */ /** * 1. Blocks marked "invalid" were invalidated due to duplicate @@ -330,8 +398,8 @@ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent, /* Handle bad blocks */ log_err( _("Found directory entry '%s' pointing to invalid " "block %lld (0x%llx)\n"), tmp_name, - (unsigned long long)entryblock, - (unsigned long long)entryblock); + (unsigned long long)entry.no_addr, + (unsigned long long)entry.no_addr); if (!query( _("Delete inode containing bad blocks? (y/n)"))) { log_warn( _("Entry to inode containing bad blocks remains\n")); @@ -339,10 +407,10 @@ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent, } if (q == gfs2_bad_block) { - if (ip->i_di.di_num.no_addr == entryblock) + if (ip->i_di.di_num.no_addr == entry.no_addr) entry_ip = ip; else - entry_ip = fsck_load_inode(sdp, entryblock); + entry_ip = fsck_load_inode(sdp, entry.no_addr); if (ip->i_di.di_eattr) { check_inode_eattr(entry_ip, &pass2_fxns_delete); @@ -351,19 +419,19 @@ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent, if (entry_ip != ip) fsck_inode_put(&entry_ip); } - fsck_blockmap_set(ip, entryblock, + fsck_blockmap_set(ip, entry.no_addr, _("bad directory entry"), gfs2_block_free); log_err( _("Inode %lld (0x%llx) was deleted.\n"), - (unsigned long long)entryblock, - (unsigned long long)entryblock); + (unsigned long long)entry.no_addr, + (unsigned long long)entry.no_addr); goto nuke_dentry; } if (q < gfs2_inode_dir || q > gfs2_inode_sock) { log_err( _("Directory entry '%s' referencing inode %llu " "(0x%llx) in dir inode %llu (0x%llx) block type " "%d: %s.\n"), tmp_name, - (unsigned long long)entryblock, - (unsigned long long)entryblock, + (unsigned long long)entry.no_addr, + (unsigned long long)entry.no_addr, (unsigned long long)ip->i_di.di_num.no_addr, (unsigned long long)ip->i_di.di_num.no_addr, q, q == gfs2_inode_invalid ? @@ -400,8 +468,8 @@ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent, log_err( _("Error: directory entry type is " "incompatible with block type at block %lld " "(0x%llx) in directory inode %llu (0x%llx).\n"), - (unsigned long long)entryblock, - (unsigned long long)entryblock, + (unsigned long long)entry.no_addr, + (unsigned long long)entry.no_addr, (unsigned long long)ip->i_di.di_num.no_addr, (unsigned long long)ip->i_di.di_num.no_addr); log_err( _("Directory entry type is %d, block type is %d.\n"), @@ -413,17 +481,17 @@ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent, log_err( _("Type '%s' in dir entry (%s, %llu/0x%llx) conflicts" " with type '%s' in dinode. (Dir entry is stale.)\n"), de_type_string(de->de_type), tmp_name, - (unsigned long long)entryblock, - (unsigned long long)entryblock, + (unsigned long long)entry.no_addr, + (unsigned long long)entry.no_addr, block_type_string(q)); if (!query( _("Clear stale directory entry? (y/n) "))) { log_err( _("Stale directory entry remains\n")); goto dentry_is_valid; } - if (ip->i_di.di_num.no_addr == entryblock) + if (ip->i_di.di_num.no_addr == entry.no_addr) entry_ip = ip; else - entry_ip = fsck_load_inode(sdp, entryblock); + entry_ip = fsck_load_inode(sdp, entry.no_addr); check_inode_eattr(entry_ip, &clear_eattrs); if (entry_ip != ip) fsck_inode_put(&entry_ip); @@ -446,10 +514,10 @@ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent, * and check the rest of the '.' entry? */ goto dentry_is_valid; } - if (ip->i_di.di_num.no_addr == entryblock) + if (ip->i_di.di_num.no_addr == entry.no_addr) entry_ip = ip; else - entry_ip = fsck_load_inode(sdp, entryblock); + entry_ip = fsck_load_inode(sdp, entry.no_addr); check_inode_eattr(entry_ip, &clear_eattrs); if (entry_ip != ip) fsck_inode_put(&entry_ip); @@ -460,15 +528,15 @@ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent, * location */ /* check that '.' refers to this inode */ - if (entryblock != ip->i_di.di_num.no_addr) { + if (entry.no_addr != ip->i_di.di_num.no_addr) { log_err( _("'.' entry's value incorrect in directory %llu" " (0x%llx). Points to %llu" " (0x%llx) when it should point to %llu" " (0x%llx).\n"), - (unsigned long long)entryblock, - (unsigned long long)entryblock, - (unsigned long long)entryblock, - (unsigned long long)entryblock, + (unsigned long long)entry.no_addr, + (unsigned long long)entry.no_addr, + (unsigned long long)entry.no_addr, + (unsigned long long)entry.no_addr, (unsigned long long)ip->i_di.di_num.no_addr, (unsigned long long)ip->i_di.di_num.no_addr); if (!query( _("Remove '.' reference? (y/n) "))) { @@ -477,10 +545,10 @@ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent, * this '.' entry is invalid */ goto dentry_is_valid; } - if (ip->i_di.di_num.no_addr == entryblock) + if (ip->i_di.di_num.no_addr == entry.no_addr) entry_ip = ip; else - entry_ip = fsck_load_inode(sdp, entryblock); + entry_ip = fsck_load_inode(sdp, entry.no_addr); check_inode_eattr(entry_ip, &clear_eattrs); if (entry_ip != ip) fsck_inode_put(&entry_ip); @@ -507,10 +575,10 @@ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent, goto dentry_is_valid; } - if (ip->i_di.di_num.no_addr == entryblock) + if (ip->i_di.di_num.no_addr == entry.no_addr) entry_ip = ip; else - entry_ip = fsck_load_inode(sdp, entryblock); + entry_ip = fsck_load_inode(sdp, entry.no_addr); check_inode_eattr(entry_ip, &clear_eattrs); if (entry_ip != ip) fsck_inode_put(&entry_ip); @@ -527,10 +595,10 @@ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent, log_err( _("Bad '..' directory entry remains\n")); goto dentry_is_valid; } - if (ip->i_di.di_num.no_addr == entryblock) + if (ip->i_di.di_num.no_addr == entry.no_addr) entry_ip = ip; else - entry_ip = fsck_load_inode(sdp, entryblock); + entry_ip = fsck_load_inode(sdp, entry.no_addr); check_inode_eattr(entry_ip, &clear_eattrs); if (entry_ip != ip) fsck_inode_put(&entry_ip); @@ -542,7 +610,7 @@ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent, /* Add the address this entry is pointing to * to this inode's dotdot_parent in * dir_info */ - if (set_dotdot_dir(sdp, ip->i_di.di_num.no_addr, entryblock)) { + if (set_dotdot_dir(sdp, ip->i_di.di_num.no_addr, entry)) { stack; return -1; } @@ -555,18 +623,18 @@ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent, if (q != gfs2_inode_dir) { log_debug( _("Found non-dir inode dentry pointing to %lld " "(0x%llx)\n"), - (unsigned long long)entryblock, - (unsigned long long)entryblock); + (unsigned long long)entry.no_addr, + (unsigned long long)entry.no_addr); goto dentry_is_valid; } /*log_debug( _("Found plain directory dentry\n"));*/ - error = set_parent_dir(sdp, entryblock, ip->i_di.di_num.no_addr); + error = set_parent_dir(sdp, entry, ip->i_di.di_num); if (error > 0) { log_err( _("%s: Hard link to block %llu (0x%llx" ") detected.\n"), tmp_name, - (unsigned long long)entryblock, - (unsigned long long)entryblock); + (unsigned long long)entry.no_addr, + (unsigned long long)entry.no_addr); if (query( _("Clear hard link to directory? (y/n) "))) goto nuke_dentry; @@ -580,8 +648,12 @@ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent, } dentry_is_valid: /* This directory inode links to this inode via this dentry */ - incr_link_count(entryblock, ip->i_di.di_num.no_addr, - _("valid reference")); + error = incr_link_count(entry, ip, _("valid reference")); + if (error > 0) { + if (bad_formal_ino(ip, dent, entry, tmp_name, q, de, bh) == 1) + goto nuke_dentry; + } + (*count)++; ds->entry_count++; /* End of checks */ @@ -679,8 +751,7 @@ static int check_system_dir(struct gfs2_inode *sysinode, const char *dirname, if (cur_blks != sysinode->i_di.di_blocks) reprocess_inode(sysinode, dirname); /* This system inode is linked to itself via '.' */ - incr_link_count(sysinode->i_di.di_num.no_addr, - sysinode->i_di.di_num.no_addr, + incr_link_count(sysinode->i_di.di_num, sysinode, "sysinode \".\""); ds.entry_count++; free(filename); @@ -905,8 +976,7 @@ int pass2(struct gfs2_sbd *sdp) reprocess_inode(ip, dirname); } /* directory links to itself via '.' */ - incr_link_count(ip->i_di.di_num.no_addr, - ip->i_di.di_num.no_addr, + incr_link_count(ip->i_di.di_num, ip, _("\". (itself)\"")); ds.entry_count++; free(filename); diff --git a/gfs2/fsck/pass3.c b/gfs2/fsck/pass3.c index daa1809..f5f38c5 100644 --- a/gfs2/fsck/pass3.c +++ b/gfs2/fsck/pass3.c @@ -67,7 +67,7 @@ static int attach_dotdot_to(struct gfs2_sbd *sdp, uint64_t newdotdot, (unsigned long long)ip->i_di.di_num.no_addr); reprocess_inode(ip, dirname); } - incr_link_count(newdotdot, block, _("new \"..\"")); + incr_link_count(pip->i_di.di_num, ip, _("new \"..\"")); fsck_inode_put(&ip); fsck_inode_put(&pip); free(filename); @@ -86,27 +86,28 @@ static struct dir_info *mark_and_return_parent(struct gfs2_sbd *sdp, if (!di->treewalk_parent) return NULL; - if (di->dotdot_parent == di->treewalk_parent) { - q_dotdot = block_type(di->dotdot_parent); + if (di->dotdot_parent.no_addr == di->treewalk_parent) { + q_dotdot = block_type(di->dotdot_parent.no_addr); if (q_dotdot != gfs2_inode_dir) { log_err( _("Orphaned directory at block %llu (0x%llx) " "moved to lost+found\n"), - (unsigned long long)di->dinode, - (unsigned long long)di->dinode); + (unsigned long long)di->dinode.no_addr, + (unsigned long long)di->dinode.no_addr); return NULL; } goto out; } log_warn( _("Directory '..' and treewalk connections disagree for " - "inode %llu (0x%llx)\n"), (unsigned long long)di->dinode, - (unsigned long long)di->dinode); + "inode %llu (0x%llx)\n"), + (unsigned long long)di->dinode.no_addr, + (unsigned long long)di->dinode.no_addr); log_notice( _("'..' has %llu (0x%llx), treewalk has %llu (0x%llx)\n"), - (unsigned long long)di->dotdot_parent, - (unsigned long long)di->dotdot_parent, + (unsigned long long)di->dotdot_parent.no_addr, + (unsigned long long)di->dotdot_parent.no_addr, (unsigned long long)di->treewalk_parent, (unsigned long long)di->treewalk_parent); - q_dotdot = block_type(di->dotdot_parent); + q_dotdot = block_type(di->dotdot_parent.no_addr); q_treewalk = block_type(di->treewalk_parent); /* if the dotdot entry isn't a directory, but the * treewalk is, treewalk is correct - if the treewalk @@ -126,8 +127,9 @@ static struct dir_info *mark_and_return_parent(struct gfs2_sbd *sdp, (unsigned long long)di->treewalk_parent, (unsigned long long)di->treewalk_parent); attach_dotdot_to(sdp, di->treewalk_parent, - di->dotdot_parent, di->dinode); - di->dotdot_parent = di->treewalk_parent; + di->dotdot_parent.no_addr, + di->dinode.no_addr); + di->dotdot_parent.no_addr = di->treewalk_parent; } goto out; } @@ -135,8 +137,9 @@ static struct dir_info *mark_and_return_parent(struct gfs2_sbd *sdp, log_err( _("Both .. and treewalk parents are directories, " "going with treewalk...\n")); attach_dotdot_to(sdp, di->treewalk_parent, - di->dotdot_parent, di->dinode); - di->dotdot_parent = di->treewalk_parent; + di->dotdot_parent.no_addr, + di->dinode.no_addr); + di->dotdot_parent.no_addr = di->treewalk_parent; goto out; } log_warn( _(".. parent is valid, but treewalk is bad - reattaching to " @@ -146,14 +149,15 @@ static struct dir_info *mark_and_return_parent(struct gfs2_sbd *sdp, if (!query( _("Remove directory entry for bad inode %llu (0x%llx) in " "%llu (0x%llx)? (y/n)"), - (unsigned long long)di->dinode, - (unsigned long long)di->dinode, + (unsigned long long)di->dinode.no_addr, + (unsigned long long)di->dinode.no_addr, (unsigned long long)di->treewalk_parent, (unsigned long long)di->treewalk_parent)) { log_err( _("Directory entry to invalid inode remains\n")); return NULL; } - error = remove_dentry_from_dir(sdp, di->treewalk_parent, di->dinode); + error = remove_dentry_from_dir(sdp, di->treewalk_parent, + di->dinode.no_addr); if (error < 0) { stack; return NULL; @@ -161,8 +165,8 @@ static struct dir_info *mark_and_return_parent(struct gfs2_sbd *sdp, if (error > 0) log_warn( _("Unable to find dentry for block %llu" " (0x%llx) in %llu (0x%llx)\n"), - (unsigned long long)di->dinode, - (unsigned long long)di->dinode, + (unsigned long long)di->dinode.no_addr, + (unsigned long long)di->dinode.no_addr, (unsigned long long)di->treewalk_parent, (unsigned long long)di->treewalk_parent); log_warn( _("Directory entry removed\n")); @@ -171,7 +175,7 @@ static struct dir_info *mark_and_return_parent(struct gfs2_sbd *sdp, return NULL; out: - pdi = dirtree_find(di->dotdot_parent); + pdi = dirtree_find(di->dotdot_parent.no_addr); return pdi; } @@ -245,13 +249,14 @@ int pass3(struct gfs2_sbd *sdp) tdi = mark_and_return_parent(sdp, di); if (tdi) { - log_debug( _("Directory at block %" PRIu64 - " (0x%" PRIx64 ") connected\n"), - di->dinode, di->dinode); + log_debug( _("Directory at block %llu " + "(0x%llx) connected\n"), + (unsigned long long)di->dinode.no_addr, + (unsigned long long)di->dinode.no_addr); di = tdi; continue; } - q = block_type(di->dinode); + q = block_type(di->dinode.no_addr); if (q == gfs2_bad_block) { log_err( _("Found unlinked directory " "containing bad block\n")); @@ -260,14 +265,14 @@ int pass3(struct gfs2_sbd *sdp) log_warn( _("inode %lld (0x%llx) is " "now marked as free\n"), (unsigned long long) - di->dinode, + di->dinode.no_addr, (unsigned long long) - di->dinode); + di->dinode.no_addr); /* Can't use fsck_blockmap_set because we don't have ip */ - gfs2_blockmap_set(bl, di->dinode, + gfs2_blockmap_set(bl, di->dinode.no_addr, gfs2_block_free); - check_n_fix_bitmap(sdp, di->dinode, + check_n_fix_bitmap(sdp, di->dinode.no_addr, gfs2_block_free); break; } else @@ -286,29 +291,31 @@ int pass3(struct gfs2_sbd *sdp) } log_warn( _("inode %lld (0x%llx) is now " "marked as free\n"), - (unsigned long long)di->dinode, - (unsigned long long)di->dinode); + (unsigned long long)di->dinode.no_addr, + (unsigned long long)di->dinode.no_addr); /* Can't use fsck_blockmap_set because we don't have ip */ - gfs2_blockmap_set(bl, di->dinode, + gfs2_blockmap_set(bl, di->dinode.no_addr, gfs2_block_free); - check_n_fix_bitmap(sdp, di->dinode, + check_n_fix_bitmap(sdp, di->dinode.no_addr, gfs2_block_free); log_err( _("The block was cleared\n")); break; } log_err( _("Found unlinked directory at block %llu" - " (0x%llx)\n"), (unsigned long long)di->dinode, - (unsigned long long)di->dinode); - ip = fsck_load_inode(sdp, di->dinode); + " (0x%llx)\n"), + (unsigned long long)di->dinode.no_addr, + (unsigned long long)di->dinode.no_addr); + ip = fsck_load_inode(sdp, di->dinode.no_addr); /* Don't skip zero size directories with eattrs */ if (!ip->i_di.di_size && !ip->i_di.di_eattr){ log_err( _("Unlinked directory has zero " "size.\n")); if (query( _("Remove zero-size unlinked " "directory? (y/n) "))) { - fsck_blockmap_set(ip, di->dinode, + fsck_blockmap_set(ip, + di->dinode.no_addr, _("zero-sized unlinked inode"), gfs2_block_free); fsck_inode_put(&ip); diff --git a/gfs2/fsck/pass4.c b/gfs2/fsck/pass4.c index 6d933e9..4605671 100644 --- a/gfs2/fsck/pass4.c +++ b/gfs2/fsck/pass4.c @@ -58,28 +58,28 @@ static int scan_inode_list(struct gfs2_sbd *sdp) { } /* Don't check reference counts on the special gfs files */ if (sdp->gfs1 && - ((ii->inode == sdp->md.riinode->i_di.di_num.no_addr) || - (ii->inode == sdp->md.jiinode->i_di.di_num.no_addr) || - (ii->inode == sdp->md.qinode->i_di.di_num.no_addr) || - (ii->inode == sdp->md.statfs->i_di.di_num.no_addr))) + ((ii->di_num.no_addr == sdp->md.riinode->i_di.di_num.no_addr) || + (ii->di_num.no_addr == sdp->md.jiinode->i_di.di_num.no_addr) || + (ii->di_num.no_addr == sdp->md.qinode->i_di.di_num.no_addr) || + (ii->di_num.no_addr == sdp->md.statfs->i_di.di_num.no_addr))) continue; if (ii->counted_links == 0) { log_err( _("Found unlinked inode at %llu (0x%llx)\n"), - (unsigned long long)ii->inode, - (unsigned long long)ii->inode); - q = block_type(ii->inode); + (unsigned long long)ii->di_num.no_addr, + (unsigned long long)ii->di_num.no_addr); + q = block_type(ii->di_num.no_addr); if (q == gfs2_bad_block) { log_err( _("Unlinked inode %llu (0x%llx) contains " "bad blocks\n"), - (unsigned long long)ii->inode, - (unsigned long long)ii->inode); + (unsigned long long)ii->di_num.no_addr, + (unsigned long long)ii->di_num.no_addr); if (query( _("Delete unlinked inode with bad " "blocks? (y/n) "))) { - ip = fsck_load_inode(sdp, ii->inode); + ip = fsck_load_inode(sdp, ii->di_num.no_addr); check_inode_eattr(ip, &pass4_fxns_delete); check_metatree(ip, &pass4_fxns_delete); - fsck_blockmap_set(ip, ii->inode, + fsck_blockmap_set(ip, ii->di_num.no_addr, _("bad unlinked"), gfs2_block_free); fsck_inode_put(&ip); @@ -96,14 +96,14 @@ static int scan_inode_list(struct gfs2_sbd *sdp) { log_err( _("Unlinked block %lld (0x%llx) " "marked as inode is " "not an inode (%d)\n"), - (unsigned long long)ii->inode, - (unsigned long long)ii->inode, q); - ip = fsck_load_inode(sdp, ii->inode); + (unsigned long long)ii->di_num.no_addr, + (unsigned long long)ii->di_num.no_addr, q); + ip = fsck_load_inode(sdp, ii->di_num.no_addr); if (query(_("Delete unlinked inode? (y/n) "))) { check_inode_eattr(ip, &pass4_fxns_delete); check_metatree(ip, &pass4_fxns_delete); - fsck_blockmap_set(ip, ii->inode, + fsck_blockmap_set(ip, ii->di_num.no_addr, _("invalid unlinked"), gfs2_block_free); fsck_inode_put(&ip); @@ -115,7 +115,7 @@ static int scan_inode_list(struct gfs2_sbd *sdp) { } continue; } - ip = fsck_load_inode(sdp, ii->inode); + ip = fsck_load_inode(sdp, ii->di_num.no_addr); /* We don't want to clear zero-size files with * eattrs - there might be relevent info in @@ -124,7 +124,7 @@ static int scan_inode_list(struct gfs2_sbd *sdp) { log_err( _("Unlinked inode has zero size\n")); if (query(_("Clear zero-size unlinked inode? " "(y/n) "))) { - fsck_blockmap_set(ip, ii->inode, + fsck_blockmap_set(ip, ii->di_num.no_addr, _("unlinked zero-length"), gfs2_block_free); fsck_inode_put(&ip); @@ -149,32 +149,34 @@ static int scan_inode_list(struct gfs2_sbd *sdp) { else if (ii->di_nlink != ii->counted_links) { log_err( _("Link count inconsistent for inode %llu" " (0x%llx) has %u but fsck found %u.\n"), - (unsigned long long)ii->inode, - (unsigned long long)ii->inode, ii->di_nlink, + (unsigned long long)ii->di_num.no_addr, + (unsigned long long)ii->di_num.no_addr, ii->di_nlink, ii->counted_links); /* Read in the inode, adjust the link count, * and write it back out */ if (query( _("Update link count for inode %llu" " (0x%llx) ? (y/n) "), - (unsigned long long)ii->inode, - (unsigned long long)ii->inode)) { - ip = fsck_load_inode(sdp, ii->inode); /* bread, inode_get */ + (unsigned long long)ii->di_num.no_addr, + (unsigned long long)ii->di_num.no_addr)) { + ip = fsck_load_inode(sdp, ii->di_num.no_addr); /* bread, inode_get */ fix_link_count(ii, ip); ii->di_nlink = ii->counted_links; fsck_inode_put(&ip); /* out, brelse, free */ log_warn( _("Link count updated to %d for " "inode %llu (0x%llx)\n"), ii->di_nlink, - (unsigned long long)ii->inode, - (unsigned long long)ii->inode); + (unsigned long long)ii->di_num.no_addr, + (unsigned long long)ii->di_num.no_addr); } else { - log_err( _("Link count for inode %" PRIu64 " (0x%" PRIx64 - ") still incorrect\n"), ii->inode, ii->inode); + log_err( _("Link count for inode %llu (0x%llx" + ") still incorrect\n"), + (unsigned long long)ii->di_num.no_addr, + (unsigned long long)ii->di_num.no_addr); } } log_debug( _("block %llu (0x%llx) has link count %d\n"), - (unsigned long long)ii->inode, - (unsigned long long)ii->inode, ii->di_nlink); + (unsigned long long)ii->di_num.no_addr, + (unsigned long long)ii->di_num.no_addr, ii->di_nlink); } /* osi_list_foreach(tmp, list) */ if (lf_addition) { diff --git a/gfs2/fsck/util.c b/gfs2/fsck/util.c index 92818fb..24bae6f 100644 --- a/gfs2/fsck/util.c +++ b/gfs2/fsck/util.c @@ -309,7 +309,7 @@ int add_duplicate_ref(struct gfs2_inode *ip, uint64_t block, return 0; } -struct dir_info *dirtree_insert(uint64_t dblock) +struct dir_info *dirtree_insert(struct gfs2_inum inum) { struct osi_node **newn = &dirtree.osi_node, *parent = NULL; struct dir_info *data; @@ -319,9 +319,9 @@ struct dir_info *dirtree_insert(uint64_t dblock) struct dir_info *cur = (struct dir_info *)*newn; parent = *newn; - if (dblock < cur->dinode) + if (inum.no_addr < cur->dinode.no_addr) newn = &((*newn)->osi_left); - else if (dblock > cur->dinode) + else if (inum.no_addr > cur->dinode.no_addr) newn = &((*newn)->osi_right); else return cur; @@ -337,7 +337,8 @@ struct dir_info *dirtree_insert(uint64_t dblock) return NULL; } /* Add new node and rebalance tree. */ - data->dinode = dblock; + data->dinode.no_addr = inum.no_addr; + data->dinode.no_formal_ino = inum.no_formal_ino; osi_link_node(&data->node, parent, newn); osi_insert_color(&data->node, &dirtree); @@ -351,9 +352,9 @@ struct dir_info *dirtree_find(uint64_t block) while (node) { struct dir_info *data = (struct dir_info *)node; - if (block < data->dinode) + if (block < data->dinode.no_addr) node = node->osi_left; - else if (block > data->dinode) + else if (block > data->dinode.no_addr) node = node->osi_right; else return data; @@ -488,7 +489,7 @@ int set_ip_blockmap(struct gfs2_inode *ip, int instree) if (fsck_blockmap_set(ip, block, _("directory"), gfs2_inode_dir)) goto bad_dinode; - if (instree && !dirtree_insert(block)) + if (instree && !dirtree_insert(ip->i_di.di_num)) goto bad_dinode; break; case S_IFREG:

1 0

gfs2-utils: master - fsck.gfs2: Check for formal inode number mismatch
by Bob Peterson 30 Oct '12

30 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=885d165e68… Commit: 885d165e685456f6c8fa4bab43c502e469ceded7 Parent: 74f4384b361eb05b40c463d40067a3f9a1b1b7da Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Tue Oct 30 08:45:52 2012 -0500 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Tue Oct 30 08:45:52 2012 -0500 fsck.gfs2: Check for formal inode number mismatch This patch checks for directory entries that disagree with the dinode regarding the formal inode number. Directory entries found in this state are removed. --- gfs2/fsck/fsck.h | 8 +- gfs2/fsck/inode_hash.c | 13 ++-- gfs2/fsck/inode_hash.h | 2 +- gfs2/fsck/link.c | 19 +++-- gfs2/fsck/link.h | 2 +- gfs2/fsck/lost_n_found.c | 30 +++---- gfs2/fsck/pass1.c | 12 ++-- gfs2/fsck/pass1b.c | 10 +- gfs2/fsck/pass2.c | 214 ++++++++++++++++++++++++++++++---------------- gfs2/fsck/pass3.c | 79 +++++++++-------- gfs2/fsck/pass4.c | 59 +++++++------ gfs2/fsck/util.c | 15 ++-- 12 files changed, 271 insertions(+), 192 deletions(-) diff --git a/gfs2/fsck/fsck.h b/gfs2/fsck/fsck.h index ecd37ad..5313bb3 100644 --- a/gfs2/fsck/fsck.h +++ b/gfs2/fsck/fsck.h @@ -28,7 +28,7 @@ struct inode_info { struct osi_node node; - uint64_t inode; + struct gfs2_inum di_num; uint32_t di_nlink; /* the number of links the inode * thinks it has */ uint32_t counted_links; /* the number of links we've found */ @@ -37,9 +37,9 @@ struct inode_info struct dir_info { struct osi_node node; - uint64_t dinode; + struct gfs2_inum dinode; uint64_t treewalk_parent; - uint64_t dotdot_parent; + struct gfs2_inum dotdot_parent; uint8_t checked:1; }; @@ -122,7 +122,7 @@ extern void dirtree_delete(struct dir_info *b); /* FIXME: Hack to get this going for pass2 - this should be pulled out * of pass1 and put somewhere else... */ -struct dir_info *dirtree_insert(uint64_t dblock); +struct dir_info *dirtree_insert(struct gfs2_inum inum); struct gfs2_options { char *device; diff --git a/gfs2/fsck/inode_hash.c b/gfs2/fsck/inode_hash.c index e2d3c29..d5a35ce 100644 --- a/gfs2/fsck/inode_hash.c +++ b/gfs2/fsck/inode_hash.c @@ -18,9 +18,9 @@ struct inode_info *inodetree_find(uint64_t block) while (node) { struct inode_info *data = (struct inode_info *)node; - if (block < data->inode) + if (block < data->di_num.no_addr) node = node->osi_left; - else if (block > data->inode) + else if (block > data->di_num.no_addr) node = node->osi_right; else return data; @@ -28,7 +28,7 @@ struct inode_info *inodetree_find(uint64_t block) return NULL; } -struct inode_info *inodetree_insert(uint64_t dblock) +struct inode_info *inodetree_insert(struct gfs2_inum di_num) { struct osi_node **newn = &inodetree.osi_node, *parent = NULL; struct inode_info *data; @@ -38,9 +38,9 @@ struct inode_info *inodetree_insert(uint64_t dblock) struct inode_info *cur = (struct inode_info *)*newn; parent = *newn; - if (dblock < cur->inode) + if (di_num.no_addr < cur->di_num.no_addr) newn = &((*newn)->osi_left); - else if (dblock > cur->inode) + else if (di_num.no_addr > cur->di_num.no_addr) newn = &((*newn)->osi_right); else return cur; @@ -56,7 +56,8 @@ struct inode_info *inodetree_insert(uint64_t dblock) return NULL; } /* Add new node and rebalance tree. */ - data->inode = dblock; + data->di_num.no_addr = di_num.no_addr; + data->di_num.no_formal_ino = di_num.no_formal_ino; osi_link_node(&data->node, parent, newn); osi_insert_color(&data->node, &inodetree); diff --git a/gfs2/fsck/inode_hash.h b/gfs2/fsck/inode_hash.h index e18022d..ba18ab2 100644 --- a/gfs2/fsck/inode_hash.h +++ b/gfs2/fsck/inode_hash.h @@ -4,7 +4,7 @@ struct inode_info; extern struct inode_info *inodetree_find(uint64_t block); -extern struct inode_info *inodetree_insert(uint64_t dblock); +extern struct inode_info *inodetree_insert(struct gfs2_inum di_num); extern void inodetree_delete(struct inode_info *b); #endif /* _INODE_HASH_H */ diff --git a/gfs2/fsck/link.c b/gfs2/fsck/link.c index 5dc1a1e..72fe7d5 100644 --- a/gfs2/fsck/link.c +++ b/gfs2/fsck/link.c @@ -16,14 +16,13 @@ int set_di_nlink(struct gfs2_inode *ip) { struct inode_info *ii; - uint64_t inode_no = ip->i_di.di_num.no_addr; /*log_debug( _("Setting link count to %u for %" PRIu64 " (0x%" PRIx64 ")\n"), count, inode_no, inode_no);*/ /* If the list has entries, look for one that matches inode_no */ - ii = inodetree_find(inode_no); + ii = inodetree_find(ip->i_di.di_num.no_addr); if (!ii) - ii = inodetree_insert(inode_no); + ii = inodetree_insert(ip->i_di.di_num); if (ii) ii->di_nlink = ip->i_di.di_nlink; else @@ -31,29 +30,33 @@ int set_di_nlink(struct gfs2_inode *ip) return 0; } -int incr_link_count(uint64_t inode_no, uint64_t referenced_from, +int incr_link_count(struct gfs2_inum no, struct gfs2_inode *ip, const char *why) { struct inode_info *ii = NULL; + uint64_t referenced_from = ip ? ip->i_di.di_num.no_addr : 0; - ii = inodetree_find(inode_no); + ii = inodetree_find(no.no_addr); /* If the list has entries, look for one that matches inode_no */ if (ii) { + if (ii->di_num.no_formal_ino != no.no_formal_ino) + return 1; + ii->counted_links++; log_debug( _("Dir (0x%llx) incremented counted " "links to %u for (0x%llx) via %s\n"), (unsigned long long)referenced_from, - ii->counted_links, (unsigned long long)inode_no, + ii->counted_links, (unsigned long long)no.no_addr, why); return 0; } log_debug( _("Ref: (0x%llx) No match found when incrementing " "link for (0x%llx)!\n"), (unsigned long long)referenced_from, - (unsigned long long)inode_no); + (unsigned long long)no.no_addr); /* If no match was found, add a new entry and set its * counted links to 1 */ - ii = inodetree_insert(inode_no); + ii = inodetree_insert(no); if (ii) ii->counted_links = 1; else diff --git a/gfs2/fsck/link.h b/gfs2/fsck/link.h index ad040e6..842afb9 100644 --- a/gfs2/fsck/link.h +++ b/gfs2/fsck/link.h @@ -2,7 +2,7 @@ #define _LINK_H int set_di_nlink(struct gfs2_inode *ip); -int incr_link_count(uint64_t inode_no, uint64_t referenced_from, +int incr_link_count(struct gfs2_inum no, struct gfs2_inode *ip, const char *why); int decr_link_count(uint64_t inode_no, uint64_t referenced_from, const char *why); diff --git a/gfs2/fsck/lost_n_found.c b/gfs2/fsck/lost_n_found.c index e4fccd5..570f3a8 100644 --- a/gfs2/fsck/lost_n_found.c +++ b/gfs2/fsck/lost_n_found.c @@ -31,18 +31,19 @@ static void add_dotdot(struct gfs2_inode *ip) /* If there's a pre-existing .. directory entry, we have to back out the links. */ di = dirtree_find(ip->i_di.di_num.no_addr); - if (di && valid_block(sdp, di->dotdot_parent)) { + if (di && valid_block(sdp, di->dotdot_parent.no_addr)) { struct gfs2_inode *dip; log_debug(_("Directory %lld (0x%llx) already had a " "\"..\" link to %lld (0x%llx).\n"), (unsigned long long)ip->i_di.di_num.no_addr, (unsigned long long)ip->i_di.di_num.no_addr, - (unsigned long long)di->dotdot_parent, - (unsigned long long)di->dotdot_parent); - decr_link_count(di->dotdot_parent, ip->i_di.di_num.no_addr, + (unsigned long long)di->dotdot_parent.no_addr, + (unsigned long long)di->dotdot_parent.no_addr); + decr_link_count(di->dotdot_parent.no_addr, + ip->i_di.di_num.no_addr, _(".. unlinked, moving to lost+found")); - dip = fsck_load_inode(sdp, di->dotdot_parent); + dip = fsck_load_inode(sdp, di->dotdot_parent.no_addr); if (dip->i_di.di_nlink > 0) { dip->i_di.di_nlink--; set_di_nlink(dip); /* keep inode tree in sync */ @@ -67,7 +68,7 @@ static void add_dotdot(struct gfs2_inode *ip) "'..' = 0x%llx\n"), (unsigned long long)ip->i_di.di_num.no_addr, (unsigned long long)ip->i_di.di_num.no_addr, - (unsigned long long)di->dotdot_parent); + (unsigned long long)di->dotdot_parent.no_addr); else log_debug(_("Couldn't find directory %lld (0x%llx) " "in directory tree.\n"), @@ -187,14 +188,13 @@ int add_inode_to_lf(struct gfs2_inode *ip){ _("lost+found dinode"), gfs2_inode_dir); /* root inode links to lost+found */ - incr_link_count(sdp->md.rooti->i_di.di_num.no_addr, - lf_dip->i_di.di_num.no_addr, _("root")); + incr_link_count(sdp->md.rooti->i_di.di_num, + lf_dip, _("root")); /* lost+found link for '.' from itself */ - incr_link_count(lf_dip->i_di.di_num.no_addr, - lf_dip->i_di.di_num.no_addr, "\".\""); + incr_link_count(lf_dip->i_di.di_num, + lf_dip, "\".\""); /* lost+found link for '..' back to root */ - incr_link_count(lf_dip->i_di.di_num.no_addr, - sdp->md.rooti->i_di.di_num.no_addr, + incr_link_count(lf_dip->i_di.di_num, sdp->md.rooti, "\"..\""); if (sdp->gfs1) lf_dip->i_di.__pad1 = GFS_FILE_DIR; @@ -277,12 +277,10 @@ int add_inode_to_lf(struct gfs2_inode *ip){ reprocess_inode(lf_dip, "lost+found"); /* This inode is linked from lost+found */ - incr_link_count(ip->i_di.di_num.no_addr, lf_dip->i_di.di_num.no_addr, - _("from lost+found")); + incr_link_count(ip->i_di.di_num, lf_dip, _("from lost+found")); /* If it's a directory, lost+found is back-linked to it via .. */ if (mode == S_IFDIR) - incr_link_count(lf_dip->i_di.di_num.no_addr, - ip->i_di.di_num.no_addr, _("to lost+found")); + incr_link_count(lf_dip->i_di.di_num, ip, _("to lost+found")); log_notice( _("Added inode #%llu (0x%llx) to lost+found\n"), (unsigned long long)ip->i_di.di_num.no_addr, diff --git a/gfs2/fsck/pass1.c b/gfs2/fsck/pass1.c index 18757fe..0f80f87 100644 --- a/gfs2/fsck/pass1.c +++ b/gfs2/fsck/pass1.c @@ -1363,7 +1363,7 @@ static int check_system_inode(struct gfs2_sbd *sdp, filename, mark); ds.q = mark; if (mark == gfs2_inode_dir) - dirtree_insert((*sysinode)->i_di.di_num.no_addr); + dirtree_insert((*sysinode)->i_di.di_num); } } else log_info( _("System inode for '%s' is corrupt or missing.\n"), @@ -1390,7 +1390,7 @@ static int check_system_inode(struct gfs2_sbd *sdp, filename, mark); ds.q = mark; if (mark == gfs2_inode_dir) - dirtree_insert((*sysinode)->i_di.di_num.no_addr); + dirtree_insert((*sysinode)->i_di.di_num); } else { log_err( _("Cannot continue without valid %s inode\n"), filename); @@ -1504,13 +1504,13 @@ static int check_system_inodes(struct gfs2_sbd *sdp) /* gfs1 has four dinodes that are set in the superblock and therefore not linked to anything else. We need to adjust the link counts so pass4 doesn't get confused. */ - incr_link_count(sdp->md.statfs->i_di.di_num.no_addr, 0, + incr_link_count(sdp->md.statfs->i_di.di_num, NULL, _("gfs1 statfs inode")); - incr_link_count(sdp->md.jiinode->i_di.di_num.no_addr, 0, + incr_link_count(sdp->md.jiinode->i_di.di_num, NULL, _("gfs1 jindex inode")); - incr_link_count(sdp->md.riinode->i_di.di_num.no_addr, 0, + incr_link_count(sdp->md.riinode->i_di.di_num, NULL, _("gfs1 rindex inode")); - incr_link_count(sdp->md.qinode->i_di.di_num.no_addr, 0, + incr_link_count(sdp->md.qinode->i_di.di_num, NULL, _("gfs1 quota inode")); return 0; } diff --git a/gfs2/fsck/pass1b.c b/gfs2/fsck/pass1b.c index 9e6f376..e8c39be 100644 --- a/gfs2/fsck/pass1b.c +++ b/gfs2/fsck/pass1b.c @@ -530,12 +530,12 @@ static int resolve_dup_references(struct gfs2_sbd *sdp, struct duptree *b, check_inode_eattr(ip, &clear_dup_fxns); /* If the dup was in data or metadata, clear the dinode */ if (id->reftypecount[ref_as_data] || - id->reftypecount[ref_as_meta]) + id->reftypecount[ref_as_meta]) { check_metatree(ip, &clear_dup_fxns); - - fsck_blockmap_set(ip, ip->i_di.di_num.no_addr, - _("duplicate referencing bad"), - gfs2_inode_invalid); + fsck_blockmap_set(ip, ip->i_di.di_num.no_addr, + _("duplicate referencing bad"), + gfs2_inode_invalid); + } fsck_inode_put(&ip); /* out, brelse, free */ (dh->ref_inode_count)--; /* FIXME: other option should be to duplicate the diff --git a/gfs2/fsck/pass2.c b/gfs2/fsck/pass2.c index 78c9f47..177b01a 100644 --- a/gfs2/fsck/pass2.c +++ b/gfs2/fsck/pass2.c @@ -15,45 +15,46 @@ #include "eattr.h" #include "metawalk.h" #include "link.h" +#include "inode_hash.h" #define MAX_FILENAME 256 /* Set children's parent inode in dir_info structure - ext2 does not set * dotdot inode here, but instead in pass3 - should we? */ -static int set_parent_dir(struct gfs2_sbd *sdp, uint64_t childblock, - uint64_t parentblock) +static int set_parent_dir(struct gfs2_sbd *sdp, struct gfs2_inum child, + struct gfs2_inum parent) { struct dir_info *di; - di = dirtree_find(childblock); + di = dirtree_find(child.no_addr); if (!di) { log_err( _("Unable to find block %llu (0x%llx" ") in dir_info list\n"), - (unsigned long long)childblock, - (unsigned long long)childblock); + (unsigned long long)child.no_addr, + (unsigned long long)child.no_addr); return -1; } - if (di->dinode == childblock) { + if (di->dinode.no_addr == child.no_addr && + di->dinode.no_formal_ino == child.no_formal_ino) { if (di->treewalk_parent) { - log_err( _("Another directory at block %llu" - " (0x%llx) already contains this " - "child %llu (%llx) - checking parent %llu" - " (0x%llx)\n"), + log_err( _("Another directory at block %llx (0x%llx) " + "already contains this child %lld (%llx) - " + "checking parent %llx (0x%llx)\n"), (unsigned long long)di->treewalk_parent, (unsigned long long)di->treewalk_parent, - (unsigned long long)childblock, - (unsigned long long)childblock, - (unsigned long long)parentblock, - (unsigned long long)parentblock); + (unsigned long long)child.no_addr, + (unsigned long long)child.no_addr, + (unsigned long long)parent.no_addr, + (unsigned long long)parent.no_addr); return 1; } log_debug( _("Child %lld (0x%llx) has parent %lld (0x%llx)\n"), - (unsigned long long)childblock, - (unsigned long long)childblock, - (unsigned long long)parentblock, - (unsigned long long)parentblock); - di->treewalk_parent = parentblock; + (unsigned long long)child.no_addr, + (unsigned long long)child.no_addr, + (unsigned long long)parent.no_addr, + (unsigned long long)parent.no_addr); + di->treewalk_parent = parent.no_addr; } return 0; @@ -61,7 +62,7 @@ static int set_parent_dir(struct gfs2_sbd *sdp, uint64_t childblock, /* Set's the child's '..' directory inode number in dir_info structure */ static int set_dotdot_dir(struct gfs2_sbd *sdp, uint64_t childblock, - uint64_t parentblock) + struct gfs2_inum parent) { struct dir_info *di; @@ -71,29 +72,30 @@ static int set_dotdot_dir(struct gfs2_sbd *sdp, uint64_t childblock, ") in dir_info tree\n"), childblock, childblock); return -1; } - if (di->dinode != childblock) { + if (di->dinode.no_addr != childblock) { log_debug("'..' doesn't point to what we found: childblock " "(0x%llx) != dinode (0x%llx)\n", (unsigned long long)childblock, - (unsigned long long)di->dinode); + (unsigned long long)di->dinode.no_addr); return -1; } /* Special case for root inode because we set it earlier */ - if (di->dotdot_parent && - sdp->md.rooti->i_di.di_num.no_addr != di->dinode) { + if (di->dotdot_parent.no_addr && + sdp->md.rooti->i_di.di_num.no_addr != di->dinode.no_addr) { /* This should never happen */ log_crit( _("Dotdot parent already set for block %llu (0x%llx)" "-> %llu (0x%llx)\n"), (unsigned long long)childblock, (unsigned long long)childblock, - (unsigned long long)di->dotdot_parent, - (unsigned long long)di->dotdot_parent); + (unsigned long long)di->dotdot_parent.no_addr, + (unsigned long long)di->dotdot_parent.no_addr); return -1; } log_debug("Setting '..' for directory block (0x%llx) to parent " "(0x%llx)\n", (unsigned long long)childblock, - (unsigned long long)parentblock); - di->dotdot_parent = parentblock; + (unsigned long long)parent.no_addr); + di->dotdot_parent.no_addr = parent.no_addr; + di->dotdot_parent.no_formal_ino = parent.no_formal_ino; return 0; } @@ -223,6 +225,69 @@ struct metawalk_fxns pass2_fxns_delete = { .check_eattr_extentry = delete_eattr_extentry, }; +/* bad_formal_ino - handle mismatches in formal inode number + * Returns: 0 if the dirent was repaired + * 1 if the caller should delete the dirent + */ +static int bad_formal_ino(struct gfs2_inode *ip, struct gfs2_dirent *dent, + struct gfs2_inum entry, const char *tmp_name, + uint8_t q, struct gfs2_dirent *de, + struct gfs2_buffer_head *bh) +{ + struct inode_info *ii; + struct gfs2_inode *child_ip; + struct gfs2_inum childs_dotdot; + struct gfs2_sbd *sdp = ip->i_sbd; + int error; + + ii = inodetree_find(entry.no_addr); + log_err( _("Directory entry '%s' pointing to block %llu (0x%llx) in " + "directory %llu (0x%llx) has the wrong 'formal' inode " + "number.\n"), tmp_name, (unsigned long long)entry.no_addr, + (unsigned long long)entry.no_addr, + (unsigned long long)ip->i_di.di_num.no_addr, + (unsigned long long)ip->i_di.di_num.no_addr); + log_err( _("The directory entry has %llu (0x%llx) but the inode has " + "%llu (0x%llx)\n"), (unsigned long long)entry.no_formal_ino, + (unsigned long long)entry.no_formal_ino, + (unsigned long long)ii->di_num.no_formal_ino, + (unsigned long long)ii->di_num.no_formal_ino); + if (q != gfs2_inode_dir) { + if (query( _("Remove the corrupt directory entry? (y/n) "))) + return 1; + log_err( _("Corrupt directory entry not removed.\n")); + return 0; + } + /* We have a directory pointing to another directory, but the + formal inode number still doesn't match. If that directory + has a '..' pointing back, just fix up the no_formal_ino. */ + child_ip = inode_read(sdp, entry.no_addr); + error = dir_search(child_ip, "..", 2, NULL, &childs_dotdot); + if (!error && childs_dotdot.no_addr == ip->i_di.di_num.no_addr) { + log_err( _("The entry points to another directory with intact " + "linkage.\n")); + if (query( _("Fix the bad directory entry? (y/n) "))) { + log_err( _("Fixing the corrupt directory entry.\n")); + entry.no_formal_ino = ii->di_num.no_formal_ino; + de->de_inum.no_formal_ino = entry.no_formal_ino; + gfs2_dirent_out(de, (char *)dent); + bmodified(bh); + incr_link_count(entry, ip, _("fixed reference")); + set_parent_dir(sdp, entry, ip->i_di.di_num); + } else { + log_err( _("Directory entry not fixed.\n")); + } + } else { + if (query( _("Remove the corrupt directory entry? (y/n) "))) { + inode_put(&child_ip); + return 1; + } + log_err( _("Corrupt directory entry not removed.\n")); + } + inode_put(&child_ip); + return 0; +} + /* FIXME: should maybe refactor this a bit - but need to deal with * FIXMEs internally first */ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent, @@ -233,7 +298,7 @@ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent, struct gfs2_sbd *sdp = ip->i_sbd; uint8_t q; char tmp_name[MAX_FILENAME]; - uint64_t entryblock; + struct gfs2_inum entry; struct dir_status *ds = (struct dir_status *) priv; int error; struct gfs2_inode *entry_ip = NULL; @@ -250,7 +315,8 @@ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent, clear_eattrs.check_eattr_entry = clear_eattr_entry; clear_eattrs.check_eattr_extentry = clear_eattr_extentry; - entryblock = de->de_inum.no_addr; + entry.no_addr = de->de_inum.no_addr; + entry.no_formal_ino = de->de_inum.no_formal_ino; /* Start of checks */ memset(tmp_name, 0, MAX_FILENAME); @@ -259,7 +325,7 @@ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent, else strncpy(tmp_name, filename, MAX_FILENAME - 1); - if (!valid_block(ip->i_sbd, entryblock)) { + if (!valid_block(ip->i_sbd, entry.no_addr)) { log_err( _("Block # referenced by directory entry %s in inode " "%lld (0x%llx) is invalid\n"), tmp_name, (unsigned long long)ip->i_di.di_num.no_addr, @@ -272,7 +338,7 @@ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent, (*count)++; ds->entry_count++; /* can't do this because the block is out of range: - incr_link_count(entryblock); */ + incr_link_count(entry); */ return 0; } } @@ -314,7 +380,7 @@ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent, tmp_name); } - q = block_type(entryblock); + q = block_type(entry.no_addr); /* Get the status of the directory inode */ /** * 1. Blocks marked "invalid" were invalidated due to duplicate @@ -334,8 +400,8 @@ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent, /* Handle bad blocks */ log_err( _("Found directory entry '%s' pointing to invalid " "block %lld (0x%llx)\n"), tmp_name, - (unsigned long long)entryblock, - (unsigned long long)entryblock); + (unsigned long long)entry.no_addr, + (unsigned long long)entry.no_addr); if (!query( _("Delete inode containing bad blocks? (y/n)"))) { log_warn( _("Entry to inode containing bad blocks remains\n")); @@ -343,10 +409,10 @@ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent, } if (q == gfs2_bad_block) { - if (ip->i_di.di_num.no_addr == entryblock) + if (ip->i_di.di_num.no_addr == entry.no_addr) entry_ip = ip; else - entry_ip = fsck_load_inode(sdp, entryblock); + entry_ip = fsck_load_inode(sdp, entry.no_addr); if (ip->i_di.di_eattr) { check_inode_eattr(entry_ip, &pass2_fxns_delete); @@ -355,19 +421,19 @@ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent, if (entry_ip != ip) fsck_inode_put(&entry_ip); } - fsck_blockmap_set(ip, entryblock, + fsck_blockmap_set(ip, entry.no_addr, _("bad directory entry"), gfs2_block_free); log_err( _("Inode %lld (0x%llx) was deleted.\n"), - (unsigned long long)entryblock, - (unsigned long long)entryblock); + (unsigned long long)entry.no_addr, + (unsigned long long)entry.no_addr); goto nuke_dentry; } if (q < gfs2_inode_dir || q > gfs2_inode_sock) { log_err( _("Directory entry '%s' referencing inode %llu " "(0x%llx) in dir inode %llu (0x%llx) block type " "%d: %s.\n"), tmp_name, - (unsigned long long)entryblock, - (unsigned long long)entryblock, + (unsigned long long)entry.no_addr, + (unsigned long long)entry.no_addr, (unsigned long long)ip->i_di.di_num.no_addr, (unsigned long long)ip->i_di.di_num.no_addr, q, q == gfs2_inode_invalid ? @@ -404,8 +470,8 @@ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent, log_err( _("Error: directory entry type is " "incompatible with block type at block %lld " "(0x%llx) in directory inode %llu (0x%llx).\n"), - (unsigned long long)entryblock, - (unsigned long long)entryblock, + (unsigned long long)entry.no_addr, + (unsigned long long)entry.no_addr, (unsigned long long)ip->i_di.di_num.no_addr, (unsigned long long)ip->i_di.di_num.no_addr); log_err( _("Directory entry type is %d, block type is %d.\n"), @@ -417,17 +483,17 @@ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent, log_err( _("Type '%s' in dir entry (%s, %llu/0x%llx) conflicts" " with type '%s' in dinode. (Dir entry is stale.)\n"), de_type_string(de->de_type), tmp_name, - (unsigned long long)entryblock, - (unsigned long long)entryblock, + (unsigned long long)entry.no_addr, + (unsigned long long)entry.no_addr, block_type_string(q)); if (!query( _("Clear stale directory entry? (y/n) "))) { log_err( _("Stale directory entry remains\n")); goto dentry_is_valid; } - if (ip->i_di.di_num.no_addr == entryblock) + if (ip->i_di.di_num.no_addr == entry.no_addr) entry_ip = ip; else - entry_ip = fsck_load_inode(sdp, entryblock); + entry_ip = fsck_load_inode(sdp, entry.no_addr); check_inode_eattr(entry_ip, &clear_eattrs); if (entry_ip != ip) fsck_inode_put(&entry_ip); @@ -450,10 +516,10 @@ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent, * and check the rest of the '.' entry? */ goto dentry_is_valid; } - if (ip->i_di.di_num.no_addr == entryblock) + if (ip->i_di.di_num.no_addr == entry.no_addr) entry_ip = ip; else - entry_ip = fsck_load_inode(sdp, entryblock); + entry_ip = fsck_load_inode(sdp, entry.no_addr); check_inode_eattr(entry_ip, &clear_eattrs); if (entry_ip != ip) fsck_inode_put(&entry_ip); @@ -464,15 +530,15 @@ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent, * location */ /* check that '.' refers to this inode */ - if (entryblock != ip->i_di.di_num.no_addr) { + if (entry.no_addr != ip->i_di.di_num.no_addr) { log_err( _("'.' entry's value incorrect in directory %llu" " (0x%llx). Points to %llu" " (0x%llx) when it should point to %llu" " (0x%llx).\n"), - (unsigned long long)entryblock, - (unsigned long long)entryblock, - (unsigned long long)entryblock, - (unsigned long long)entryblock, + (unsigned long long)entry.no_addr, + (unsigned long long)entry.no_addr, + (unsigned long long)entry.no_addr, + (unsigned long long)entry.no_addr, (unsigned long long)ip->i_di.di_num.no_addr, (unsigned long long)ip->i_di.di_num.no_addr); if (!query( _("Remove '.' reference? (y/n) "))) { @@ -481,10 +547,10 @@ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent, * this '.' entry is invalid */ goto dentry_is_valid; } - if (ip->i_di.di_num.no_addr == entryblock) + if (ip->i_di.di_num.no_addr == entry.no_addr) entry_ip = ip; else - entry_ip = fsck_load_inode(sdp, entryblock); + entry_ip = fsck_load_inode(sdp, entry.no_addr); check_inode_eattr(entry_ip, &clear_eattrs); if (entry_ip != ip) fsck_inode_put(&entry_ip); @@ -511,10 +577,10 @@ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent, goto dentry_is_valid; } - if (ip->i_di.di_num.no_addr == entryblock) + if (ip->i_di.di_num.no_addr == entry.no_addr) entry_ip = ip; else - entry_ip = fsck_load_inode(sdp, entryblock); + entry_ip = fsck_load_inode(sdp, entry.no_addr); check_inode_eattr(entry_ip, &clear_eattrs); if (entry_ip != ip) fsck_inode_put(&entry_ip); @@ -531,10 +597,10 @@ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent, log_err( _("Bad '..' directory entry remains\n")); goto dentry_is_valid; } - if (ip->i_di.di_num.no_addr == entryblock) + if (ip->i_di.di_num.no_addr == entry.no_addr) entry_ip = ip; else - entry_ip = fsck_load_inode(sdp, entryblock); + entry_ip = fsck_load_inode(sdp, entry.no_addr); check_inode_eattr(entry_ip, &clear_eattrs); if (entry_ip != ip) fsck_inode_put(&entry_ip); @@ -546,7 +612,7 @@ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent, /* Add the address this entry is pointing to * to this inode's dotdot_parent in * dir_info */ - if (set_dotdot_dir(sdp, ip->i_di.di_num.no_addr, entryblock)) { + if (set_dotdot_dir(sdp, ip->i_di.di_num.no_addr, entry)) { stack; return -1; } @@ -559,18 +625,18 @@ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent, if (q != gfs2_inode_dir) { log_debug( _("Found non-dir inode dentry pointing to %lld " "(0x%llx)\n"), - (unsigned long long)entryblock, - (unsigned long long)entryblock); + (unsigned long long)entry.no_addr, + (unsigned long long)entry.no_addr); goto dentry_is_valid; } /*log_debug( _("Found plain directory dentry\n"));*/ - error = set_parent_dir(sdp, entryblock, ip->i_di.di_num.no_addr); + error = set_parent_dir(sdp, entry, ip->i_di.di_num); if (error > 0) { log_err( _("%s: Hard link to block %llu (0x%llx" ") detected.\n"), tmp_name, - (unsigned long long)entryblock, - (unsigned long long)entryblock); + (unsigned long long)entry.no_addr, + (unsigned long long)entry.no_addr); if (query( _("Clear hard link to directory? (y/n) "))) goto nuke_dentry; @@ -584,8 +650,12 @@ static int check_dentry(struct gfs2_inode *ip, struct gfs2_dirent *dent, } dentry_is_valid: /* This directory inode links to this inode via this dentry */ - incr_link_count(entryblock, ip->i_di.di_num.no_addr, - _("valid reference")); + error = incr_link_count(entry, ip, _("valid reference")); + if (error > 0) { + if (bad_formal_ino(ip, dent, entry, tmp_name, q, de, bh) == 1) + goto nuke_dentry; + } + (*count)++; ds->entry_count++; /* End of checks */ @@ -690,8 +760,7 @@ static int check_system_dir(struct gfs2_inode *sysinode, const char *dirname, if (cur_blks != sysinode->i_di.di_blocks) reprocess_inode(sysinode, dirname); /* This system inode is linked to itself via '.' */ - incr_link_count(sysinode->i_di.di_num.no_addr, - sysinode->i_di.di_num.no_addr, + incr_link_count(sysinode->i_di.di_num, sysinode, "sysinode \".\""); ds.entry_count++; free(filename); @@ -917,8 +986,7 @@ int pass2(struct gfs2_sbd *sdp) reprocess_inode(ip, dirname); } /* directory links to itself via '.' */ - incr_link_count(ip->i_di.di_num.no_addr, - ip->i_di.di_num.no_addr, + incr_link_count(ip->i_di.di_num, ip, _("\". (itself)\"")); ds.entry_count++; free(filename); diff --git a/gfs2/fsck/pass3.c b/gfs2/fsck/pass3.c index ef4340e..53052b6 100644 --- a/gfs2/fsck/pass3.c +++ b/gfs2/fsck/pass3.c @@ -69,7 +69,7 @@ static int attach_dotdot_to(struct gfs2_sbd *sdp, uint64_t newdotdot, (unsigned long long)ip->i_di.di_num.no_addr); reprocess_inode(ip, dirname); } - incr_link_count(newdotdot, block, _("new \"..\"")); + incr_link_count(pip->i_di.di_num, ip, _("new \"..\"")); fsck_inode_put(&ip); fsck_inode_put(&pip); free(filename); @@ -88,27 +88,28 @@ static struct dir_info *mark_and_return_parent(struct gfs2_sbd *sdp, if (!di->treewalk_parent) return NULL; - if (di->dotdot_parent == di->treewalk_parent) { - q_dotdot = block_type(di->dotdot_parent); + if (di->dotdot_parent.no_addr == di->treewalk_parent) { + q_dotdot = block_type(di->dotdot_parent.no_addr); if (q_dotdot != gfs2_inode_dir) { log_err( _("Orphaned directory at block %llu (0x%llx) " "moved to lost+found\n"), - (unsigned long long)di->dinode, - (unsigned long long)di->dinode); + (unsigned long long)di->dinode.no_addr, + (unsigned long long)di->dinode.no_addr); return NULL; } goto out; } log_warn( _("Directory '..' and treewalk connections disagree for " - "inode %llu (0x%llx)\n"), (unsigned long long)di->dinode, - (unsigned long long)di->dinode); + "inode %llu (0x%llx)\n"), + (unsigned long long)di->dinode.no_addr, + (unsigned long long)di->dinode.no_addr); log_notice( _("'..' has %llu (0x%llx), treewalk has %llu (0x%llx)\n"), - (unsigned long long)di->dotdot_parent, - (unsigned long long)di->dotdot_parent, + (unsigned long long)di->dotdot_parent.no_addr, + (unsigned long long)di->dotdot_parent.no_addr, (unsigned long long)di->treewalk_parent, (unsigned long long)di->treewalk_parent); - q_dotdot = block_type(di->dotdot_parent); + q_dotdot = block_type(di->dotdot_parent.no_addr); q_treewalk = block_type(di->treewalk_parent); /* if the dotdot entry isn't a directory, but the * treewalk is, treewalk is correct - if the treewalk @@ -128,8 +129,9 @@ static struct dir_info *mark_and_return_parent(struct gfs2_sbd *sdp, (unsigned long long)di->treewalk_parent, (unsigned long long)di->treewalk_parent); attach_dotdot_to(sdp, di->treewalk_parent, - di->dotdot_parent, di->dinode); - di->dotdot_parent = di->treewalk_parent; + di->dotdot_parent.no_addr, + di->dinode.no_addr); + di->dotdot_parent.no_addr = di->treewalk_parent; } goto out; } @@ -137,8 +139,9 @@ static struct dir_info *mark_and_return_parent(struct gfs2_sbd *sdp, log_err( _("Both .. and treewalk parents are directories, " "going with treewalk...\n")); attach_dotdot_to(sdp, di->treewalk_parent, - di->dotdot_parent, di->dinode); - di->dotdot_parent = di->treewalk_parent; + di->dotdot_parent.no_addr, + di->dinode.no_addr); + di->dotdot_parent.no_addr = di->treewalk_parent; goto out; } log_warn( _(".. parent is valid, but treewalk is bad - reattaching to " @@ -148,14 +151,15 @@ static struct dir_info *mark_and_return_parent(struct gfs2_sbd *sdp, if (!query( _("Remove directory entry for bad inode %llu (0x%llx) in " "%llu (0x%llx)? (y/n)"), - (unsigned long long)di->dinode, - (unsigned long long)di->dinode, + (unsigned long long)di->dinode.no_addr, + (unsigned long long)di->dinode.no_addr, (unsigned long long)di->treewalk_parent, (unsigned long long)di->treewalk_parent)) { log_err( _("Directory entry to invalid inode remains\n")); return NULL; } - error = remove_dentry_from_dir(sdp, di->treewalk_parent, di->dinode); + error = remove_dentry_from_dir(sdp, di->treewalk_parent, + di->dinode.no_addr); if (error < 0) { stack; return NULL; @@ -163,8 +167,8 @@ static struct dir_info *mark_and_return_parent(struct gfs2_sbd *sdp, if (error > 0) log_warn( _("Unable to find dentry for block %llu" " (0x%llx) in %llu (0x%llx)\n"), - (unsigned long long)di->dinode, - (unsigned long long)di->dinode, + (unsigned long long)di->dinode.no_addr, + (unsigned long long)di->dinode.no_addr, (unsigned long long)di->treewalk_parent, (unsigned long long)di->treewalk_parent); log_warn( _("Directory entry removed\n")); @@ -173,7 +177,7 @@ static struct dir_info *mark_and_return_parent(struct gfs2_sbd *sdp, return NULL; out: - pdi = dirtree_find(di->dotdot_parent); + pdi = dirtree_find(di->dotdot_parent.no_addr); return pdi; } @@ -247,13 +251,14 @@ int pass3(struct gfs2_sbd *sdp) tdi = mark_and_return_parent(sdp, di); if (tdi) { - log_debug( _("Directory at block %llu (0x%llx) connected\n"), - (unsigned long long)di->dinode, - (unsigned long long)di->dinode); + log_debug( _("Directory at block %llu " + "(0x%llx) connected\n"), + (unsigned long long)di->dinode.no_addr, + (unsigned long long)di->dinode.no_addr); di = tdi; continue; } - q = block_type(di->dinode); + q = block_type(di->dinode.no_addr); if (q == gfs2_bad_block) { log_err( _("Found unlinked directory " "containing bad block\n")); @@ -262,14 +267,14 @@ int pass3(struct gfs2_sbd *sdp) log_warn( _("inode %lld (0x%llx) is " "now marked as free\n"), (unsigned long long) - di->dinode, + di->dinode.no_addr, (unsigned long long) - di->dinode); + di->dinode.no_addr); /* Can't use fsck_blockmap_set because we don't have ip */ - gfs2_blockmap_set(bl, di->dinode, + gfs2_blockmap_set(bl, di->dinode.no_addr, gfs2_block_free); - check_n_fix_bitmap(sdp, di->dinode, + check_n_fix_bitmap(sdp, di->dinode.no_addr, gfs2_block_free); break; } else @@ -288,29 +293,31 @@ int pass3(struct gfs2_sbd *sdp) } log_warn( _("inode %lld (0x%llx) is now " "marked as free\n"), - (unsigned long long)di->dinode, - (unsigned long long)di->dinode); + (unsigned long long)di->dinode.no_addr, + (unsigned long long)di->dinode.no_addr); /* Can't use fsck_blockmap_set because we don't have ip */ - gfs2_blockmap_set(bl, di->dinode, + gfs2_blockmap_set(bl, di->dinode.no_addr, gfs2_block_free); - check_n_fix_bitmap(sdp, di->dinode, + check_n_fix_bitmap(sdp, di->dinode.no_addr, gfs2_block_free); log_err( _("The block was cleared\n")); break; } log_err( _("Found unlinked directory at block %llu" - " (0x%llx)\n"), (unsigned long long)di->dinode, - (unsigned long long)di->dinode); - ip = fsck_load_inode(sdp, di->dinode); + " (0x%llx)\n"), + (unsigned long long)di->dinode.no_addr, + (unsigned long long)di->dinode.no_addr); + ip = fsck_load_inode(sdp, di->dinode.no_addr); /* Don't skip zero size directories with eattrs */ if (!ip->i_di.di_size && !ip->i_di.di_eattr){ log_err( _("Unlinked directory has zero " "size.\n")); if (query( _("Remove zero-size unlinked " "directory? (y/n) "))) { - fsck_blockmap_set(ip, di->dinode, + fsck_blockmap_set(ip, + di->dinode.no_addr, _("zero-sized unlinked inode"), gfs2_block_free); fsck_inode_put(&ip); diff --git a/gfs2/fsck/pass4.c b/gfs2/fsck/pass4.c index 80ecb38..311b96b 100644 --- a/gfs2/fsck/pass4.c +++ b/gfs2/fsck/pass4.c @@ -60,28 +60,28 @@ static int scan_inode_list(struct gfs2_sbd *sdp) { } /* Don't check reference counts on the special gfs files */ if (sdp->gfs1 && - ((ii->inode == sdp->md.riinode->i_di.di_num.no_addr) || - (ii->inode == sdp->md.jiinode->i_di.di_num.no_addr) || - (ii->inode == sdp->md.qinode->i_di.di_num.no_addr) || - (ii->inode == sdp->md.statfs->i_di.di_num.no_addr))) + ((ii->di_num.no_addr == sdp->md.riinode->i_di.di_num.no_addr) || + (ii->di_num.no_addr == sdp->md.jiinode->i_di.di_num.no_addr) || + (ii->di_num.no_addr == sdp->md.qinode->i_di.di_num.no_addr) || + (ii->di_num.no_addr == sdp->md.statfs->i_di.di_num.no_addr))) continue; if (ii->counted_links == 0) { log_err( _("Found unlinked inode at %llu (0x%llx)\n"), - (unsigned long long)ii->inode, - (unsigned long long)ii->inode); - q = block_type(ii->inode); + (unsigned long long)ii->di_num.no_addr, + (unsigned long long)ii->di_num.no_addr); + q = block_type(ii->di_num.no_addr); if (q == gfs2_bad_block) { log_err( _("Unlinked inode %llu (0x%llx) contains " "bad blocks\n"), - (unsigned long long)ii->inode, - (unsigned long long)ii->inode); + (unsigned long long)ii->di_num.no_addr, + (unsigned long long)ii->di_num.no_addr); if (query( _("Delete unlinked inode with bad " "blocks? (y/n) "))) { - ip = fsck_load_inode(sdp, ii->inode); + ip = fsck_load_inode(sdp, ii->di_num.no_addr); check_inode_eattr(ip, &pass4_fxns_delete); check_metatree(ip, &pass4_fxns_delete); - fsck_blockmap_set(ip, ii->inode, + fsck_blockmap_set(ip, ii->di_num.no_addr, _("bad unlinked"), gfs2_block_free); fsck_inode_put(&ip); @@ -98,14 +98,14 @@ static int scan_inode_list(struct gfs2_sbd *sdp) { log_err( _("Unlinked block %lld (0x%llx) " "marked as inode is " "not an inode (%d)\n"), - (unsigned long long)ii->inode, - (unsigned long long)ii->inode, q); - ip = fsck_load_inode(sdp, ii->inode); + (unsigned long long)ii->di_num.no_addr, + (unsigned long long)ii->di_num.no_addr, q); + ip = fsck_load_inode(sdp, ii->di_num.no_addr); if (query(_("Delete unlinked inode? (y/n) "))) { check_inode_eattr(ip, &pass4_fxns_delete); check_metatree(ip, &pass4_fxns_delete); - fsck_blockmap_set(ip, ii->inode, + fsck_blockmap_set(ip, ii->di_num.no_addr, _("invalid unlinked"), gfs2_block_free); fsck_inode_put(&ip); @@ -117,7 +117,7 @@ static int scan_inode_list(struct gfs2_sbd *sdp) { } continue; } - ip = fsck_load_inode(sdp, ii->inode); + ip = fsck_load_inode(sdp, ii->di_num.no_addr); /* We don't want to clear zero-size files with * eattrs - there might be relevent info in @@ -126,7 +126,7 @@ static int scan_inode_list(struct gfs2_sbd *sdp) { log_err( _("Unlinked inode has zero size\n")); if (query(_("Clear zero-size unlinked inode? " "(y/n) "))) { - fsck_blockmap_set(ip, ii->inode, + fsck_blockmap_set(ip, ii->di_num.no_addr, _("unlinked zero-length"), gfs2_block_free); fsck_inode_put(&ip); @@ -151,33 +151,34 @@ static int scan_inode_list(struct gfs2_sbd *sdp) { else if (ii->di_nlink != ii->counted_links) { log_err( _("Link count inconsistent for inode %llu" " (0x%llx) has %u but fsck found %u.\n"), - (unsigned long long)ii->inode, - (unsigned long long)ii->inode, ii->di_nlink, + (unsigned long long)ii->di_num.no_addr, + (unsigned long long)ii->di_num.no_addr, ii->di_nlink, ii->counted_links); /* Read in the inode, adjust the link count, * and write it back out */ if (query( _("Update link count for inode %llu" " (0x%llx) ? (y/n) "), - (unsigned long long)ii->inode, - (unsigned long long)ii->inode)) { - ip = fsck_load_inode(sdp, ii->inode); /* bread, inode_get */ + (unsigned long long)ii->di_num.no_addr, + (unsigned long long)ii->di_num.no_addr)) { + ip = fsck_load_inode(sdp, ii->di_num.no_addr); /* bread, inode_get */ fix_link_count(ii, ip); ii->di_nlink = ii->counted_links; fsck_inode_put(&ip); /* out, brelse, free */ log_warn( _("Link count updated to %d for " "inode %llu (0x%llx)\n"), ii->di_nlink, - (unsigned long long)ii->inode, - (unsigned long long)ii->inode); + (unsigned long long)ii->di_num.no_addr, + (unsigned long long)ii->di_num.no_addr); } else { - log_err( _("Link count for inode %llu (0x%llx) still incorrect\n"), - (unsigned long long)ii->inode, - (unsigned long long)ii->inode); + log_err( _("Link count for inode %llu (0x%llx" + ") still incorrect\n"), + (unsigned long long)ii->di_num.no_addr, + (unsigned long long)ii->di_num.no_addr); } } log_debug( _("block %llu (0x%llx) has link count %d\n"), - (unsigned long long)ii->inode, - (unsigned long long)ii->inode, ii->di_nlink); + (unsigned long long)ii->di_num.no_addr, + (unsigned long long)ii->di_num.no_addr, ii->di_nlink); } /* osi_list_foreach(tmp, list) */ if (lf_addition) { diff --git a/gfs2/fsck/util.c b/gfs2/fsck/util.c index eff7382..7c89155 100644 --- a/gfs2/fsck/util.c +++ b/gfs2/fsck/util.c @@ -392,7 +392,7 @@ int add_duplicate_ref(struct gfs2_inode *ip, uint64_t block, return 0; } -struct dir_info *dirtree_insert(uint64_t dblock) +struct dir_info *dirtree_insert(struct gfs2_inum inum) { struct osi_node **newn = &dirtree.osi_node, *parent = NULL; struct dir_info *data; @@ -402,9 +402,9 @@ struct dir_info *dirtree_insert(uint64_t dblock) struct dir_info *cur = (struct dir_info *)*newn; parent = *newn; - if (dblock < cur->dinode) + if (inum.no_addr < cur->dinode.no_addr) newn = &((*newn)->osi_left); - else if (dblock > cur->dinode) + else if (inum.no_addr > cur->dinode.no_addr) newn = &((*newn)->osi_right); else return cur; @@ -420,7 +420,8 @@ struct dir_info *dirtree_insert(uint64_t dblock) return NULL; } /* Add new node and rebalance tree. */ - data->dinode = dblock; + data->dinode.no_addr = inum.no_addr; + data->dinode.no_formal_ino = inum.no_formal_ino; osi_link_node(&data->node, parent, newn); osi_insert_color(&data->node, &dirtree); @@ -434,9 +435,9 @@ struct dir_info *dirtree_find(uint64_t block) while (node) { struct dir_info *data = (struct dir_info *)node; - if (block < data->dinode) + if (block < data->dinode.no_addr) node = node->osi_left; - else if (block > data->dinode) + else if (block > data->dinode.no_addr) node = node->osi_right; else return data; @@ -571,7 +572,7 @@ int set_ip_blockmap(struct gfs2_inode *ip, int instree) if (fsck_blockmap_set(ip, block, _("directory"), gfs2_inode_dir)) goto bad_dinode; - if (instree && !dirtree_insert(block)) + if (instree && !dirtree_insert(ip->i_di.di_num)) goto bad_dinode; break; case S_IFREG:

1 0

gfs2-utils: master - libgfs2: gfs2_get_bitmap performance enhancements
by Andrew Price 30 Oct '12

30 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=74f4384b36… Commit: 74f4384b361eb05b40c463d40067a3f9a1b1b7da Parent: 31710448d37825078494fb63c4af1f9dd83bcb24 Author: Andrew Price <anprice(a)redhat.com> AuthorDate: Thu Oct 25 22:08:14 2012 +0100 Committer: Andrew Price <anprice(a)redhat.com> CommitterDate: Thu Oct 25 22:29:21 2012 +0100 libgfs2: gfs2_get_bitmap performance enhancements This patch takes the bit lookup strategy from the kernel code (an amalgamation of gfs2_rbm_from_block and gfs2_testbit) to speed up gfs2_get_bitmap, which is renamed lgfs2_get_bitmap. Timings obtained running fsck.gfs2 on a 5% full, 10G local fs with 512 byte blocks (to maximize the number of leaf blocks) and many large directories: HEAD~2 HEAD ------- ------- 2:15.70 2:10.03 2:14.32 2:09.89 2:14.32 2:09.83 2:14.66 2:09.84 2:14.30 2:09.89 2:14.62 2:10.23 2:14.58 2:09.64 2:14.50 2:09.68 2:14.99 2:09.49 2:14.79 2:09.97 For sanity the output of the new lgfs2_get_bitmap was checked against the output of the old gfs2_get_bitmap over 1 million block state lookups. Signed-off-by: Andrew Price <anprice(a)redhat.com> --- gfs2/edit/hexedit.c | 8 ++++---- gfs2/fsck/fsck.h | 2 +- gfs2/fsck/metawalk.c | 2 +- gfs2/libgfs2/fs_bits.c | 44 ++++++++++++++++++++++++-------------------- gfs2/libgfs2/lang.c | 2 +- gfs2/libgfs2/libgfs2.h | 4 ++-- gfs2/libgfs2/rgrp.c | 17 ++++++----------- gfs2/libgfs2/super.c | 2 ++ 8 files changed, 41 insertions(+), 40 deletions(-) diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c index ff0dca9..6f5f5af 100644 --- a/gfs2/edit/hexedit.c +++ b/gfs2/edit/hexedit.c @@ -698,7 +698,7 @@ int display_block_type(int from_restore) (be32_to_cpu(mh->mh_type) == GFS2_METATYPE_RB)) type = 4; else { - type = gfs2_get_bitmap(&sbd, block, rgd); + type = lgfs2_get_bitmap(&sbd, block, rgd); } } else type = 4; @@ -726,7 +726,7 @@ int display_block_type(int from_restore) print_gfs2(" blk "); for (b = blknum; b < blknum + 4; b++) { - btype = gfs2_get_bitmap(&sbd, b, rgd); + btype = lgfs2_get_bitmap(&sbd, b, rgd); if (btype >= 0) { print_gfs2("0x%x-%s ", b, allocdesc[sbd.gfs1][btype]); @@ -760,7 +760,7 @@ int display_block_type(int from_restore) blknum += rgd->ri.ri_data0; print_gfs2(" blk "); for (b = blknum; b < blknum + 4; b++) { - btype = gfs2_get_bitmap(&sbd, b, rgd); + btype = lgfs2_get_bitmap(&sbd, b, rgd); if (btype >= 0) { print_gfs2("0x%x-%s ", b, allocdesc[sbd.gfs1][btype]); @@ -2053,7 +2053,7 @@ static void find_change_block_alloc(int *newval) else printf("%d\n", *newval); } else { - type = gfs2_get_bitmap(&sbd, ablock, rgd); + type = lgfs2_get_bitmap(&sbd, ablock, rgd); if (type < 0) { printf("-1 (block invalid or part of " "an rgrp).\n"); diff --git a/gfs2/fsck/fsck.h b/gfs2/fsck/fsck.h index dd49280..ecd37ad 100644 --- a/gfs2/fsck/fsck.h +++ b/gfs2/fsck/fsck.h @@ -151,7 +151,7 @@ extern struct gfs_sb *sbd1; static inline int valid_block(struct gfs2_sbd *sdp, uint64_t blkno) { return !((blkno > sdp->fssize) || (blkno <= sdp->sb_addr) || - (gfs2_get_bitmap(sdp, blkno, NULL) < 0)); + (lgfs2_get_bitmap(sdp, blkno, NULL) < 0)); } #endif /* _FSCK_H */ diff --git a/gfs2/fsck/metawalk.c b/gfs2/fsck/metawalk.c index 24de901..f19c0f7 100644 --- a/gfs2/fsck/metawalk.c +++ b/gfs2/fsck/metawalk.c @@ -34,7 +34,7 @@ int check_n_fix_bitmap(struct gfs2_sbd *sdp, uint64_t blk, rgd = gfs2_blk2rgrpd(sdp, blk); - old_bitmap_state = gfs2_get_bitmap(sdp, blk, rgd); + old_bitmap_state = lgfs2_get_bitmap(sdp, blk, rgd); if (old_bitmap_state < 0) { log_err( _("Block %llu (0x%llx) is not represented in the " "system bitmap; part of an rgrp or superblock.\n"), diff --git a/gfs2/libgfs2/fs_bits.c b/gfs2/libgfs2/fs_bits.c index fdc3bb3..94a612b 100644 --- a/gfs2/libgfs2/fs_bits.c +++ b/gfs2/libgfs2/fs_bits.c @@ -4,6 +4,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <limits.h> #include "libgfs2.h" @@ -175,14 +176,12 @@ int gfs2_set_bitmap(struct gfs2_sbd *sdp, uint64_t blkno, int state) * * Returns: state on success, -1 on error */ -int gfs2_get_bitmap(struct gfs2_sbd *sdp, uint64_t blkno, - struct rgrp_tree *rgd) +int lgfs2_get_bitmap(struct gfs2_sbd *sdp, uint64_t blkno, struct rgrp_tree *rgd) { - int i, val; - uint32_t rgrp_block; - struct gfs2_bitmap *bits = NULL; - unsigned int bit; - unsigned char *byte; + uint64_t offset; + uint32_t i = 0; + char *byte; + unsigned int bit; if (rgd == NULL) { rgd = gfs2_blk2rgrpd(sdp, blkno); @@ -190,23 +189,28 @@ int gfs2_get_bitmap(struct gfs2_sbd *sdp, uint64_t blkno, return -1; } - rgrp_block = (uint32_t)(blkno - rgd->ri.ri_data0); + offset = blkno - rgd->ri.ri_data0; + if (offset > UINT_MAX) { + errno = EINVAL; + return -1; + } + if (offset >= rgd->ri.ri_data0 + rgd->ri.ri_data) { + errno = E2BIG; + return -1; + } - for (i = 0; i < rgd->ri.ri_length; i++) { - bits = &(rgd->bits[i]); - if(rgrp_block < ((bits->bi_start + bits->bi_len)*GFS2_NBBY)) - break; + if (offset >= (rgd->bits->bi_start + rgd->bits->bi_len) * GFS2_NBBY) { + offset += (sizeof(struct gfs2_rgrp) - sizeof(struct gfs2_meta_header)) + * GFS2_NBBY; + i = offset / sdp->sd_blocks_per_bitmap; + offset -= i * sdp->sd_blocks_per_bitmap; } - if (i >= rgd->ri.ri_length) - return -1; if (!rgd->bh || !rgd->bh[i]) - return 0; - byte = (unsigned char *)(rgd->bh[i]->b_data + bits->bi_offset) + - (rgrp_block/GFS2_NBBY - bits->bi_start); - bit = (rgrp_block % GFS2_NBBY) * GFS2_BIT_SIZE; + return GFS2_BLKST_FREE; - val = ((*byte >> bit) & GFS2_BIT_MASK); + byte = (rgd->bh[i]->b_data + rgd->bits[i].bi_offset) + (offset/GFS2_NBBY); + bit = (offset % GFS2_NBBY) * GFS2_BIT_SIZE; - return val; + return (*byte >> bit) & GFS2_BIT_MASK; } diff --git a/gfs2/libgfs2/lang.c b/gfs2/libgfs2/lang.c index 12ca7bd..ad9382f 100644 --- a/gfs2/libgfs2/lang.c +++ b/gfs2/libgfs2/lang.c @@ -329,7 +329,7 @@ static int ast_get_bitstate(uint64_t bn, struct gfs2_sbd *sbd) return -1; } - state = gfs2_get_bitmap(sbd, bn, rgd); + state = lgfs2_get_bitmap(sbd, bn, rgd); if (state == -1) { fprintf(stderr, "Failed to acquire bitmap state for block %"PRIu64"\n", bn); return -1; diff --git a/gfs2/libgfs2/libgfs2.h b/gfs2/libgfs2/libgfs2.h index bf65922..2b109fb 100644 --- a/gfs2/libgfs2/libgfs2.h +++ b/gfs2/libgfs2/libgfs2.h @@ -276,6 +276,7 @@ struct gfs2_sbd { uint32_t sd_hash_bsize; uint32_t sd_hash_bsize_shift; uint32_t sd_hash_ptrs; + uint32_t sd_blocks_per_bitmap; uint32_t sd_max_dirres; uint32_t sd_max_height; uint64_t sd_heightsize[GFS2_MAX_META_HEIGHT]; @@ -408,8 +409,7 @@ extern uint32_t gfs2_blkalloc_internal(struct rgrp_tree *rgd, uint32_t goal, extern int gfs2_check_range(struct gfs2_sbd *sdp, uint64_t blkno); /* functions with blk #'s that are file system relative */ -extern int gfs2_get_bitmap(struct gfs2_sbd *sdp, uint64_t blkno, - struct rgrp_tree *rgd); +extern int lgfs2_get_bitmap(struct gfs2_sbd *sdp, uint64_t blkno, struct rgrp_tree *rgd); extern int gfs2_set_bitmap(struct gfs2_sbd *sdp, uint64_t blkno, int state); /* fs_geometry.c */ diff --git a/gfs2/libgfs2/rgrp.c b/gfs2/libgfs2/rgrp.c index c0f72fd..cbab2a3 100644 --- a/gfs2/libgfs2/rgrp.c +++ b/gfs2/libgfs2/rgrp.c @@ -98,17 +98,12 @@ int gfs2_compute_bitstructs(struct gfs2_sbd *sdp, struct rgrp_tree *rgd) */ struct rgrp_tree *gfs2_blk2rgrpd(struct gfs2_sbd *sdp, uint64_t blk) { - struct osi_node *node = sdp->rgtree.osi_node; - struct gfs2_rindex *ri; - - while (node) { - struct rgrp_tree *rgd = (struct rgrp_tree *)node; - ri = &rgd->ri; - - if (blk < ri->ri_addr) - node = node->osi_left; - else if (blk >= ri->ri_data0 + ri->ri_data) - node = node->osi_right; + struct rgrp_tree *rgd = (struct rgrp_tree *)sdp->rgtree.osi_node; + while (rgd) { + if (blk < rgd->ri.ri_addr) + rgd = (struct rgrp_tree *)rgd->node.osi_left; + else if (blk >= rgd->ri.ri_data0 + rgd->ri.ri_data) + rgd = (struct rgrp_tree *)rgd->node.osi_right; else return rgd; } diff --git a/gfs2/libgfs2/super.c b/gfs2/libgfs2/super.c index fdf0e60..8317862 100644 --- a/gfs2/libgfs2/super.c +++ b/gfs2/libgfs2/super.c @@ -116,6 +116,8 @@ int read_sb(struct gfs2_sbd *sdp) } sdp->fssize = lseek(sdp->device_fd, 0, SEEK_END) / sdp->sd_sb.sb_bsize; sdp->sb_addr = GFS2_SB_ADDR * GFS2_BASIC_BLOCK / sdp->bsize; + sdp->sd_blocks_per_bitmap = (sdp->sd_sb.sb_bsize - sizeof(struct gfs2_meta_header)) + * GFS2_NBBY; return 0; }

1 0

gfs2-utils: master - libgfs2: Move valid_block into fsck.gfs2
by Andrew Price 30 Oct '12

30 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=31710448d3… Commit: 31710448d37825078494fb63c4af1f9dd83bcb24 Parent: ad15965a9449e68dc83aa21190262c493089f05d Author: Andrew Price <anprice(a)redhat.com> AuthorDate: Thu Oct 18 14:43:53 2012 +0100 Committer: Andrew Price <anprice(a)redhat.com> CommitterDate: Thu Oct 18 14:43:53 2012 +0100 libgfs2: Move valid_block into fsck.gfs2 valid_block() is only used by fsck.gfs2 as none of the other utils require the same level of paranoia so we can move it into fsck.h and make it static inline. In my (small) tests the speedup effect is barely noticeable but it should make a difference for larger file systems, particularly those with very large directories. Also fsck/fs_bits.h is no longer used so this patch removes it. Signed-off-by: Andrew Price <anprice(a)redhat.com> --- gfs2/fsck/Makefile.am | 2 +- gfs2/fsck/fs_bits.h | 17 ----------------- gfs2/fsck/fsck.h | 6 ++++++ gfs2/fsck/util.c | 1 - gfs2/libgfs2/fs_bits.c | 17 ----------------- gfs2/libgfs2/libgfs2.h | 1 - 6 files changed, 7 insertions(+), 37 deletions(-) diff --git a/gfs2/fsck/Makefile.am b/gfs2/fsck/Makefile.am index 261f6b1..b92c745 100644 --- a/gfs2/fsck/Makefile.am +++ b/gfs2/fsck/Makefile.am @@ -10,7 +10,7 @@ sbindir := $(shell rpl=0; test '$(exec_prefix):$(sbindir)' = /usr:/usr/sbin \ sbin_PROGRAMS = fsck.gfs2 -noinst_HEADERS = eattr.h fs_bits.h fsck.h fs_recovery.h \ +noinst_HEADERS = eattr.h fsck.h fs_recovery.h \ inode_hash.h link.h lost_n_found.h metawalk.h util.h fsck_gfs2_SOURCES = eattr.c fs_recovery.c initialize.c \ diff --git a/gfs2/fsck/fs_bits.h b/gfs2/fsck/fs_bits.h deleted file mode 100644 index d4f262e..0000000 --- a/gfs2/fsck/fs_bits.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef __FS_BITS_H__ -#define __FS_BITS_H__ - -#include "libgfs2.h" -#include "fsck.h" - -#define BFITNOENT (0xFFFFFFFF) - -struct fs_bitmap -{ - uint32_t bi_offset; /* The offset in the buffer of the first byte */ - uint32_t bi_start; /* The position of the first byte in this block */ - uint32_t bi_len; /* The number of bytes in this block */ -}; -typedef struct fs_bitmap fs_bitmap_t; - -#endif /* __FS_BITS_H__ */ diff --git a/gfs2/fsck/fsck.h b/gfs2/fsck/fsck.h index 70fc3d7..dd49280 100644 --- a/gfs2/fsck/fsck.h +++ b/gfs2/fsck/fsck.h @@ -148,4 +148,10 @@ extern int dups_found_first; /* How many duplicates have we found the original reference for? */ extern struct gfs_sb *sbd1; +static inline int valid_block(struct gfs2_sbd *sdp, uint64_t blkno) +{ + return !((blkno > sdp->fssize) || (blkno <= sdp->sb_addr) || + (gfs2_get_bitmap(sdp, blkno, NULL) < 0)); +} + #endif /* _FSCK_H */ diff --git a/gfs2/fsck/util.c b/gfs2/fsck/util.c index 6c80ae8..eff7382 100644 --- a/gfs2/fsck/util.c +++ b/gfs2/fsck/util.c @@ -13,7 +13,6 @@ #define _(String) gettext(String) #include "libgfs2.h" -#include "fs_bits.h" #include "metawalk.h" #include "util.h" diff --git a/gfs2/libgfs2/fs_bits.c b/gfs2/libgfs2/fs_bits.c index 5eeb920..fdc3bb3 100644 --- a/gfs2/libgfs2/fs_bits.c +++ b/gfs2/libgfs2/fs_bits.c @@ -113,23 +113,6 @@ int gfs2_check_range(struct gfs2_sbd *sdp, uint64_t blkno) } /* - * valid_block - check if blkno is valid and not part of our rgrps or bitmaps - * @sdp: super block - * @blkno: block number - * - * Returns: 1 if ok, 0 if out of bounds - */ -int valid_block(struct gfs2_sbd *sdp, uint64_t blkno) -{ - if((blkno > sdp->fssize) || (blkno <= sdp->sb_addr)) - return 0; - /* Check if the block is one of our rgrp or bitmap blocks */ - if (gfs2_get_bitmap(sdp, blkno, NULL) < 0) - return 0; - return 1; -} - -/* * gfs2_set_bitmap * @sdp: super block * @blkno: block number relative to file system diff --git a/gfs2/libgfs2/libgfs2.h b/gfs2/libgfs2/libgfs2.h index 3045337..bf65922 100644 --- a/gfs2/libgfs2/libgfs2.h +++ b/gfs2/libgfs2/libgfs2.h @@ -408,7 +408,6 @@ extern uint32_t gfs2_blkalloc_internal(struct rgrp_tree *rgd, uint32_t goal, extern int gfs2_check_range(struct gfs2_sbd *sdp, uint64_t blkno); /* functions with blk #'s that are file system relative */ -extern int valid_block(struct gfs2_sbd *sdp, uint64_t blkno); extern int gfs2_get_bitmap(struct gfs2_sbd *sdp, uint64_t blkno, struct rgrp_tree *rgd); extern int gfs2_set_bitmap(struct gfs2_sbd *sdp, uint64_t blkno, int state);

1 0

fence-agents: master - fabric fence agents: Fix dealing with enable/disable and support on/off options for fabric fence agents
by Marek Grác 29 Oct '12

29 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=c7ba00da… Commit: c7ba00daf03a19d7557e825e637a220b5cc4deae Parent: b0303c783b9ee4d4214828d88344547549a04d11 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Thu Oct 25 12:48:12 2012 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Mon Oct 29 12:30:09 2012 +0100 fabric fence agents: Fix dealing with enable/disable and support on/off options for fabric fence agents --- fence/agents/cisco_mds/fence_cisco_mds.py | 16 +-------- fence/agents/ifmib/fence_ifmib.py | 17 +--------- fence/agents/lib/fencing.py.py | 50 ++++++++++++++--------------- fence/agents/sanbox2/fence_sanbox2.py | 2 +- 4 files changed, 29 insertions(+), 56 deletions(-) diff --git a/fence/agents/cisco_mds/fence_cisco_mds.py b/fence/agents/cisco_mds/fence_cisco_mds.py index a007fde..e2a1e91 100644 --- a/fence/agents/cisco_mds/fence_cisco_mds.py +++ b/fence/agents/cisco_mds/fence_cisco_mds.py @@ -81,7 +81,7 @@ def get_outlets_status(conn, options): def main(): global port_oid - device_opt = [ "ipaddr", "login", "passwd", "passwd_script", + device_opt = [ "fabric_fencing", "ipaddr", "login", "passwd", "passwd_script", "test", "port", "separator", "no_login", "no_password", "snmp_version", "community", "snmp_auth_prot", "snmp_sec_level", "snmp_priv_prot", "snmp_priv_passwd", "snmp_priv_passwd_script", @@ -90,20 +90,8 @@ def main(): atexit.register(atexit_handler) snmp_define_defaults () - options=process_input(device_opt) - # Emulate enable/disable functionality - if (options.has_key("-o")): - options["-o"]=options["-o"].lower() - - if (options["-o"]=="enable"): - options["-o"]="on" - if (options["-o"]=="disable"): - options["-o"]="off" - else: - options["-o"]="off" - - options = check_input(device_opt, options) + options = check_input(device_opt, process_input(device_opt)) docs = { } docs["shortdesc"] = "Fence agent for Cisco MDS" diff --git a/fence/agents/ifmib/fence_ifmib.py b/fence/agents/ifmib/fence_ifmib.py index a43bf38..0b0a71d 100644 --- a/fence/agents/ifmib/fence_ifmib.py +++ b/fence/agents/ifmib/fence_ifmib.py @@ -97,7 +97,7 @@ def get_outlets_status(conn, options): def main(): global port_oid - device_opt = [ "ipaddr", "login", "passwd", "passwd_script", + device_opt = [ "fabric_fencing", "ipaddr", "login", "passwd", "passwd_script", "test", "port", "separator", "no_login", "no_password", "snmp_version", "community", "snmp_auth_prot", "snmp_sec_level", "snmp_priv_prot", "snmp_priv_passwd", "snmp_priv_passwd_script", @@ -108,20 +108,7 @@ def main(): snmp_define_defaults () all_opt["snmp_version"]["default"]="2c" - options=process_input(device_opt) - - # Emulate enable/disable functionality - if (options.has_key("-o")): - options["-o"]=options["-o"].lower() - - if (options["-o"]=="enable"): - options["-o"]="on" - if (options["-o"]=="disable"): - options["-o"]="off" - else: - options["-o"]="off" - - options = check_input(device_opt, options) + options = check_input(device_opt, process_input(device_opt)) docs = { } docs["shortdesc"] = "Fence agent for IF MIB" diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index e26f9b3..c1851d1 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -89,13 +89,9 @@ all_opt = { "shortdesc" : "Fencing Action", "default" : "reboot", "order" : 1 }, - "io_fencing" : { - "getopt" : "o:", - "longopt" : "action", - "help" : "-o, --action=<action> Action: status, enable or disable", - "required" : "1", - "shortdesc" : "Fencing Action", - "default" : "disable", + "fabric_fencing" : { + "getopt" : "", + "help" : "", "order" : 1 }, "ipaddr" : { "getopt" : "a:", @@ -522,13 +518,11 @@ def metadata(avail_opt, options, docs): print "\t</parameter>" print "</parameters>" print "<actions>" - if avail_opt.count("io_fencing") == 0: - print "\t<action name=\"on\" />" - print "\t<action name=\"off\" />" + print "\t<action name=\"on\" />" + print "\t<action name=\"off\" />" + + if avail_opt.count("fabric_fencing") == 0: print "\t<action name=\"reboot\" />" - else: - print "\t<action name=\"enable\" />" - print "\t<action name=\"disable\" />" print "\t<action name=\"status\" />" print "\t<action name=\"list\" />" @@ -629,8 +623,6 @@ def process_input(avail_opt): name = "ipaddr" elif name == "modulename": name = "module_name" - elif name == "action" and 1 == avail_opt.count("io_fencing"): - name = "io_fencing" elif name == "port" and 1 == avail_opt.count("drac_version"): name = "module_name" @@ -683,19 +675,30 @@ def check_input(device_opt, opt): if 0 == options.has_key(getopt): options[getopt] = all_opt[opt]["default"] - options["-o"]=options["-o"].lower() + options["-o"] = options["-o"].lower() if options.has_key("-v"): options["log"] = LOG_MODE_VERBOSE else: options["log"] = LOG_MODE_QUIET - if 0 == device_opt.count("io_fencing"): - if 0 == ["on", "off", "reboot", "status", "list", "monitor"].count(options["-o"].lower()): - fail_usage("Failed: Unrecognised action '" + options["-o"] + "'") + acceptable_actions = [ "on", "off", "status", "list", "monitor" ] + if 0 == device_opt.count("fabric_fencing"): + ## Compatibility layer + ##### + acceptable_actions.extend(["enable", "disable"]) else: - if 0 == ["enable", "disable", "status", "list", "monitor"].count(options["-o"].lower()): - fail_usage("Failed: Unrecognised action '" + options["-o"] + "'") + acceptable_actions.extend(["reboot"]) + + if 0 == acceptable_actions.count(options["-o"]): + fail_usage("Failed: Unrecognised action '" + options["-o"] + "'") + + ## Compatibility layer + ##### + if options["-o"] == "enable": + options["-o"] = "on" + if options["-o"] == "disable": + options["-o"] = "off" if (0 == options.has_key("-l")) and device_opt.count("login") and (device_opt.count("no_login") == 0): fail_usage("Failed: You have to set login name") @@ -807,11 +810,6 @@ def fence_action(tn, options, set_power_fn, get_power_fn, get_outlet_list = None if status != "on" and status != "off": fail(EC_STATUS) - - if options["-o"] == "enable": - options["-o"] = "on" - if options["-o"] == "disable": - options["-o"] = "off" if options["-o"] == "on": if status == "on": diff --git a/fence/agents/sanbox2/fence_sanbox2.py b/fence/agents/sanbox2/fence_sanbox2.py index fdbea06..51781f9 100644 --- a/fence/agents/sanbox2/fence_sanbox2.py +++ b/fence/agents/sanbox2/fence_sanbox2.py @@ -108,7 +108,7 @@ def get_list_devices(conn, options): return outlets def main(): - device_opt = [ "io_fencing", "ipaddr", "login", "passwd", "passwd_script", + device_opt = [ "fabric_fencing", "ipaddr", "login", "passwd", "passwd_script", "cmd_prompt", "port", "ipport", "separator" ] atexit.register(atexit_handler)

1 0

fence-agents: master - fence-agents: Use default values for device options instead of per-agent solutions
by Marek Grác 29 Oct '12

29 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=b0303c78… Commit: b0303c783b9ee4d4214828d88344547549a04d11 Parent: 9851b2aec92f30456fb88a1c69ca964fae58e1ec Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Mon Oct 29 12:24:36 2012 +0100 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Mon Oct 29 12:24:36 2012 +0100 fence-agents: Use default values for device options instead of per-agent solutions Majority of these changes concern: * (-x / ssh) to be turn on by default * command prompt default which differs across fence agents --- fence/agents/alom/fence_alom.py | 12 ++++-------- fence/agents/apc/fence_apc.py | 11 +++-------- fence/agents/drac5/fence_drac5.py | 8 ++------ fence/agents/eaton_snmp/fence_eaton_snmp.py | 8 ++------ fence/agents/ibmblade/fence_ibmblade.py | 6 +----- fence/agents/ifmib/fence_ifmib.py | 5 +---- fence/agents/ilo/fence_ilo.py | 7 ++----- fence/agents/ipdu/fence_ipdu.py | 14 +++++--------- fence/agents/ldom/fence_ldom.py | 15 +++++---------- fence/agents/lpar/fence_lpar.py | 7 +------ fence/agents/rsa/fence_rsa.py | 8 ++------ fence/agents/rsb/fence_rsb.py | 2 -- fence/agents/sanbox2/fence_sanbox2.py | 8 ++------ fence/agents/virsh/fence_virsh.py | 11 ++++------- fence/agents/vmware/fence_vmware.py | 10 ++-------- fence/agents/wti/fence_wti.py | 8 ++------ fence/agents/xenapi/fence_xenapi.py | 4 +--- 17 files changed, 39 insertions(+), 105 deletions(-) diff --git a/fence/agents/alom/fence_alom.py b/fence/agents/alom/fence_alom.py index 6d62d73..0f68050 100644 --- a/fence/agents/alom/fence_alom.py +++ b/fence/agents/alom/fence_alom.py @@ -43,19 +43,15 @@ def set_power_status(conn, options): fail(EC_TIMED_OUT) def main(): - device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "secure", + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "cmd_prompt", "secure", "identity_file", "test", "inet4_only", "inet6_only", "ipport" ] atexit.register(atexit_handler) - - pinput = process_input(device_opt) - pinput["-x"] = 1 - options = check_input(device_opt, pinput) - # Default command is sc> - if (not options.has_key("-c")): - options["-c"] = "sc\>\ " + all_opt["secure"]["default"] = "1" + all_opt["cmd_prompt"]["default"] = [ "sc\>\ " ] + options = check_input(device_opt, process_input(device_opt)) options["telnet_over_ssh"] = 1 docs = { } diff --git a/fence/agents/apc/fence_apc.py b/fence/agents/apc/fence_apc.py index 46f8b84..0406955 100644 --- a/fence/agents/apc/fence_apc.py +++ b/fence/agents/apc/fence_apc.py @@ -182,22 +182,17 @@ def set_power_status(conn, options): fail(EC_TIMED_OUT) def main(): - device_opt = [ "ipaddr", "login", "passwd", "passwd_script", + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "cmd_prompt", "secure", "port", "identity_file", "switch", "test", "separator", "inet4_only", "inet6_only", "ipport" ] atexit.register(atexit_handler) - options = check_input(device_opt, process_input(device_opt)) + all_opt["cmd_prompt"]["default"] = "\n>" - ## - ## Fence agent specific defaults - ##### + options = check_input(device_opt, process_input(device_opt)) options["ssh_options"] = "-1 -c blowfish" - if 0 == options.has_key("-c"): - options["-c"] = "\n>" - docs = { } docs["shortdesc"] = "Fence agent for APC over telnet/ssh" docs["longdesc"] = "fence_apc is an I/O Fencing agent \ diff --git a/fence/agents/drac5/fence_drac5.py b/fence/agents/drac5/fence_drac5.py index 755f2b4..b261e50 100644 --- a/fence/agents/drac5/fence_drac5.py +++ b/fence/agents/drac5/fence_drac5.py @@ -91,13 +91,9 @@ def main(): atexit.register(atexit_handler) - options = check_input(device_opt, process_input(device_opt)) + all_opt["cmd_prompt"]["default"] = [ "\$" ] - ## - ## Fence agent specific defaults - ##### - if 0 == options.has_key("-c"): - options["-c"] = "\$" + options = check_input(device_opt, process_input(device_opt)) docs = { } docs["shortdesc"] = "Fence agent for Dell DRAC CMC/5" diff --git a/fence/agents/eaton_snmp/fence_eaton_snmp.py b/fence/agents/eaton_snmp/fence_eaton_snmp.py index 2c0b54e..e4c3ea3 100644 --- a/fence/agents/eaton_snmp/fence_eaton_snmp.py +++ b/fence/agents/eaton_snmp/fence_eaton_snmp.py @@ -197,11 +197,6 @@ def get_outlets_status(conn, options): return result -# Define new options -def eaton_snmp_define_defaults(): - all_opt["snmp_version"]["default"]="1" - all_opt["community"]["default"]="private" - # Main agent method def main(): device_opt = [ "ipaddr", "login", "passwd", "passwd_script", @@ -213,10 +208,11 @@ def main(): atexit.register(atexit_handler) snmp_define_defaults () - eaton_snmp_define_defaults() all_opt["switch"]["default"] = 1 all_opt["power_wait"]["default"] = 2 + all_opt["snmp_version"]["default"] = "1" + all_opt["community"]["default"] = "private" options=check_input(device_opt,process_input(device_opt)) # Plug indexing start from zero on ePDU Managed, so we substract '1' from diff --git a/fence/agents/ibmblade/fence_ibmblade.py b/fence/agents/ibmblade/fence_ibmblade.py index 96d2a76..ec992f4 100644 --- a/fence/agents/ibmblade/fence_ibmblade.py +++ b/fence/agents/ibmblade/fence_ibmblade.py @@ -48,10 +48,6 @@ def get_outlets_status(conn, options): return result -# Define new options -def ibmblade_define_defaults(): - all_opt["snmp_version"]["default"]="1" - # Main agent method def main(): global port_oid @@ -65,7 +61,7 @@ def main(): atexit.register(atexit_handler) snmp_define_defaults () - ibmblade_define_defaults() + all_opt["snmp_version"]["default"]="1" options=check_input(device_opt,process_input(device_opt)) diff --git a/fence/agents/ifmib/fence_ifmib.py b/fence/agents/ifmib/fence_ifmib.py index bbbec22..a43bf38 100644 --- a/fence/agents/ifmib/fence_ifmib.py +++ b/fence/agents/ifmib/fence_ifmib.py @@ -93,10 +93,6 @@ def get_outlets_status(conn, options): return result -# Define new options -def ifmib_define_defaults(): - all_opt["snmp_version"]["default"]="2c" - # Main agent method def main(): global port_oid @@ -110,6 +106,7 @@ def main(): atexit.register(atexit_handler) snmp_define_defaults () + all_opt["snmp_version"]["default"]="2c" options=process_input(device_opt) diff --git a/fence/agents/ilo/fence_ilo.py b/fence/agents/ilo/fence_ilo.py index 4c8f7ca..fca72a7 100644 --- a/fence/agents/ilo/fence_ilo.py +++ b/fence/agents/ilo/fence_ilo.py @@ -65,12 +65,9 @@ def main(): all_opt["login_timeout"]["default"] = "10" all_opt["retry_on"]["default"] = "3" + all_opt["ssl"]["default"] = "1" - pinput = process_input(device_opt) - pinput["-z"] = 1 - options = check_input(device_opt, pinput) - - LOGIN_TIMEOUT = 10 + options = check_input(device_opt, process_input(device_opt)) docs = { } docs["shortdesc"] = "Fence agent for HP iLO" diff --git a/fence/agents/ipdu/fence_ipdu.py b/fence/agents/ipdu/fence_ipdu.py index 2749e44..0243afd 100644 --- a/fence/agents/ipdu/fence_ipdu.py +++ b/fence/agents/ipdu/fence_ipdu.py @@ -129,13 +129,6 @@ def get_outlets_status(conn, options): return result -# Define new options -def ipdu_snmp_define_defaults(): - all_opt["snmp_version"]["default"]="3" - all_opt["community"]["default"]="private" - all_opt["switch"]["default"]="1" - device=IBMiPDU - # Main agent method def main(): device_opt = [ "ipaddr", "login", "passwd", "passwd_script", @@ -147,9 +140,12 @@ def main(): atexit.register(atexit_handler) snmp_define_defaults () - ipdu_snmp_define_defaults() + all_opt["snmp_version"]["default"] = "3" + all_opt["community"]["default"] = "private" + all_opt["switch"]["default"] = "1" + device = IBMiPDU - options=check_input(device_opt,process_input(device_opt)) + options = check_input(device_opt,process_input(device_opt)) docs = { } docs["shortdesc"] = "Fence agent for iPDU over SNMP" diff --git a/fence/agents/ldom/fence_ldom.py b/fence/agents/ldom/fence_ldom.py index d106255..498d0d7 100644 --- a/fence/agents/ldom/fence_ldom.py +++ b/fence/agents/ldom/fence_ldom.py @@ -87,16 +87,11 @@ def main(): atexit.register(atexit_handler) - pinput = process_input(device_opt) - pinput["-x"] = 1 - options = check_input(device_opt, pinput) - - ## - ## Fence agent specific defaults - ##### - if (not options.has_key("-c")): - options["-c"] = "\ $" - + all_opt["secure"]["default"] = "1" + all_opt["cmd_prompt"]["default"] = [ "\ $" ] + + options = check_input(device_opt, process_input(device_opt)) + docs = { } docs["shortdesc"] = "Fence agent for Sun LDOM" docs["longdesc"] = "fence_ldom is an I/O Fencing agent \ diff --git a/fence/agents/lpar/fence_lpar.py b/fence/agents/lpar/fence_lpar.py index b9121e4..a5d4195 100644 --- a/fence/agents/lpar/fence_lpar.py +++ b/fence/agents/lpar/fence_lpar.py @@ -138,15 +138,10 @@ def main(): all_opt["login_timeout"]["default"] = "15" all_opt["secure"]["default"] = "1" + all_opt["cmd_prompt"]["default"] = [ ":~>", "]\$", "\$ " ] options = check_input(device_opt, process_input(device_opt)) - ## - ## Fence agent specific settings and default values - ##### - if 0 == options.has_key("-c"): - options["-c"] = [ ":~>", "]\$", "\$ " ] - docs = { } docs["shortdesc"] = "Fence agent for IBM LPAR" docs["longdesc"] = "" diff --git a/fence/agents/rsa/fence_rsa.py b/fence/agents/rsa/fence_rsa.py index 3ba2c80..44ad33f 100644 --- a/fence/agents/rsa/fence_rsa.py +++ b/fence/agents/rsa/fence_rsa.py @@ -50,14 +50,10 @@ def main(): atexit.register(atexit_handler) all_opt["login_timeout"]["default"] = 10 + all_opt["cmd_prompt"]["default"] = [ ">" ] + options = check_input(device_opt, process_input(device_opt)) - ## - ## Fence agent specific defaults - ##### - if 0 == options.has_key("-c"): - options["-c"] = ">" - # This device will not allow us to login even with LANG=C options["ssh_options"] = "-F /dev/null" diff --git a/fence/agents/rsb/fence_rsb.py b/fence/agents/rsb/fence_rsb.py index bc3df9a..f8cd827 100755 --- a/fence/agents/rsb/fence_rsb.py +++ b/fence/agents/rsb/fence_rsb.py @@ -85,8 +85,6 @@ will block any necessary fencing actions." ## ## Operate the fencing device #### - print options["-u"] - conn = fence_login(options) result = fence_action(conn, options, set_power_status, get_power_status, None) diff --git a/fence/agents/sanbox2/fence_sanbox2.py b/fence/agents/sanbox2/fence_sanbox2.py index 8c67ac2..fdbea06 100644 --- a/fence/agents/sanbox2/fence_sanbox2.py +++ b/fence/agents/sanbox2/fence_sanbox2.py @@ -113,13 +113,9 @@ def main(): atexit.register(atexit_handler) - options = check_input(device_opt, process_input(device_opt)) + all_opt["cmd_prompt"]["default"] = [ " #> " ] - ## - ## Fence agent specific defaults - ##### - if 0 == options.has_key("-c"): - options["-c"] = [ " #> " ] + options = check_input(device_opt, process_input(device_opt)) docs = { } docs["shortdesc"] = "Fence agent for QLogic SANBox2 FC switches" diff --git a/fence/agents/virsh/fence_virsh.py b/fence/agents/virsh/fence_virsh.py index 6e6a43d..ebf6666 100644 --- a/fence/agents/virsh/fence_virsh.py +++ b/fence/agents/virsh/fence_virsh.py @@ -71,19 +71,16 @@ def set_power_status(conn, options): fail(EC_TIMED_OUT) def main(): - device_opt = [ "ipaddr", "login", "passwd", "passwd_script", + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "cmd_prompt", "secure", "identity_file", "test", "port", "separator", "inet4_only", "inet6_only", "ipport", "sudo" ] atexit.register(atexit_handler) - pinput = process_input(device_opt) - pinput["-x"] = 1 - options = check_input(device_opt, pinput) + all_opt["secure"]["default"] = "1" + all_opt["cmd_prompt"]["default"] = [ "\[EXPECT\]#\ " ] - ## Defaults for fence agent - if 0 == options.has_key("-c"): - options["-c"] = "\[EXPECT\]#\ " + options = check_input(device_opt, process_input(device_opt)) options["ssh_options"]="-t '/bin/bash -c \"PS1=\[EXPECT\]#\ /bin/bash --noprofile --norc\"'" diff --git a/fence/agents/vmware/fence_vmware.py b/fence/agents/vmware/fence_vmware.py index 0b81d1d..885a876 100644 --- a/fence/agents/vmware/fence_vmware.py +++ b/fence/agents/vmware/fence_vmware.py @@ -256,10 +256,6 @@ def vmware_is_supported_vmrun_version(options): return True -# Define new options -def vmware_define_defaults(): - all_opt["vmware_type"]["default"]=VMWARE_DEFAULT_TYPE - # Check vmware type, set vmware_internal_type to one of VMWARE_TYPE_ value and # options["-e"] to path (if not specified) def vmware_check_vmware_type(options): @@ -290,13 +286,11 @@ def main(): atexit.register(atexit_handler) - vmware_define_defaults() + all_opt["secure"]["default"] = "1" + all_opt["vmware_type"]["default"] = VMWARE_DEFAULT_TYPE options = check_input(device_opt, process_input(device_opt)) - # Default is secure connection - options["-x"] = 1 - docs = { } docs["shortdesc"] = "Fence agent for VMWare" docs["longdesc"] = "fence_vmware is an I/O Fencing agent \ diff --git a/fence/agents/wti/fence_wti.py b/fence/agents/wti/fence_wti.py index f013953..9aa9959 100644 --- a/fence/agents/wti/fence_wti.py +++ b/fence/agents/wti/fence_wti.py @@ -96,13 +96,9 @@ def main(): atexit.register(atexit_handler) - options = check_input(device_opt, process_input(device_opt)) + all_opt["cmd_prompt"]["default"] = [ "RSM>", "MPC>", "IPS>", "TPS>", "NBB>", "NPS>", "VMR>" ] - ## - ## Fence agent specific defaults - ##### - if 0 == options.has_key("-c"): - options["-c"] = [ "RSM>", "MPC>", "IPS>", "TPS>", "NBB>", "NPS>", "VMR>" ] + options = check_input(device_opt, process_input(device_opt)) docs = { } docs["shortdesc"] = "Fence agent for WTI" diff --git a/fence/agents/xenapi/fence_xenapi.py b/fence/agents/xenapi/fence_xenapi.py index 0b07ed6..017908f 100644 --- a/fence/agents/xenapi/fence_xenapi.py +++ b/fence/agents/xenapi/fence_xenapi.py @@ -204,9 +204,7 @@ def main(): atexit.register(atexit_handler) - options=process_input(device_opt) - - options = check_input(device_opt, options) + options = check_input(device_opt, process_input(device_opt)) docs = { } docs["shortdesc"] = "XenAPI based fencing for the Citrix XenServer virtual machines."

1 0

fence-agents: master - fence_cisco_ucs: Incorrect timeout was used during login
by Marek Grác 29 Oct '12

29 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=9851b2ae… Commit: 9851b2aec92f30456fb88a1c69ca964fae58e1ec Parent: 62004c338202dfadfa4b8f2cefd959867c9afa74 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Mon Oct 22 15:51:55 2012 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Mon Oct 29 12:23:57 2012 +0100 fence_cisco_ucs: Incorrect timeout was used during login Previously, login command was bound with shell_timeout instead of login_timeout. --- fence/agents/cisco_ucs/fence_cisco_ucs.py | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/fence/agents/cisco_ucs/fence_cisco_ucs.py b/fence/agents/cisco_ucs/fence_cisco_ucs.py index 8020d96..84cb4fd 100644 --- a/fence/agents/cisco_ucs/fence_cisco_ucs.py +++ b/fence/agents/cisco_ucs/fence_cisco_ucs.py @@ -18,7 +18,7 @@ re_get_desc = re.compile(" descr=\"(.*?)\"", re.IGNORECASE) def get_power_status(conn, options): try: - res = send_command(options, "<configResolveDn cookie=\"" + options["cookie"] + "\" inHierarchical=\"false\" dn=\"org-root" + options["-s"] + "/ls-" + options["-n"] + "/power\"/>") + res = send_command(options, "<configResolveDn cookie=\"" + options["cookie"] + "\" inHierarchical=\"false\" dn=\"org-root" + options["-s"] + "/ls-" + options["-n"] + "/power\"/>", int(options["-Y"])) except pycurl.error, e: sys.stderr.write(e[1] + "\n") fail(EC_TIMED_OUT) @@ -41,7 +41,7 @@ def set_power_status(conn, options): }[options["-o"]] try: - res = send_command(options, "<configConfMos cookie=\"" + options["cookie"] + "\" inHierarchical=\"no\"><inConfigs><pair key=\"org-root" + options["-s"] + "/ls-" + options["-n"] + "/power\"><lsPower dn=\"org-root/ls-" + options["-n"] + "/power\" state=\"" + action + "\" status=\"modified\" /></pair></inConfigs></configConfMos>") + res = send_command(options, "<configConfMos cookie=\"" + options["cookie"] + "\" inHierarchical=\"no\"><inConfigs><pair key=\"org-root" + options["-s"] + "/ls-" + options["-n"] + "/power\"><lsPower dn=\"org-root/ls-" + options["-n"] + "/power\" state=\"" + action + "\" status=\"modified\" /></pair></inConfigs></configConfMos>", int(options["-Y"])) except pycurl.error, e: sys.stderr.write(e[1] + "\n") fail(EC_TIMED_OUT) @@ -53,7 +53,7 @@ def get_list(conn, options): try: try: - res = send_command(options, "<configResolveClass cookie=\"" + options["cookie"] + "\" inHierarchical=\"false\" classId=\"lsServer\"/>") + res = send_command(options, "<configResolveClass cookie=\"" + options["cookie"] + "\" inHierarchical=\"false\" classId=\"lsServer\"/>", int(options["-Y"])) except pycurl.error, e: sys.stderr.write(e[1] + "\n") fail(EC_TIMED_OUT) @@ -70,7 +70,7 @@ def get_list(conn, options): return outlets -def send_command(opt, command): +def send_command(opt, command, timeout): ## setup correct URL if opt.has_key("-z"): url = "https:" @@ -86,7 +86,7 @@ def send_command(opt, command): c.setopt(pycurl.HTTPHEADER, [ "Content-type: text/xml" ]) c.setopt(pycurl.POSTFIELDS, command) c.setopt(pycurl.WRITEFUNCTION, b.write) - c.setopt(pycurl.TIMEOUT, int(opt["-Y"])) + c.setopt(pycurl.TIMEOUT, timeout) c.setopt(pycurl.SSL_VERIFYPEER, 0) c.setopt(pycurl.SSL_VERIFYHOST, 0) c.perform() @@ -115,7 +115,7 @@ used with Cisco UCS to fence machines." show_docs(options, docs) ### Login - res = send_command(options, "<aaaLogin inName=\"" + options["-l"] + "\" inPassword=\"" + options["-p"] + "\" />") + res = send_command(options, "<aaaLogin inName=\"" + options["-l"] + "\" inPassword=\"" + options["-p"] + "\" />", int(options["-y"])) result = re_cookie.search(res) if (result == None): ## Cookie is absenting in response @@ -137,7 +137,7 @@ used with Cisco UCS to fence machines." result = fence_action(None, options, set_power_status, get_power_status, get_list) ### Logout; we do not care about result as we will end in any case - send_command(options, "<aaaLogout inCookie=\"" + options["cookie"] + "\" />") + send_command(options, "<aaaLogout inCookie=\"" + options["cookie"] + "\" />", int(options["-Y"])) sys.exit(result)

1 0

fence-agents: master - fence-agents: Extend set of default device options
by Marek Grác 29 Oct '12

29 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=62004c33… Commit: 62004c338202dfadfa4b8f2cefd959867c9afa74 Parent: 8bb87b1704ddb923228d3306380250a0908a8877 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Mon Oct 22 15:35:57 2012 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Mon Oct 29 12:23:39 2012 +0100 fence-agents: Extend set of default device options There are device options which are common for every fence agent. This feature was introduced before but only new features were added. This patch removes common features from individual fence agents and adds it to the common set in fencing library. --- fence/agents/alom/fence_alom.py | 6 ++---- fence/agents/apc/fence_apc.py | 6 ++---- fence/agents/apc_snmp/fence_apc_snmp.py | 6 ++---- fence/agents/bladecenter/fence_bladecenter.py | 6 ++---- fence/agents/cisco_mds/fence_cisco_mds.py | 6 ++---- fence/agents/cisco_ucs/fence_cisco_ucs.py | 6 ++---- fence/agents/drac5/fence_drac5.py | 6 ++---- fence/agents/eaton_snmp/fence_eaton_snmp.py | 6 ++---- fence/agents/eps/fence_eps.py | 6 ++---- fence/agents/hpblade/fence_hpblade.py | 6 ++---- fence/agents/ibmblade/fence_ibmblade.py | 6 ++---- fence/agents/ifmib/fence_ifmib.py | 6 ++---- fence/agents/ilo/fence_ilo.py | 6 ++---- fence/agents/ilo_mp/fence_ilo_mp.py | 6 ++---- fence/agents/intelmodular/fence_intelmodular.py | 6 ++---- fence/agents/ipdu/fence_ipdu.py | 6 ++---- fence/agents/ldom/fence_ldom.py | 6 ++---- fence/agents/lib/fencing.py.py | 3 ++- fence/agents/lpar/fence_lpar.py | 8 +++----- fence/agents/rhevm/fence_rhevm.py | 7 ++----- fence/agents/rsa/fence_rsa.py | 6 ++---- fence/agents/rsb/fence_rsb.py | 6 ++---- fence/agents/sanbox2/fence_sanbox2.py | 6 ++---- fence/agents/virsh/fence_virsh.py | 6 ++---- fence/agents/vmware/fence_vmware.py | 6 ++---- fence/agents/vmware_soap/fence_vmware_soap.py | 6 ++---- fence/agents/wti/fence_wti.py | 6 ++---- fence/agents/xenapi/fence_xenapi.py | 6 ++---- 28 files changed, 57 insertions(+), 111 deletions(-) diff --git a/fence/agents/alom/fence_alom.py b/fence/agents/alom/fence_alom.py index a964be5..6d62d73 100644 --- a/fence/agents/alom/fence_alom.py +++ b/fence/agents/alom/fence_alom.py @@ -43,10 +43,8 @@ def set_power_status(conn, options): fail(EC_TIMED_OUT) def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", - "secure", "identity_file", "test", "inet4_only", "inet6_only", "ipport", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "secure", + "identity_file", "test", "inet4_only", "inet6_only", "ipport" ] atexit.register(atexit_handler) diff --git a/fence/agents/apc/fence_apc.py b/fence/agents/apc/fence_apc.py index 61463d0..46f8b84 100644 --- a/fence/agents/apc/fence_apc.py +++ b/fence/agents/apc/fence_apc.py @@ -182,11 +182,9 @@ def set_power_status(conn, options): fail(EC_TIMED_OUT) def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "secure", "port", "identity_file", "switch", "test", "separator", - "inet4_only", "inet6_only", "ipport", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + "inet4_only", "inet6_only", "ipport" ] atexit.register(atexit_handler) diff --git a/fence/agents/apc_snmp/fence_apc_snmp.py b/fence/agents/apc_snmp/fence_apc_snmp.py index 71e978e..660eaf7 100644 --- a/fence/agents/apc_snmp/fence_apc_snmp.py +++ b/fence/agents/apc_snmp/fence_apc_snmp.py @@ -164,13 +164,11 @@ def apc_snmp_define_defaults(): # Main agent method def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "test", "port", "separator", "no_login", "no_password", "snmp_version", "community", "snmp_auth_prot", "snmp_sec_level", "snmp_priv_prot", "snmp_priv_passwd", "snmp_priv_passwd_script", - "udpport","inet4_only","inet6_only", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + "udpport","inet4_only","inet6_only" ] atexit.register(atexit_handler) diff --git a/fence/agents/bladecenter/fence_bladecenter.py b/fence/agents/bladecenter/fence_bladecenter.py index 958ceb0..ab06b27 100644 --- a/fence/agents/bladecenter/fence_bladecenter.py +++ b/fence/agents/bladecenter/fence_bladecenter.py @@ -98,11 +98,9 @@ def get_blades_list(conn, options): return outlets def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "cmd_prompt", "secure", "port", "identity_file", "separator", - "inet4_only", "inet6_only", "ipport", - "power_timeout", "shell_timeout", "login_timeout", "power_wait", "missing_as_off" ] + "inet4_only", "inet6_only", "ipport", "missing_as_off" ] atexit.register(atexit_handler) diff --git a/fence/agents/cisco_mds/fence_cisco_mds.py b/fence/agents/cisco_mds/fence_cisco_mds.py index d20efe4..a007fde 100644 --- a/fence/agents/cisco_mds/fence_cisco_mds.py +++ b/fence/agents/cisco_mds/fence_cisco_mds.py @@ -81,13 +81,11 @@ def get_outlets_status(conn, options): def main(): global port_oid - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "test", "port", "separator", "no_login", "no_password", "snmp_version", "community", "snmp_auth_prot", "snmp_sec_level", "snmp_priv_prot", "snmp_priv_passwd", "snmp_priv_passwd_script", - "udpport","inet4_only","inet6_only", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + "udpport", "inet4_only", "inet6_only" ] atexit.register(atexit_handler) diff --git a/fence/agents/cisco_ucs/fence_cisco_ucs.py b/fence/agents/cisco_ucs/fence_cisco_ucs.py index eda6aed..8020d96 100644 --- a/fence/agents/cisco_ucs/fence_cisco_ucs.py +++ b/fence/agents/cisco_ucs/fence_cisco_ucs.py @@ -99,11 +99,9 @@ def send_command(opt, command): return result def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "ssl", "inet4_only", "inet6_only", "ipport", "port", - "web", "separator", "power_wait", "power_timeout", - "shell_timeout", "suborg" ] + "web", "separator", "suborg" ] atexit.register(atexit_handler) diff --git a/fence/agents/drac5/fence_drac5.py b/fence/agents/drac5/fence_drac5.py index 3e9a8d2..755f2b4 100644 --- a/fence/agents/drac5/fence_drac5.py +++ b/fence/agents/drac5/fence_drac5.py @@ -85,11 +85,9 @@ def get_list_devices(conn, options): return outlets def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "cmd_prompt", "secure", "identity_file", "drac_version", "module_name", - "separator", "inet4_only", "inet6_only", "ipport", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + "separator", "inet4_only", "inet6_only", "ipport" ] atexit.register(atexit_handler) diff --git a/fence/agents/eaton_snmp/fence_eaton_snmp.py b/fence/agents/eaton_snmp/fence_eaton_snmp.py index 5b54b79..2c0b54e 100644 --- a/fence/agents/eaton_snmp/fence_eaton_snmp.py +++ b/fence/agents/eaton_snmp/fence_eaton_snmp.py @@ -204,13 +204,11 @@ def eaton_snmp_define_defaults(): # Main agent method def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "test", "port", "separator", "no_login", "no_password", "snmp_version", "community", "snmp_auth_prot", "snmp_sec_level", "snmp_priv_prot", "snmp_priv_passwd", "snmp_priv_passwd_script", - "udpport","inet4_only","inet6_only", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + "udpport", "inet4_only", "inet6_only" ] atexit.register(atexit_handler) diff --git a/fence/agents/eps/fence_eps.py b/fence/agents/eps/fence_eps.py index 21530e6..106fd1c 100644 --- a/fence/agents/eps/fence_eps.py +++ b/fence/agents/eps/fence_eps.py @@ -98,10 +98,8 @@ def eps_define_new_opts(): # Starting point of fence agent def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", - "test", "port", "hidden_page", "no_login", "no_password", - "separator" ] + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "test", + "port", "hidden_page", "no_login", "no_password", "separator" ] atexit.register(atexit_handler) diff --git a/fence/agents/hpblade/fence_hpblade.py b/fence/agents/hpblade/fence_hpblade.py index b4e9f1b..4e125c1 100644 --- a/fence/agents/hpblade/fence_hpblade.py +++ b/fence/agents/hpblade/fence_hpblade.py @@ -71,11 +71,9 @@ def get_blades_list(conn, options): return outlets def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "cmd_prompt", "secure", "port", "identity_file", "separator", - "inet4_only", "inet6_only", "ipport", "missing_as_off", - "power_timeout", "shell_timeout", "login_timeout", "power_wait"] + "inet4_only", "inet6_only", "ipport", "missing_as_off" ] atexit.register(atexit_handler) diff --git a/fence/agents/ibmblade/fence_ibmblade.py b/fence/agents/ibmblade/fence_ibmblade.py index 323a4ad..96d2a76 100644 --- a/fence/agents/ibmblade/fence_ibmblade.py +++ b/fence/agents/ibmblade/fence_ibmblade.py @@ -56,13 +56,11 @@ def ibmblade_define_defaults(): def main(): global port_oid - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "test", "port", "separator", "no_login", "no_password", "snmp_version", "community", "snmp_auth_prot", "snmp_sec_level", "snmp_priv_prot", "snmp_priv_passwd", "snmp_priv_passwd_script", - "udpport","inet4_only","inet6_only", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + "udpport", "inet4_only", "inet6_only" ] atexit.register(atexit_handler) diff --git a/fence/agents/ifmib/fence_ifmib.py b/fence/agents/ifmib/fence_ifmib.py index 2914301..bbbec22 100644 --- a/fence/agents/ifmib/fence_ifmib.py +++ b/fence/agents/ifmib/fence_ifmib.py @@ -101,13 +101,11 @@ def ifmib_define_defaults(): def main(): global port_oid - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "test", "port", "separator", "no_login", "no_password", "snmp_version", "community", "snmp_auth_prot", "snmp_sec_level", "snmp_priv_prot", "snmp_priv_passwd", "snmp_priv_passwd_script", - "udpport","inet4_only","inet6_only", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + "udpport", "inet4_only", "inet6_only" ] atexit.register(atexit_handler) diff --git a/fence/agents/ilo/fence_ilo.py b/fence/agents/ilo/fence_ilo.py index d4e34df..4c8f7ca 100644 --- a/fence/agents/ilo/fence_ilo.py +++ b/fence/agents/ilo/fence_ilo.py @@ -58,10 +58,8 @@ def set_power_status(conn, options): return def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", - "ssl", "ribcl", "inet4_only", "inet6_only", "ipport", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", + "ssl", "ribcl", "inet4_only", "inet6_only", "ipport" ] atexit.register(atexit_handler) diff --git a/fence/agents/ilo_mp/fence_ilo_mp.py b/fence/agents/ilo_mp/fence_ilo_mp.py index 3af3048..9ac8701 100644 --- a/fence/agents/ilo_mp/fence_ilo_mp.py +++ b/fence/agents/ilo_mp/fence_ilo_mp.py @@ -44,11 +44,9 @@ def set_power_status(conn, options): fail(EC_TIMED_OUT) def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "secure", "identity_file", "cmd_prompt", "ipport", - "separator", "inet4_only", "inet6_only", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + "separator", "inet4_only", "inet6_only" ] atexit.register(atexit_handler) diff --git a/fence/agents/intelmodular/fence_intelmodular.py b/fence/agents/intelmodular/fence_intelmodular.py index 11ff9bc..52dd27f 100644 --- a/fence/agents/intelmodular/fence_intelmodular.py +++ b/fence/agents/intelmodular/fence_intelmodular.py @@ -63,13 +63,11 @@ def get_outlets_status(conn, options): def main(): global port_oid - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "test", "port", "separator", "no_login", "no_password", "snmp_version", "community", "snmp_auth_prot", "snmp_sec_level", "snmp_priv_prot", "snmp_priv_passwd", "snmp_priv_passwd_script", - "udpport","inet4_only","inet6_only", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + "udpport", "inet4_only", "inet6_only" ] atexit.register(atexit_handler) diff --git a/fence/agents/ipdu/fence_ipdu.py b/fence/agents/ipdu/fence_ipdu.py index aac0b7d..2749e44 100644 --- a/fence/agents/ipdu/fence_ipdu.py +++ b/fence/agents/ipdu/fence_ipdu.py @@ -138,13 +138,11 @@ def ipdu_snmp_define_defaults(): # Main agent method def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "test", "port", "separator", "no_login", "no_password", "snmp_version", "community", "snmp_auth_prot", "snmp_sec_level", "snmp_priv_prot", "snmp_priv_passwd", "snmp_priv_passwd_script", - "udpport","inet4_only","inet6_only", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + "udpport", "inet4_only", "inet6_only" ] atexit.register(atexit_handler) diff --git a/fence/agents/ldom/fence_ldom.py b/fence/agents/ldom/fence_ldom.py index c971c04..d106255 100644 --- a/fence/agents/ldom/fence_ldom.py +++ b/fence/agents/ldom/fence_ldom.py @@ -81,11 +81,9 @@ def set_power_status(conn, options): fail(EC_TIMED_OUT) def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "secure", "identity_file", "test" , "port", "cmd_prompt", - "separator", "inet4_only", "inet6_only", "ipport", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + "separator", "inet4_only", "inet6_only", "ipport" ] atexit.register(atexit_handler) diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index 2cc6e7b..e26f9b3 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -407,7 +407,8 @@ all_opt = { "order" : 205} } -common_opt = [ "retry_on", "delay" ] +common_opt = [ "help", "debug", "verbose", "quiet", "version", "action", "agent", + "power_timeout", "shell_timeout", "login_timeout", "power_wait", "retry_on", "delay" ] class fspawn(pexpect.spawn): def __init__(self, options, command): diff --git a/fence/agents/lpar/fence_lpar.py b/fence/agents/lpar/fence_lpar.py index 00ea66c..b9121e4 100644 --- a/fence/agents/lpar/fence_lpar.py +++ b/fence/agents/lpar/fence_lpar.py @@ -130,11 +130,9 @@ def get_lpar_list(conn, options): return outlets def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", - "secure", "identity_file", "partition", "managed", "hmc_version", "cmd_prompt", - "separator", "inet4_only", "inet6_only", "ipport", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "secure", + "identity_file", "partition", "managed", "hmc_version", "cmd_prompt", + "separator", "inet4_only", "inet6_only", "ipport" ] atexit.register(atexit_handler) diff --git a/fence/agents/rhevm/fence_rhevm.py b/fence/agents/rhevm/fence_rhevm.py index 4310dd0..9bb9581 100644 --- a/fence/agents/rhevm/fence_rhevm.py +++ b/fence/agents/rhevm/fence_rhevm.py @@ -116,11 +116,8 @@ def send_command(opt, command, method = "GET"): return result def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", - "ssl", "inet4_only", "inet6_only", "ipport", "port", - "web", "separator", "power_wait", "power_timeout", - "shell_timeout" ] + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "ssl", + "inet4_only", "inet6_only", "ipport", "port", "web", "separator" ] atexit.register(atexit_handler) diff --git a/fence/agents/rsa/fence_rsa.py b/fence/agents/rsa/fence_rsa.py index e9f87cd..3ba2c80 100644 --- a/fence/agents/rsa/fence_rsa.py +++ b/fence/agents/rsa/fence_rsa.py @@ -44,10 +44,8 @@ def set_power_status(conn, options): fail(EC_TIMED_OUT) def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", - "cmd_prompt", "secure", "identity_file", "ipport", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", + "cmd_prompt", "secure", "identity_file", "ipport" ] atexit.register(atexit_handler) diff --git a/fence/agents/rsb/fence_rsb.py b/fence/agents/rsb/fence_rsb.py index 7ce1906..bc3df9a 100755 --- a/fence/agents/rsb/fence_rsb.py +++ b/fence/agents/rsb/fence_rsb.py @@ -47,11 +47,9 @@ def set_power_status(conn, options): fail(EC_TIMED_OUT) def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "secure", "identity_file", "separator", "cmd_prompt", - "inet4_only", "inet6_only", "ipport", "telnet_port", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + "inet4_only", "inet6_only", "ipport", "telnet_port" ] atexit.register(atexit_handler) all_opt["telnet_port"] = { diff --git a/fence/agents/sanbox2/fence_sanbox2.py b/fence/agents/sanbox2/fence_sanbox2.py index 92c5d4a..8c67ac2 100644 --- a/fence/agents/sanbox2/fence_sanbox2.py +++ b/fence/agents/sanbox2/fence_sanbox2.py @@ -108,10 +108,8 @@ def get_list_devices(conn, options): return outlets def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "io_fencing", "ipaddr", "login", "passwd", "passwd_script", - "cmd_prompt", "port", "ipport", "separator", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + device_opt = [ "io_fencing", "ipaddr", "login", "passwd", "passwd_script", + "cmd_prompt", "port", "ipport", "separator" ] atexit.register(atexit_handler) diff --git a/fence/agents/virsh/fence_virsh.py b/fence/agents/virsh/fence_virsh.py index 4859d7d..6e6a43d 100644 --- a/fence/agents/virsh/fence_virsh.py +++ b/fence/agents/virsh/fence_virsh.py @@ -71,11 +71,9 @@ def set_power_status(conn, options): fail(EC_TIMED_OUT) def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "secure", "identity_file", "test", "port", "separator", - "inet4_only", "inet6_only", "ipport", "sudo", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + "inet4_only", "inet6_only", "ipport", "sudo" ] atexit.register(atexit_handler) diff --git a/fence/agents/vmware/fence_vmware.py b/fence/agents/vmware/fence_vmware.py index 99e5ca9..0b81d1d 100644 --- a/fence/agents/vmware/fence_vmware.py +++ b/fence/agents/vmware/fence_vmware.py @@ -284,11 +284,9 @@ def vmware_check_vmware_type(options): # Main agent method def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "test", "port", "separator", "exec", "vmware_type", - "vmware_datacenter", "secure", "identity_file", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + "vmware_datacenter", "secure", "identity_file" ] atexit.register(atexit_handler) diff --git a/fence/agents/vmware_soap/fence_vmware_soap.py b/fence/agents/vmware_soap/fence_vmware_soap.py index 0da7f0d..21dad66 100644 --- a/fence/agents/vmware_soap/fence_vmware_soap.py +++ b/fence/agents/vmware_soap/fence_vmware_soap.py @@ -158,10 +158,8 @@ def set_power_status(conn, options): conn.service.PowerOffVM_Task(mo_machine) def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", - "ssl", "port", "uuid", "separator", "ipport", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", + "ssl", "port", "uuid", "separator", "ipport" ] atexit.register(atexit_handler) diff --git a/fence/agents/wti/fence_wti.py b/fence/agents/wti/fence_wti.py index b7c41f3..f013953 100644 --- a/fence/agents/wti/fence_wti.py +++ b/fence/agents/wti/fence_wti.py @@ -90,11 +90,9 @@ def set_power_status(conn, options): fail(EC_TIMED_OUT) def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "cmd_prompt", "secure", "identity_file", "port", "no_login", "no_password", - "test", "separator", "inet4_only", "inet6_only", "ipport", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + "test", "separator", "inet4_only", "inet6_only", "ipport" ] atexit.register(atexit_handler) diff --git a/fence/agents/xenapi/fence_xenapi.py b/fence/agents/xenapi/fence_xenapi.py index cae53e6..0b07ed6 100644 --- a/fence/agents/xenapi/fence_xenapi.py +++ b/fence/agents/xenapi/fence_xenapi.py @@ -199,10 +199,8 @@ def return_vm_reference(session, options): def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", "action", - "login", "passwd", "passwd_script", "port", "test", "separator", - "no_login", "no_password", "power_timeout", "shell_timeout", - "login_timeout", "power_wait", "session_url", "uuid" ] + device_opt = [ "login", "passwd", "passwd_script", "port", "test", "separator", + "no_login", "no_password", "session_url", "uuid" ] atexit.register(atexit_handler)

1 0

fence-agents: master - fence_na: Add support for XML metadata output
by Marek Grác 25 Oct '12

25 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=8bb87b17… Commit: 8bb87b1704ddb923228d3306380250a0908a8877 Parent: dd0e31de6cd4dd6926effaee8824eccc79bbf2a1 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Thu Oct 18 11:35:15 2012 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Thu Oct 25 10:35:51 2012 +0200 fence_na: Add support for XML metadata output Adding a skelet for XML metadata output so fence_na can be used with corosync. Resolves: rhbz#864028 --- fence/agents/node_assassin/fence_na.lib.in | 57 ++++++++++++++++++++++++++++ fence/agents/node_assassin/fence_na.pl | 6 +++ 2 files changed, 63 insertions(+), 0 deletions(-) diff --git a/fence/agents/node_assassin/fence_na.lib.in b/fence/agents/node_assassin/fence_na.lib.in index 67d5367..dec734a 100644 --- a/fence/agents/node_assassin/fence_na.lib.in +++ b/fence/agents/node_assassin/fence_na.lib.in @@ -918,4 +918,61 @@ sub _make_hash_reference _add_hash_reference($href, $_href); } +sub show_metadata +{ + print <<METADATA; +<?xml version="1.0" ?> +<resource-agent name="fence_na.py" shortdesc="Fence agent for Node Assassin over telnet" > +<longdesc>fence_na is an I/O Fencing agent which can be used with the Node Assassin network power switch. It logs into device via telnet and reboots a specified outlet. Lengthy telnet/ssh connections should be avoided while a GFS cluster is running because the connection will block any necessary fencing actions.</longdesc> +<vendor-url>http://www.altavee.ca/w/Node_Assassin_v1.1.4</vendor-url> +<parameters> + <parameter name="action" unique="0" required="1"> + <getopt mixed="-o <action>" /> + <content type="string" default="reboot" /> + <shortdesc lang="en">Fencing Action</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="1"> + <getopt mixed="-a <ip>" /> + <content type="string" /> + <shortdesc lang="en">IP Address or Hostname</shortdesc> + </parameter> + <parameter name="login" unique="0" required="1"> + <getopt mixed="-l <name>" /> + <content type="string" /> + <shortdesc lang="en">Login Name</shortdesc> + </parameter> + <parameter name="passwd" unique="0" required="0"> + <getopt mixed="-p <password>" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="port" unique="0" required="1"> + <getopt mixed="-n;" /> + <content type="string" /> + <shortdesc lang="en">Physical plug number</shortdesc> + </parameter> + <parameter name="version" unique="0" required="0"> + <getopt mixed="-V" /> + <content type="boolean" /> + <shortdesc lang="en">Display version information and exit</shortdesc> + </parameter> + <parameter name="help" unique="0" required="0"> + <getopt mixed="-h" /> + <content type="boolean" /> + <shortdesc lang="en">Display help and exit</shortdesc> + </parameter> +</parameters> +<actions> + <action name="on" /> + <action name="off" /> + <action name="reboot" /> + <action name="status" /> + <action name="list" /> + <action name="monitor" /> + <action name="metadata" /> +</actions> +</resource-agent> +METADATA +} + 1; diff --git a/fence/agents/node_assassin/fence_na.pl b/fence/agents/node_assassin/fence_na.pl index bc7fb00..bdcaf69 100644 --- a/fence/agents/node_assassin/fence_na.pl +++ b/fence/agents/node_assassin/fence_na.pl @@ -106,6 +106,12 @@ foreach my $i (1..$conf->{'system'}{na_num}) } die "Exiting on errors.\n" if $bad; + +if ($conf->{na}{action} eq "metadata") { + show_metadata(); + do_exit($conf, $log, 0); +} + my @ny=("no", "yes"); record($conf, $log, "Node Assassin: . [$conf->{na}{ipaddr}].\n"); record($conf, $log, "TCP Port: ...... [$conf->{na}{tcp_port}].\n");

1 0

cluster: RHEL6 - fenced: get the cman fd before each poll
by David Teigland 24 Oct '12

24 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=1b420aa98fce7… Commit: 1b420aa98fce71f123480dd4eae31e0eb466e864 Parent: 13dcbb8265eafcdf69c033f45f2a37aa44b18908 Author: Christine Caulfield <ccaulfie(a)redhat.com> AuthorDate: Wed Oct 24 14:55:00 2012 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed Oct 24 14:55:00 2012 -0500 fenced: get the cman fd before each poll Prevent rare but possible spinning in poll on the cman fd. bz 857952 Signed-off-by: Christine Caulfield <ccaulfie(a)redhat.com> --- fence/fenced/fd.h | 1 + fence/fenced/main.c | 5 ++++- fence/fenced/member_cman.c | 5 +++++ 3 files changed, 10 insertions(+), 1 deletions(-) diff --git a/fence/fenced/fd.h b/fence/fenced/fd.h index 0be3332..205836c 100644 --- a/fence/fenced/fd.h +++ b/fence/fenced/fd.h @@ -270,6 +270,7 @@ int name_to_nodeid(char *name); struct node *get_new_node(struct fd *fd, int nodeid); void kick_node_from_cluster(int nodeid); void set_cman_dirty(void); +int get_cman_fd(void); /* recover.c */ diff --git a/fence/fenced/main.c b/fence/fenced/main.c index 827dab6..8e4f10b 100644 --- a/fence/fenced/main.c +++ b/fence/fenced/main.c @@ -739,6 +739,7 @@ void cluster_dead(int ci) static void loop(void) { int rv, i; + int cman_fd_pos; void (*workfn) (int ci); void (*deadfn) (int ci); @@ -754,7 +755,7 @@ static void loop(void) rv = setup_cluster(); if (rv < 0) goto out; - client_add(rv, process_cluster, cluster_dead); + cman_fd_pos = client_add(rv, process_cluster, cluster_dead); rv = setup_ccs(); if (rv < 0) @@ -804,6 +805,8 @@ static void loop(void) } for (;;) { + /* We need to re-get the cman FD each time */ + pollfd[cman_fd_pos].fd = get_cman_fd(); rv = poll(pollfd, client_maxi + 1, -1); if (rv == -1 && errno == EINTR) { if (daemon_quit && list_empty(&domains)) diff --git a/fence/fenced/member_cman.c b/fence/fenced/member_cman.c index ee879be..a7f4341 100644 --- a/fence/fenced/member_cman.c +++ b/fence/fenced/member_cman.c @@ -12,6 +12,11 @@ static int old_node_count; static cman_node_t cman_nodes[MAX_NODES]; static int cman_node_count; +int get_cman_fd(void) +{ + return cman_get_fd(ch); +} + void set_cman_dirty(void) { int rv;

1 0

cluster: STABLE32 - fenced: fix potential tight loop reading /dev/zero
by Christine Caulfield 23 Oct '12

23 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=4118eaa46e9d2… Commit: 4118eaa46e9d2c61c59178dfe17df33d683669f9 Parent: db3b4f9b78de7f90e2e19c590b14e5f3ec57333e Author: Christine Caulfield <ccaulfie(a)redhat.com> AuthorDate: Tue Oct 23 15:22:31 2012 +0100 Committer: Christine Caulfield <ccaulfie(a)redhat.com> CommitterDate: Tue Oct 23 15:22:31 2012 +0100 fenced: fix potential tight loop reading /dev/zero The FD returned from cman is not meant to be stored anywhere - this is documented in the header file (which is the official source of documentation for the API). Under some circumstances cman can return the FD for /dev/zero (which is always active) and if the client application stores i this instead of the one it expects then it will loop forever. It's probably VERY hard to reproduce this, there would need to be some data coming from cman quite soon after startup for it to happen, though it has been seen. See rhbz#856214 Signed-off-by: Christine Caulfield <ccaulfie(a)redhat.com> --- fence/fenced/fd.h | 1 + fence/fenced/main.c | 5 ++++- fence/fenced/member_cman.c | 5 +++++ 3 files changed, 10 insertions(+), 1 deletions(-) diff --git a/fence/fenced/fd.h b/fence/fenced/fd.h index 0be3332..8423d9d 100644 --- a/fence/fenced/fd.h +++ b/fence/fenced/fd.h @@ -270,6 +270,7 @@ int name_to_nodeid(char *name); struct node *get_new_node(struct fd *fd, int nodeid); void kick_node_from_cluster(int nodeid); void set_cman_dirty(void); +int get_member_fd(void); /* recover.c */ diff --git a/fence/fenced/main.c b/fence/fenced/main.c index 2339a5d..c7f6269 100644 --- a/fence/fenced/main.c +++ b/fence/fenced/main.c @@ -739,6 +739,7 @@ void cluster_dead(int ci) static void loop(void) { int rv, i; + int cluster_fd_pos; void (*workfn) (int ci); void (*deadfn) (int ci); @@ -751,7 +752,7 @@ static void loop(void) goto out; client_add(rv, process_listener, NULL); - rv = setup_cluster(); + rv = cluster_fd_pos = setup_cluster(); if (rv < 0) goto out; client_add(rv, process_cluster, cluster_dead); @@ -804,6 +805,8 @@ static void loop(void) } for (;;) { + /* We need to re-get the cluster FD each time */ + pollfd[cluster_fd_pos].fd = get_member_fd(); rv = poll(pollfd, client_maxi + 1, -1); if (rv == -1 && errno == EINTR) { if (daemon_quit && list_empty(&domains)) diff --git a/fence/fenced/member_cman.c b/fence/fenced/member_cman.c index ee879be..061136e 100644 --- a/fence/fenced/member_cman.c +++ b/fence/fenced/member_cman.c @@ -375,6 +375,11 @@ void close_cluster(void) cman_finish(ch_admin); } +int get_member_fd() +{ + return cman_get_fd(ch); +} + struct node *get_new_node(struct fd *fd, int nodeid) { cman_node_t cn;

1 0

gfs2-utils: master - libgfs2: Add a gfs2 block query language
by Andrew Price 15 Oct '12

15 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=ad15965a94… Commit: ad15965a9449e68dc83aa21190262c493089f05d Parent: 24fad71d36ecce70a5d0d4206d0b13e7b77ec94c Author: Andrew Price <anprice(a)redhat.com> AuthorDate: Fri Oct 12 18:25:41 2012 +0100 Committer: Andrew Price <anprice(a)redhat.com> CommitterDate: Mon Oct 15 15:26:33 2012 +0100 libgfs2: Add a gfs2 block query language This patch adds a small language which we can use to write libgfs2 and gfs2-utils tests (among other things). It provides 'get' and 'set' statements which look up and modify gfs2 blocks. The language API is defined as: struct lgfs2_lang_state; struct lgfs2_lang_result { uint64_t lr_blocknr; struct gfs2_buffer_head *lr_bh; const struct lgfs2_metadata *lr_mtype; int lr_state; // GFS2_BLKST_* }; struct lgfs2_lang_state *lgfs2_lang_init(void); void lgfs2_lang_free(struct lgfs2_lang_state **state); int lgfs2_lang_parsef(struct lgfs2_lang_state *state, FILE *script); int lgfs2_lang_parses(struct lgfs2_lang_state *state, const char *script); struct lgfs2_lang_result *lgfs2_lang_result_next(struct lgfs2_lang_state *state, struct gfs2_sbd *sbd); int lgfs2_lang_result_print(struct lgfs2_lang_result *result); void lgfs2_lang_result_free(struct lgfs2_lang_result **result); The lgfs2_lang_parse{s,f} functions allow you to parse a string or a file respectively. Using the same state object you can then run the same script multiple times, without parsing it again. The intended usage of these functions can be shown with a simple example (error checking omitted): struct lgfs2_lang_state *state = lgfs2_lang_init(); lgfs2_lang_parses(state, "get sb; get 1234 state; set '/foo/bar' {di_entries: 3}"); for (result = lgfs2_lang_result_next(state, &sbd); result != NULL; result = lgfs2_lang_result_next(state, &sbd)) { lgfs2_lang_result_print(result); lgfs2_lang_result_free(&result); } lgfs2_lang_free(&state); The language has a simple syntax: get <block_lookup> [state] set <block_lookup> {<field0>:<value0>, <field1>:<value1>, ... } A block lookup can be a file system block address (1234 or 0x1234), a resource group subscript (rgrp[0], rgrp[0x5]), a keyword (sb, master, root, rindex) or an offset from any of the above (1234+5, rgrp[1]+23, rindex+68, ...). After the block lookup, the 'get' statement takes an optional keyword 'state' which allows you to query the bitmap state of the block. Examples of 'get': get rgrp[1]+23 state --> result.lr_state == GFS2_BLKST_FREE get rindex --> result.lr_bh is a buffer containing the rindex dinode. --> result.lr_mtype is the block's metatype as defined in meta.c. The 'set' statement requires a list of field-value pairs which are to be modified in the block. The field names must match the names shown when running the 'get' statement with the same block lookup. Examples of 'set': set '/foo/bar/baz' { di_entries: 3 } --> result.lr_bh contains the dinode block at path /foo/bar/baz, with the di_entries field modified. --> result.lr_mtype is the block's metatype as defined in meta.c. set sb { sb_lockproto: 'lock_dlm', sb_bsize: 0x1000 } --> result.lr_bh contains the superblock with the lockproto changed to lock_dlm and the block size changed to 4096. --> result.lr_mtype is the block's metatype as defined in meta.c. Whitespace is insignificant in the language and semicolons can be used to separate multiple statements. When writing longer scripts spanning multiple lines, C-like // syntax can be used to insert comments. Signed-off-by: Andrew Price <anprice(a)redhat.com> --- .gitignore | 7 + configure.ac | 2 + gfs2/libgfs2/Makefile.am | 13 +- gfs2/libgfs2/buf.c | 10 + gfs2/libgfs2/fs_ops.c | 6 +- gfs2/libgfs2/lang.c | 603 ++++++++++++++++++++++++++++++++++++++++++++++ gfs2/libgfs2/lang.h | 61 +++++ gfs2/libgfs2/lexer.l | 101 ++++++++ gfs2/libgfs2/libgfs2.h | 24 ++ gfs2/libgfs2/meta.c | 50 ++++ gfs2/libgfs2/misc.c | 2 - gfs2/libgfs2/parser.y | 186 ++++++++++++++ gfs2/libgfs2/super.c | 2 +- 13 files changed, 1057 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index e8b7ea1..4e3071a 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,9 @@ make/stamp-h1 m4 make/clusterautoconfig.h* missing +ylwrap +cscope.out +.gdb_history *.pc .deps .libs @@ -29,6 +32,10 @@ missing *.lo gfs2/convert/gfs2_convert gfs2/edit/gfs2_edit +gfs2/libgfs2/parser.c +gfs2/libgfs2/parser.h +gfs2/libgfs2/lexer.c +gfs2/libgfs2/lexer.h gfs2/fsck/fsck.gfs2 gfs2/mkfs/mkfs.gfs2 gfs2/mount/mount.gfs2 diff --git a/configure.ac b/configure.ac index d56cfac..ef09569 100644 --- a/configure.ac +++ b/configure.ac @@ -56,6 +56,8 @@ AM_PROG_CC_C_O AC_PROG_LN_S AC_PROG_INSTALL AC_PROG_MAKE_SET +AC_PROG_LEX +AC_PROG_YACC ## local helper functions diff --git a/gfs2/libgfs2/Makefile.am b/gfs2/libgfs2/Makefile.am index 4e60b0a..7103e09 100644 --- a/gfs2/libgfs2/Makefile.am +++ b/gfs2/libgfs2/Makefile.am @@ -1,15 +1,24 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_HEADERS = libgfs2.h +CLEANFILES = parser.h parser.c lexer.c lexer.h +BUILT_SOURCES = parser.h lexer.h +AM_LFLAGS = --header-file=lexer.h +AM_YFLAGS = -d + +noinst_HEADERS = libgfs2.h lang.h noinst_LTLIBRARIES = libgfs2.la libgfs2_la_SOURCES = block_list.c fs_bits.c gfs1.c misc.c rgrp.c super.c \ buf.c fs_geometry.c gfs2_disk_hash.c ondisk.c \ device_geometry.c fs_ops.c gfs2_log.c recovery.c \ - structures.c meta.c + structures.c meta.c lang.c parser.y lexer.l libgfs2_la_CPPFLAGS = -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE \ -D_GNU_SOURCE \ -I$(top_srcdir)/gfs2/include + +# Autotools can't handle header files output by flex so we have to generate it manually +lexer.h: lexer.l + $(LEX) -o lexer.c $(AM_LFLAGS) $^ diff --git a/gfs2/libgfs2/buf.c b/gfs2/libgfs2/buf.c index 956dd8b..5bc1a4e 100644 --- a/gfs2/libgfs2/buf.c +++ b/gfs2/libgfs2/buf.c @@ -83,3 +83,13 @@ int brelse(struct gfs2_buffer_head *bh) free(bh); return error; } + +uint32_t lgfs2_get_block_type(const struct gfs2_buffer_head *lbh) +{ + const struct gfs2_meta_header *mh = lbh->iov.iov_base; + + if (be32_to_cpu(mh->mh_magic) == GFS2_MAGIC) + return be32_to_cpu(mh->mh_type); + + return 0; +} diff --git a/gfs2/libgfs2/fs_ops.c b/gfs2/libgfs2/fs_ops.c index ec150e8..3d027e8 100644 --- a/gfs2/libgfs2/fs_ops.c +++ b/gfs2/libgfs2/fs_ops.c @@ -1759,11 +1759,7 @@ int gfs2_lookupi(struct gfs2_inode *dip, const char *filename, int len, return 0; } error = dir_search(dip, filename, len, NULL, &inum); - if (error) { - if (error == -ENOENT) - return 0; - } - else + if (!error) *ipp = lgfs2_inode_read(sdp, inum.no_addr); return error; diff --git a/gfs2/libgfs2/lang.c b/gfs2/libgfs2/lang.c new file mode 100644 index 0000000..12ca7bd --- /dev/null +++ b/gfs2/libgfs2/lang.c @@ -0,0 +1,603 @@ +#include <stdint.h> +#include <string.h> +#include <stdlib.h> +#include <stdio.h> +#include <sys/queue.h> +#include <errno.h> +#include <limits.h> +#include <ctype.h> + +#include "parser.h" +#include "lang.h" + +const char* ast_type_string[] = { + [AST_NONE] = "NONE", + // Statements + [AST_ST_SET] = "SET", + [AST_ST_GET] = "GET", + + // Expressions + [AST_EX_ID] = "IDENTIFIER", + [AST_EX_NUMBER] = "NUMBER", + [AST_EX_STRING] = "STRING", + [AST_EX_ADDRESS] = "ADDRESS", + [AST_EX_PATH] = "PATH", + [AST_EX_SUBSCRIPT] = "SUBSCRIPT", + [AST_EX_OFFSET] = "OFFSET", + [AST_EX_BLOCKSPEC] = "BLOCKSPEC", + [AST_EX_STRUCTSPEC] = "STRUCTSPEC", + [AST_EX_FIELDSPEC] = "FIELDSPEC", + + // Keywords + [AST_KW_STATE] = "STATE", +}; + +/** + * Initialize an expression node of the given type from a source string. + * Currently just converts numerical values and string values where + * appropriate. String values are duplicted into newly allocated buffers as the + * text from the parser will go away. + * Returns 0 on success or non-zero with errno set on failure + */ +static int ast_expr_init(struct ast_node *expr, ast_node_t type, const char *str) +{ + int ret = 0; + switch (type) { + case AST_EX_OFFSET: + str++; // Cut off the + + case AST_EX_NUMBER: + ret = sscanf(str, "%"SCNi64, &expr->ast_num); + if (ret != 1) { + return 1; + } + break; + case AST_EX_ID: + case AST_EX_PATH: + case AST_EX_STRING: + expr->ast_str = strdup(str); + if (expr->ast_str == NULL) { + return 1; + } + break; + case AST_EX_ADDRESS: + case AST_EX_SUBSCRIPT: + case AST_EX_BLOCKSPEC: + case AST_EX_STRUCTSPEC: + case AST_EX_FIELDSPEC: + case AST_KW_STATE: + break; + default: + errno = EINVAL; + return 1; + } + return 0; +} + +/** + * Create a new AST node of a given type from a source string. + * Returns a pointer to the new node or NULL on failure with errno set. + */ +struct ast_node *ast_new(ast_node_t type, const char *text) +{ + struct ast_node *node; + node = (struct ast_node *)calloc(1, sizeof(struct ast_node)); + if (node == NULL) { + goto return_fail; + } + + if (type > _AST_EX_START && ast_expr_init(node, type, text)) { + goto return_free; + } + + node->ast_text = strdup(text); + if (node->ast_text == NULL) { + goto return_free; + } + node->ast_type = type; + + return node; + +return_free: + if (node->ast_text) { + free(node->ast_text); + } + if (node->ast_str) { + free(node->ast_str); + } + free(node); +return_fail: + fprintf(stderr, "Failed to create new value from %s: %s\n", text, strerror(errno)); + return NULL; +} + +/** + * Free the memory allocated for an AST node and set its pointer to NULL + */ +void ast_destroy(struct ast_node **node) +{ + if (*node == NULL) { + return; + } + ast_destroy(&(*node)->ast_left); + ast_destroy(&(*node)->ast_right); + switch((*node)->ast_type) { + case AST_EX_ID: + case AST_EX_PATH: + case AST_EX_STRING: + free((*node)->ast_str); + break; + default: + break; + } + free((*node)->ast_text); + free(*node); + *node = NULL; +} + +static void ast_string_unescape(char *str) +{ + int head, tail; + for (head = tail = 0; str[head] != '\0'; head++, tail++) { + if (str[head] == '\\' && str[head+1] != '\0') + head++; + str[tail] = str[head]; + } + str[tail] = '\0'; +} + +static uint64_t ast_lookup_path(char *path, struct gfs2_sbd *sbd) +{ + int err = 0; + char *c; + struct gfs2_inode *ip, *iptmp; + char *segment; + uint64_t bn = 0; + + segment = strtok_r(path, "/", &c); + ip = lgfs2_inode_read(sbd, sbd->sd_sb.sb_root_dir.no_addr); + + while (ip != NULL) { + if (segment == NULL) { // No more segments + bn = ip->i_di.di_num.no_addr; + inode_put(&ip); + return bn; + } + ast_string_unescape(segment); + err = gfs2_lookupi(ip, segment, strlen(segment), &iptmp); + inode_put(&ip); + if (err != 0) { + errno = -err; + break; + } + ip = iptmp; + segment = strtok_r(NULL, "/", &c); + } + + perror("Path lookup"); + return 0; +} + +enum block_id { + ID_SB = 0, + ID_MASTER, + ID_ROOT, + ID_RINDEX, + + ID_END +}; + +/** + * Names of blocks which can be uniquely identified in the fs + */ +static const char *block_ids[] = { + [ID_SB] = "sb", + [ID_MASTER] = "master", + [ID_ROOT] = "root", + [ID_RINDEX] = "rindex", + + [ID_END] = NULL +}; + +static uint64_t ast_lookup_id(const char *id, struct gfs2_sbd *sbd) +{ + uint64_t bn = 0; + int i; + for (i = 0; i < ID_END; i++) { + if (!strcmp(id, block_ids[i])) { + break; + } + } + switch (i) { + case ID_SB: + bn = sbd->sb_addr; + break; + case ID_MASTER: + bn = sbd->sd_sb.sb_master_dir.no_addr; + break; + case ID_ROOT: + bn = sbd->sd_sb.sb_root_dir.no_addr; + break; + case ID_RINDEX: + bn = sbd->md.riinode->i_di.di_num.no_addr; + break; + default: + return 0; + } + return bn; +} + +static uint64_t ast_lookup_rgrp(uint64_t rgnum, struct gfs2_sbd *sbd) +{ + uint64_t i = rgnum; + struct osi_node *n; + + for (n = osi_first(&sbd->rgtree); n != NULL && i > 0; n = osi_next(n), i--); + if (n != NULL && i == 0) + return ((struct rgrp_tree *)n)->ri.ri_addr; + fprintf(stderr, "Resource group number out of range: %"PRIu64"\n", rgnum); + return 0; +} + +static uint64_t ast_lookup_subscript(struct ast_node *id, struct ast_node *index, + struct gfs2_sbd *sbd) +{ + uint64_t bn = 0; + const char *name = id->ast_str; + if (!strcmp(name, "rgrp")) { + bn = ast_lookup_rgrp(index->ast_num, sbd); + } else { + fprintf(stderr, "Unrecognized identifier %s\n", name); + } + return bn; +} + +/** + * Look up a block and return its number. The kind of lookup depends on the + * type of the ast node. + */ +static uint64_t ast_lookup_block_num(struct ast_node *ast, struct gfs2_sbd *sbd) +{ + uint64_t bn = 0; + switch (ast->ast_type) { + case AST_EX_OFFSET: + bn = ast_lookup_block_num(ast->ast_left, sbd) + ast->ast_num; + break; + case AST_EX_ADDRESS: + bn = ast->ast_num; + break; + case AST_EX_PATH: + bn = ast_lookup_path(ast->ast_str, sbd); + break; + case AST_EX_ID: + bn = ast_lookup_id(ast->ast_str, sbd); + break; + case AST_EX_SUBSCRIPT: + bn = ast_lookup_subscript(ast->ast_left, ast->ast_left->ast_left, sbd); + break; + default: + break; + } + return bn; +} + +static struct gfs2_buffer_head *ast_lookup_block(struct ast_node *node, struct gfs2_sbd *sbd) +{ + uint64_t bn = ast_lookup_block_num(node, sbd); + if (bn == 0) { + return NULL; + } + + return bread(sbd, bn); +} + +static const char *bitstate_strings[] = { + [GFS2_BLKST_FREE] = "Free", + [GFS2_BLKST_USED] = "Used", + [GFS2_BLKST_UNLINKED] = "Unlinked", + [GFS2_BLKST_DINODE] = "Dinode" +}; + +/** + * Print a representation of an arbitrary GFS2 block to stdout + */ +int lgfs2_lang_result_print(struct lgfs2_lang_result *result) +{ + int i; + if (result->lr_mtype != NULL) { + for (i = 0; i < result->lr_mtype->nfields; i++) { + lgfs2_field_print(result->lr_bh, result->lr_mtype, &result->lr_mtype->fields[i]); + } + } else { + printf("%"PRIu64": %s\n", result->lr_blocknr, bitstate_strings[result->lr_state]); + } + return 0; +} + +static int ast_get_bitstate(uint64_t bn, struct gfs2_sbd *sbd) +{ + int ret = 0; + int state = 0; + struct rgrp_tree *rgd = gfs2_blk2rgrpd(sbd, bn); + if (rgd == NULL) { + fprintf(stderr, "Could not find resource group for block %"PRIu64"\n", bn); + return -1; + } + + ret = gfs2_rgrp_read(sbd, rgd); + if (ret != 0) { + fprintf(stderr, "Failed to read resource group for block %"PRIu64": %d\n", bn, ret); + return -1; + } + + state = gfs2_get_bitmap(sbd, bn, rgd); + if (state == -1) { + fprintf(stderr, "Failed to acquire bitmap state for block %"PRIu64"\n", bn); + return -1; + } + + gfs2_rgrp_relse(rgd); + return state; +} + +static const struct lgfs2_metadata *ast_lookup_mtype(const struct gfs2_buffer_head *bh) +{ + const struct lgfs2_metadata *mtype; + const uint32_t mh_type = lgfs2_get_block_type(bh); + if (mh_type == 0) { + fprintf(stderr, "Could not determine type for block %"PRIu64"\n", bh->b_blocknr); + return NULL; + } + + mtype = lgfs2_find_mtype(mh_type, bh->sdp->gfs1 ? LGFS2_MD_GFS1 : LGFS2_MD_GFS2); + if (mtype == NULL) { + fprintf(stderr, "Could not determine meta type for block %"PRIu64"\n", bh->b_blocknr); + return NULL; + } + return mtype; +} + +/** + * Interpret the get statement. + */ +static struct lgfs2_lang_result *ast_interp_get(struct lgfs2_lang_state *state, + struct ast_node *ast, struct gfs2_sbd *sbd) +{ + struct lgfs2_lang_result *result = calloc(1, sizeof(struct lgfs2_lang_result)); + if (result == NULL) { + fprintf(stderr, "Failed to allocate memory for result\n"); + return NULL; + } + + if (ast->ast_right->ast_right == NULL) { + result->lr_bh = ast_lookup_block(ast->ast_right, sbd); + if (result->lr_bh == NULL) { + free(result); + return NULL; + } + result->lr_blocknr = result->lr_bh->b_blocknr; + result->lr_mtype = ast_lookup_mtype(result->lr_bh); + + } else if (ast->ast_right->ast_right->ast_type == AST_KW_STATE) { + result->lr_blocknr = ast_lookup_block_num(ast->ast_right, sbd); + if (result->lr_blocknr == 0) { + return NULL; + } + result->lr_state = ast_get_bitstate(result->lr_blocknr, sbd); + } + + return result; +} + +/** + * Interpret a UUID string by removing hyphens from the string and then + * interprets 16 pairs of hex digits as octets. + */ +static int ast_str_to_uuid(const char *str, uint8_t *uuid) +{ + char s[33]; + int head, tail, tmp; + + for (head = tail = 0; head < strlen(str) && tail < 33; head++) { + if (str[head] == '-') + continue; + s[tail] = tolower(str[head]); + if (!((s[tail] >= 'a' && s[tail] <= 'f') || + (s[tail] >= '0' && s[tail] <= '9'))) + goto invalid; + tail++; + } + if (tail != 32) { + goto invalid; + } + s[tail] = '\0'; + for (head = 0; head < 16; head++) { + if (sscanf(s+(head*2), "%02x", &tmp) != 1) { + goto invalid; + } + *(uuid + head) = tmp; + } + return AST_INTERP_SUCCESS; +invalid: + fprintf(stderr, "Invalid UUID\n"); + return AST_INTERP_INVAL; +} + +/** + * Set a field of a gfs2 block of a given type to a given value. + * Returns AST_INTERP_* to signal success, an invalid field/value or an error. + */ +static int ast_field_set(struct gfs2_buffer_head *bh, const struct lgfs2_metafield *field, + struct ast_node *val) +{ + char *fieldp = (char *)bh->iov.iov_base + field->offset; + + if (field->flags & LGFS2_MFF_UUID) { + uint8_t uuid[16]; + int ret = ast_str_to_uuid(val->ast_str, uuid); + + if (ret != AST_INTERP_SUCCESS) + return ret; + + memcpy(fieldp, uuid, 16); + bmodified(bh); + return AST_INTERP_SUCCESS; + } + + if ((field->flags & LGFS2_MFF_STRING) && strlen(val->ast_str) > field->length) { + fprintf(stderr, "String '%s' is too long for field '%s'\n", val->ast_str, field->name); + return AST_INTERP_INVAL; + } + + if (field->flags & (LGFS2_MFF_STRING|LGFS2_MFF_UUID)) { + strncpy(fieldp, val->ast_str, field->length - 1); + fieldp[field->length - 1] = '\0'; + bmodified(bh); + return AST_INTERP_SUCCESS; + } else { + // Numeric fields + switch(field->length) { + case 1: + if (val->ast_num > UINT8_MAX) + break; + *fieldp = (uint8_t)val->ast_num; + bmodified(bh); + return AST_INTERP_SUCCESS; + case 2: + if (val->ast_num > UINT16_MAX) + break; + *(uint16_t *)fieldp = cpu_to_be16((uint16_t)val->ast_num); + bmodified(bh); + return AST_INTERP_SUCCESS; + case 4: + if (val->ast_num > UINT32_MAX) + break; + *(uint32_t *)fieldp = cpu_to_be32((uint32_t)val->ast_num); + bmodified(bh); + return AST_INTERP_SUCCESS; + case 8: + *(uint64_t *)fieldp = cpu_to_be64((uint64_t)val->ast_num); + bmodified(bh); + return AST_INTERP_SUCCESS; + default: + // This should never happen + return AST_INTERP_ERR; + } + } + + fprintf(stderr, "Invalid field assignment: %s (size %d) = %s\n", + field->name, field->length, val->ast_text); + return AST_INTERP_INVAL; +} + +/** + * Interpret an assignment (set) + */ +static struct lgfs2_lang_result *ast_interp_set(struct lgfs2_lang_state *state, + struct ast_node *ast, struct gfs2_sbd *sbd) +{ + struct ast_node *lookup = ast->ast_right; + struct ast_node *fieldspec; + struct ast_node *fieldname; + struct ast_node *fieldval; + uint32_t mh_type = 0; + int i = 0; + int ret = 0; + + struct lgfs2_lang_result *result = calloc(1, sizeof(struct lgfs2_lang_result)); + if (result == NULL) { + fprintf(stderr, "Failed to allocate memory for result\n"); + return NULL; + } + + result->lr_bh = ast_lookup_block(lookup, sbd); + if (result->lr_bh == NULL) { + goto out_err; + } + + mh_type = lgfs2_get_block_type(result->lr_bh); + if (mh_type == 0) { + goto out_err; + } + + result->lr_mtype = lgfs2_find_mtype(mh_type, sbd->gfs1 ? LGFS2_MD_GFS1 : LGFS2_MD_GFS2); + if (result->lr_mtype == NULL) { + goto out_err; + } + + for (fieldspec = lookup->ast_right; + fieldspec != NULL && fieldspec->ast_type == AST_EX_FIELDSPEC; + fieldspec = fieldspec->ast_left) { + + fieldname = fieldspec->ast_right; + fieldval = fieldname->ast_right; + for (i = 0; i < result->lr_mtype->nfields; i++) { + if (!strcmp(result->lr_mtype->fields[i].name, fieldname->ast_str)) { + ret = ast_field_set(result->lr_bh, &result->lr_mtype->fields[i], fieldval); + if (ret != AST_INTERP_SUCCESS) { + goto out_err; + } + break; + } + } + } + + ret = bwrite(result->lr_bh); + if (ret != 0) { + fprintf(stderr, "Failed to write modified block %"PRIu64": %s\n", + result->lr_bh->b_blocknr, strerror(errno)); + goto out_err; + } + + return result; + +out_err: + lgfs2_lang_result_free(&result); + return NULL; +} + +static struct lgfs2_lang_result *ast_interpret_node(struct lgfs2_lang_state *state, + struct ast_node *ast, struct gfs2_sbd *sbd) +{ + struct lgfs2_lang_result *result = NULL; + + if (ast->ast_type == AST_ST_SET) { + result = ast_interp_set(state, ast, sbd); + } else if (ast->ast_type == AST_ST_GET) { + result = ast_interp_get(state, ast, sbd); + } else { + fprintf(stderr, "Invalid AST node type: %d\n", ast->ast_type); + } + return result; +} + +struct lgfs2_lang_result *lgfs2_lang_result_next(struct lgfs2_lang_state *state, + struct gfs2_sbd *sbd) +{ + struct lgfs2_lang_result *result; + if (state->ls_interp_curr == NULL) { + return NULL; + } + result = ast_interpret_node(state, state->ls_interp_curr, sbd); + if (result == NULL) { + return NULL; + } + state->ls_interp_curr = state->ls_interp_curr->ast_left; + return result; +} + +void lgfs2_lang_result_free(struct lgfs2_lang_result **result) +{ + if (*result == NULL) { + fprintf(stderr, "Warning: attempted to free a null result\n"); + return; + } + + if ((*result)->lr_mtype != NULL) { + (*result)->lr_bh->b_modified = 0; + brelse((*result)->lr_bh); + (*result)->lr_bh = NULL; + } + + free(*result); + *result = NULL; +} diff --git a/gfs2/libgfs2/lang.h b/gfs2/libgfs2/lang.h new file mode 100644 index 0000000..955e52e --- /dev/null +++ b/gfs2/libgfs2/lang.h @@ -0,0 +1,61 @@ +#ifndef LANG_H +#define LANG_H +#include <stdint.h> +#include "libgfs2.h" + +struct lgfs2_lang_state { + int ls_colnum; + int ls_linenum; + int ls_errnum; + struct ast_node *ls_ast_root; + struct ast_node *ls_ast_tail; + struct ast_node *ls_interp_curr; +}; + +typedef enum { + AST_NONE, + // Statements + AST_ST_SET, + AST_ST_GET, + + _AST_EX_START, + // Expressions + AST_EX_ID, + AST_EX_NUMBER, + AST_EX_STRING, + AST_EX_ADDRESS, + AST_EX_PATH, + AST_EX_SUBSCRIPT, + AST_EX_OFFSET, + AST_EX_BLOCKSPEC, + AST_EX_STRUCTSPEC, + AST_EX_FIELDSPEC, + + // Keywords + AST_KW_STATE, +} ast_node_t; + +enum { + AST_INTERP_SUCCESS = 0, // Success + AST_INTERP_FAIL = 1, // Failure + AST_INTERP_INVAL = 2, // Invalid field/type mismatch + AST_INTERP_ERR = 3, // Something went wrong, see errno +}; + +extern const char* ast_type_string[]; + +struct ast_node { + ast_node_t ast_type; + struct ast_node *ast_left; + struct ast_node *ast_right; + char *ast_text; + char *ast_str; + uint64_t ast_num; +}; + +extern struct ast_node *ast_new(ast_node_t type, const char *text); +extern void ast_destroy(struct ast_node **val); + +#define YYSTYPE struct ast_node * + +#endif /* LANG_H */ diff --git a/gfs2/libgfs2/lexer.l b/gfs2/libgfs2/lexer.l new file mode 100644 index 0000000..36e1c2d --- /dev/null +++ b/gfs2/libgfs2/lexer.l @@ -0,0 +1,101 @@ +%{ +#include "lang.h" +#include "parser.h" + +#define EXTRA ((struct lgfs2_lang_state *)yyextra) + +#define P(token, type, text) do {\ + *(yylval) = ast_new(type, text);\ + if (*(yylval) == NULL) {\ + EXTRA->ls_errnum = errno;\ + return 1;\ + }\ + return (TOK_##token);\ +} while(0) + +#define COLNUM EXTRA->ls_colnum +#define YY_USER_ACTION COLNUM += yyleng; + +%} +%option bison-bridge reentrant +%option warn debug +%option nounput noinput +%option noyywrap +%option extra-type="struct lgfs2_lang_state *" + +letter [a-zA-Z_] +decdigit [0-9] +decnumber -?{decdigit}+ +hexdigit [0-9a-fA-F] +hexnumber -?0x{hexdigit}+ +number ({decnumber}|{hexnumber}) +offset \+{number} +id {letter}({letter}|{decdigit}|\.)* +string \'([^\']|\\\')*\' +comment \/\/.*\n +whitespace [ \t\r]+ + +%% + +\{ { + return TOK_LBRACE; + } +\} { + return TOK_RBRACE; + } +\[ { + return TOK_LBRACKET; + } +\] { + P(RBRACKET, AST_EX_SUBSCRIPT, "[ ]"); + } +\, { + return TOK_COMMA; + } +\: { + P(COLON, AST_EX_FIELDSPEC, yytext); + } +\; { + return TOK_SEMI; + } +set { + P(SET, AST_ST_SET, yytext); + } +get { + P(GET, AST_ST_GET, yytext); + } +state { + P(STATE, AST_KW_STATE, yytext); + } +{string} { + yytext[yyleng-1] = '\0'; + P(STRING, AST_EX_STRING, yytext + 1); + } +{offset} { + P(OFFSET, AST_EX_OFFSET, yytext); + } +{number} { + P(NUMBER, AST_EX_NUMBER, yytext); + } +{id} { + P(ID, AST_EX_ID, yytext); + } +{comment} { + COLNUM = 0; + EXTRA->ls_linenum++; + } +<<EOF>> { + return 0; + } +\n { + COLNUM = 0; + EXTRA->ls_linenum++; + } +{whitespace} ; +. { + printf("Unexpected character '%s' on line %d column %d\n", + yytext, yylineno, COLNUM); + return 1; + } + +%% diff --git a/gfs2/libgfs2/libgfs2.h b/gfs2/libgfs2/libgfs2.h index 74ee2d0..3045337 100644 --- a/gfs2/libgfs2/libgfs2.h +++ b/gfs2/libgfs2/libgfs2.h @@ -356,6 +356,10 @@ extern const unsigned lgfs2_ld_type_size; extern const struct lgfs2_symbolic lgfs2_ld1_types[]; extern const unsigned lgfs2_ld1_type_size; extern int lgfs2_selfcheck(void); +extern const struct lgfs2_metadata *lgfs2_find_mtype(uint32_t mh_type, const unsigned versions); +extern int lgfs2_field_print(const struct gfs2_buffer_head *bh, + const struct lgfs2_metadata *mtype, + const struct lgfs2_metafield *field); /* bitmap.c */ struct gfs2_bmap { @@ -379,6 +383,7 @@ extern struct gfs2_buffer_head *__bread(struct gfs2_sbd *sdp, uint64_t num, int line, const char *caller); extern int bwrite(struct gfs2_buffer_head *bh); extern int brelse(struct gfs2_buffer_head *bh); +extern uint32_t lgfs2_get_block_type(const struct gfs2_buffer_head *lbh); #define bmodified(bh) do { bh->b_modified = 1; } while(0) @@ -828,6 +833,25 @@ extern void gfs2_log_descriptor_print(struct gfs2_log_descriptor *ld); extern void gfs2_statfs_change_print(struct gfs2_statfs_change *sc); extern void gfs2_quota_change_print(struct gfs2_quota_change *qc); +/* Language functions */ + +struct lgfs2_lang_state; + +struct lgfs2_lang_result { + uint64_t lr_blocknr; + struct gfs2_buffer_head *lr_bh; + const struct lgfs2_metadata *lr_mtype; + int lr_state; // GFS2_BLKST_* +}; + +extern struct lgfs2_lang_state *lgfs2_lang_init(void); +extern int lgfs2_lang_parsef(struct lgfs2_lang_state *state, FILE *script); +extern int lgfs2_lang_parses(struct lgfs2_lang_state *state, const char *script); +extern struct lgfs2_lang_result *lgfs2_lang_result_next(struct lgfs2_lang_state *state, struct gfs2_sbd *sbd); +extern int lgfs2_lang_result_print(struct lgfs2_lang_result *result); +extern void lgfs2_lang_result_free(struct lgfs2_lang_result **result); +extern void lgfs2_lang_free(struct lgfs2_lang_state **state); + __END_DECLS #endif /* __LIBGFS2_DOT_H__ */ diff --git a/gfs2/libgfs2/meta.c b/gfs2/libgfs2/meta.c index a677cdc..29bf239 100644 --- a/gfs2/libgfs2/meta.c +++ b/gfs2/libgfs2/meta.c @@ -808,3 +808,53 @@ int lgfs2_selfcheck(void) return ret; } +const struct lgfs2_metadata *lgfs2_find_mtype(uint32_t mh_type, const unsigned versions) +{ + const struct lgfs2_metadata *m = lgfs2_metadata; + unsigned n = 0; + + do { + if ((m[n].versions & versions) && m[n].mh_type == mh_type) + return &m[n]; + n++; + } while (n < lgfs2_metadata_size); + + return NULL; +} + +/** + * Print a representation of an arbitrary field of an arbitrary GFS2 block to stdout + * Returns 0 if successful, 1 otherwise + */ +int lgfs2_field_print(const struct gfs2_buffer_head *bh, const struct lgfs2_metadata *mtype, + const struct lgfs2_metafield *field) +{ + const char *fieldp = (char *)bh->iov.iov_base + field->offset; + + printf("%s\t%"PRIu64"\t%u\t%u\t%s\t", mtype->name, bh->b_blocknr, field->offset, field->length, field->name); + if (field->flags & LGFS2_MFF_UUID) { + printf("'%s'\n", str_uuid((const unsigned char *)fieldp)); + } else if (field->flags & LGFS2_MFF_STRING) { + printf("'%s'\n", fieldp); + } else { + switch(field->length) { + case 1: + printf("%"PRIu8"\n", *(uint8_t *)fieldp); + break; + case 2: + printf("%"PRIu16"\n", be16_to_cpu(*(uint16_t *)fieldp)); + break; + case 4: + printf("%"PRIu32"\n", be32_to_cpu(*(uint32_t *)fieldp)); + break; + case 8: + printf("%"PRIu64"\n", be64_to_cpu(*(uint64_t *)fieldp)); + break; + default: + // "Reserved" field so just print 0 + printf("0\n"); + return 1; + } + } + return 0; +} diff --git a/gfs2/libgfs2/misc.c b/gfs2/libgfs2/misc.c index a68da4a..c2eb245 100644 --- a/gfs2/libgfs2/misc.c +++ b/gfs2/libgfs2/misc.c @@ -26,8 +26,6 @@ #define SYS_BASE "/sys/fs/gfs2" /* FIXME: Look in /proc/mounts to find this */ #define DIV_RU(x, y) (((x) + (y) - 1) / (y)) -static char sysfs_buf[PAGE_SIZE]; - int compute_heightsize(struct gfs2_sbd *sdp, uint64_t *heightsize, uint32_t *maxheight, uint32_t bsize1, int diptrs, int inptrs) { diff --git a/gfs2/libgfs2/parser.y b/gfs2/libgfs2/parser.y new file mode 100644 index 0000000..084d15e --- /dev/null +++ b/gfs2/libgfs2/parser.y @@ -0,0 +1,186 @@ +%code top { +#include <errno.h> +#include "lang.h" +#include "lexer.h" + +static int yyerror(struct lgfs2_lang_state *state, yyscan_t lexer, const char *errorstr) +{ + fprintf(stderr, "%d:%d: %s\n", state->ls_linenum, state->ls_colnum, errorstr); + return 1; +} + +} +%defines +%debug +%define api.pure +%parse-param { struct lgfs2_lang_state *state } +%parse-param { yyscan_t lexer } +%lex-param { yyscan_t lexer } +%start script +%token TOK_COLON +%token TOK_COMMA +%token TOK_ID +%token TOK_LBRACE +%token TOK_LBRACKET +%token TOK_NUMBER +%token TOK_OFFSET +%token TOK_RBRACE +%token TOK_RBRACKET +%token TOK_SEMI +%token TOK_SET +%token TOK_GET +%token TOK_STATE +%token TOK_STRING +%% +script: statements { + state->ls_ast_root = $1; + state->ls_interp_curr = $1; + } + | statements TOK_SEMI { + state->ls_ast_root = $1; + state->ls_interp_curr = $1; + } +; +statements: statements TOK_SEMI statement { + state->ls_ast_tail->ast_left = $3; + state->ls_ast_tail = $3; + $$ = $1; + } + | statement { + if (state->ls_ast_tail == NULL) + state->ls_ast_tail = $1; + $$ = $1; + } +; + +statement: set_stmt { $$ = $1; } + | get_stmt { $$ = $1; } +; +set_stmt: TOK_SET blockspec structspec { + $1->ast_right = $2; + $2->ast_right = $3; + $$ = $1; + } +; +get_stmt: TOK_GET blockspec { $1->ast_right = $2; $$ = $1; } + | TOK_GET blockspec TOK_STATE { + $1->ast_right = $2; + $2->ast_right = $3; + $$ = $1; + } +; +blockspec: offset { $$ = $1; } + | address { $$ = $1; } + | path { $$ = $1; } + | block_literal { $$ = $1; } + | subscript { $$ = $1; } +; +offset: blockspec TOK_OFFSET { + $2->ast_left = $1; + $$ = $2; + } +; +block_literal: identifier { $$ = $1; } +; +subscript: block_literal TOK_LBRACKET index TOK_RBRACKET { + $4->ast_left = $1; + $1->ast_left = $3; + $$ = $4; + } +; +index: number { $$ = $1; } + | identifier { $$ = $1; } +; +address: number { $1->ast_type = AST_EX_ADDRESS; $$ = $1; } +; +path: string { + if (*($1->ast_str) != '/') { + fprintf(stderr, "Path doesn't begin with '/': %s\n", $1->ast_str); + YYABORT; + } + $1->ast_type = AST_EX_PATH; + $$ = $1; + } +; +structspec: TOK_LBRACE fieldspecs TOK_RBRACE { $$ = $2; } +; +fieldspecs: fieldspecs TOK_COMMA fieldspec { $1->ast_left = $3; $$ = $1; } + | fieldspec { $$ = $1; } +; +fieldspec: identifier TOK_COLON fieldvalue { + $2->ast_right = $1; + $1->ast_right = $3; + $$ = $2; + } +; +fieldvalue: number { $$ = $1; } + | string { $$ = $1; } +; +number: TOK_NUMBER { $$ = $1; } +string: TOK_STRING { $$ = $1; } +identifier: TOK_ID { $$ = $1; } +%% + +/** + * Allocate and initialize a new parse state structure. The caller must free the + * memory returned by this function. + */ +struct lgfs2_lang_state *lgfs2_lang_init(void) +{ + struct lgfs2_lang_state *state; + state = calloc(1, sizeof(struct lgfs2_lang_state)); + if (state == NULL) { + return NULL; + } + state->ls_linenum = 1; + return state; +} + +void lgfs2_lang_free(struct lgfs2_lang_state **state) +{ + ast_destroy(&(*state)->ls_ast_root); + free(*state); + *state = NULL; +} + +int lgfs2_lang_parsef(struct lgfs2_lang_state *state, FILE *src) +{ + int ret = 0; + yyscan_t lexer; + + ret = yylex_init_extra(state, &lexer); + if (ret != 0) { + fprintf(stderr, "Failed to initialize lexer.\n"); + return ret; + } + + yyset_in(src, lexer); + ret = yyparse(state, lexer); + yylex_destroy(lexer); + return ret; +} + +int lgfs2_lang_parses(struct lgfs2_lang_state *state, const char *cstr) +{ + int ret; + FILE *src; + char *str = strdup(cstr); + + if (str == NULL) { + perror("Failed to duplicate source string"); + return 1; + } + src = fmemopen(str, strlen(str), "r"); + if (src == NULL) { + perror("Failed to open string as source file"); + free(str); + return 1; + } + ret = lgfs2_lang_parsef(state, src); + fclose(src); + free(str); + if (ret != 0 || state->ls_errnum != 0) { + return 1; + } + return 0; +} diff --git a/gfs2/libgfs2/super.c b/gfs2/libgfs2/super.c index a3c1964..fdf0e60 100644 --- a/gfs2/libgfs2/super.c +++ b/gfs2/libgfs2/super.c @@ -25,7 +25,7 @@ int check_sb(struct gfs2_sb *sb) { if (sb->sb_header.mh_magic != GFS2_MAGIC || sb->sb_header.mh_type != GFS2_METATYPE_SB) { - errno = -EIO; + errno = EIO; return -1; } if (sb->sb_fs_format == GFS_FORMAT_FS &&

1 0

cluster: STABLE32 - rgmanager: Randomize node list when relocating with no target
by Ryan McCabe 15 Oct '12

15 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=db3b4f9b78de7… Commit: db3b4f9b78de7f90e2e19c590b14e5f3ec57333e Parent: a844e71abe9da79e7b6830449e3f5d5d8fed1224 Author: Ryan McCabe <rmccabe(a)redhat.com> AuthorDate: Mon Oct 15 09:32:18 2012 -0400 Committer: Ryan McCabe <rmccabe(a)redhat.com> CommitterDate: Mon Oct 15 09:44:46 2012 -0400 rgmanager: Randomize node list when relocating with no target Randomize the node list when choosing a node to which to forward a start request to when relocating a service with no specified target. The current behavior causes the service to bounce between the two nodes with the highest node IDs when relocating in a loop. Resolves: rhbz#831648 Acked-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> Signed-off-by: Ryan McCabe <rmccabe(a)redhat.com> --- rgmanager/include/members.h | 1 + rgmanager/src/clulib/members.c | 20 ++++++++++++++++++++ rgmanager/src/daemons/rg_state.c | 1 + 3 files changed, 22 insertions(+), 0 deletions(-) diff --git a/rgmanager/include/members.h b/rgmanager/include/members.h index 7e99e17..09f7a9a 100644 --- a/rgmanager/include/members.h +++ b/rgmanager/include/members.h @@ -27,6 +27,7 @@ char * memb_id_to_name(cluster_member_list_t *ml, int nodeid); cman_node_t * memb_id_to_p(cluster_member_list_t *ml, int nodeid); cman_node_t * memb_name_to_p(cluster_member_list_t *ml, char *name); void free_member_list(cluster_member_list_t *ml); +void member_list_shuffle(cluster_member_list_t *ml); cluster_member_list_t *memb_gained(cluster_member_list_t *old, cluster_member_list_t *new); cluster_member_list_t *memb_lost(cluster_member_list_t *old, diff --git a/rgmanager/src/clulib/members.c b/rgmanager/src/clulib/members.c index e6475e1..8a98f98 100644 --- a/rgmanager/src/clulib/members.c +++ b/rgmanager/src/clulib/members.c @@ -11,6 +11,7 @@ #include <signal.h> #include <string.h> #include <sys/socket.h> +#include <sys/time.h> #include <rg_types.h> #include <pthread.h> #include <errno.h> @@ -505,3 +506,22 @@ member_list_dup(cluster_member_list_t *orig) return ret; } +void member_list_shuffle(cluster_member_list_t *ml) { + int i; + unsigned st; + struct timeval tv; + + gettimeofday(&tv, NULL); + st = (int)(tv.tv_usec); + + + for (i = 0 ; i < ml->cml_count ; i++) { + cman_node_t temp; + int newidx = rand_r(&st) % ml->cml_count; + if (newidx == i) + continue; + memcpy(&temp, &ml->cml_members[i], sizeof(cman_node_t)); + memcpy(&ml->cml_members[i], &ml->cml_members[newidx], sizeof(cman_node_t)); + memcpy(&ml->cml_members[newidx], &temp, sizeof(cman_node_t)); + } +} diff --git a/rgmanager/src/daemons/rg_state.c b/rgmanager/src/daemons/rg_state.c index 9f0c68e..765c3eb 100644 --- a/rgmanager/src/daemons/rg_state.c +++ b/rgmanager/src/daemons/rg_state.c @@ -1938,6 +1938,7 @@ handle_relocate_req(char *svcName, int orig_request, int preferred_target, allowed_nodes = member_list(); //count_resource_groups(allowed_nodes); } + member_list_shuffle(allowed_nodes); if (preferred_target > 0) memb_mark_down(allowed_nodes, preferred_target);

1 0

cluster: RHEL6 - rgmanager: Randomize node list when relocating with no target
by Ryan McCabe 15 Oct '12

15 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=13dcbb8265eaf… Commit: 13dcbb8265eafcdf69c033f45f2a37aa44b18908 Parent: a4d6a6aa6ba6bd8d610d42fdb518089efa4112ee Author: Ryan McCabe <rmccabe(a)redhat.com> AuthorDate: Mon Oct 15 09:32:18 2012 -0400 Committer: Ryan McCabe <rmccabe(a)redhat.com> CommitterDate: Mon Oct 15 09:38:04 2012 -0400 rgmanager: Randomize node list when relocating with no target Randomize the node list when choosing a node to which to forward a start request to when relocating a service with no specified target. The current behavior causes the service to bounce between the two nodes with the highest node IDs when relocating in a loop. Resolves: rhbz#831648 Acked-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> Signed-off-by: Ryan McCabe <rmccabe(a)redhat.com> --- rgmanager/include/members.h | 1 + rgmanager/src/clulib/members.c | 20 ++++++++++++++++++++ rgmanager/src/daemons/rg_state.c | 1 + 3 files changed, 22 insertions(+), 0 deletions(-) diff --git a/rgmanager/include/members.h b/rgmanager/include/members.h index 7e99e17..09f7a9a 100644 --- a/rgmanager/include/members.h +++ b/rgmanager/include/members.h @@ -27,6 +27,7 @@ char * memb_id_to_name(cluster_member_list_t *ml, int nodeid); cman_node_t * memb_id_to_p(cluster_member_list_t *ml, int nodeid); cman_node_t * memb_name_to_p(cluster_member_list_t *ml, char *name); void free_member_list(cluster_member_list_t *ml); +void member_list_shuffle(cluster_member_list_t *ml); cluster_member_list_t *memb_gained(cluster_member_list_t *old, cluster_member_list_t *new); cluster_member_list_t *memb_lost(cluster_member_list_t *old, diff --git a/rgmanager/src/clulib/members.c b/rgmanager/src/clulib/members.c index 5f98708..715fe39 100644 --- a/rgmanager/src/clulib/members.c +++ b/rgmanager/src/clulib/members.c @@ -11,6 +11,7 @@ #include <signal.h> #include <string.h> #include <sys/socket.h> +#include <sys/time.h> #include <rg_types.h> #include <pthread.h> #include <errno.h> @@ -501,3 +502,22 @@ member_list_dup(cluster_member_list_t *orig) return ret; } +void member_list_shuffle(cluster_member_list_t *ml) { + int i; + unsigned st; + struct timeval tv; + + gettimeofday(&tv, NULL); + st = (int)(tv.tv_usec); + + + for (i = 0 ; i < ml->cml_count ; i++) { + cman_node_t temp; + int newidx = rand_r(&st) % ml->cml_count; + if (newidx == i) + continue; + memcpy(&temp, &ml->cml_members[i], sizeof(cman_node_t)); + memcpy(&ml->cml_members[i], &ml->cml_members[newidx], sizeof(cman_node_t)); + memcpy(&ml->cml_members[newidx], &temp, sizeof(cman_node_t)); + } +} diff --git a/rgmanager/src/daemons/rg_state.c b/rgmanager/src/daemons/rg_state.c index 80e8667..59454bf 100644 --- a/rgmanager/src/daemons/rg_state.c +++ b/rgmanager/src/daemons/rg_state.c @@ -1924,6 +1924,7 @@ handle_relocate_req(char *svcName, int orig_request, int preferred_target, allowed_nodes = member_list(); //count_resource_groups(allowed_nodes); } + member_list_shuffle(allowed_nodes); if (preferred_target > 0) memb_mark_down(allowed_nodes, preferred_target);

1 0

cluster: RHEL6 - rgmanager: Fix return code when a service would deadlock
by Ryan McCabe 15 Oct '12

15 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=a4d6a6aa6ba6b… Commit: a4d6a6aa6ba6bd8d610d42fdb518089efa4112ee Parent: 8f339d0e5c151c6e444c0108b98a8c3b63fd28b8 Author: Ryan McCabe <rmccabe(a)redhat.com> AuthorDate: Fri Oct 12 21:14:19 2012 -0400 Committer: Ryan McCabe <rmccabe(a)redhat.com> CommitterDate: Mon Oct 15 09:38:04 2012 -0400 rgmanager: Fix return code when a service would deadlock When we detect that starting a service would cause a deadlock, return 0 instead of -1. This fixes a crash that occurred when -1 was returned. Resolves: rhbz#861157 Acked-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> Signed-off-by: Ryan McCabe <rmccabe(a)redhat.com> --- rgmanager/src/daemons/rg_thread.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rgmanager/src/daemons/rg_thread.c b/rgmanager/src/daemons/rg_thread.c index 5e551c3..b888717 100644 --- a/rgmanager/src/daemons/rg_thread.c +++ b/rgmanager/src/daemons/rg_thread.c @@ -756,7 +756,7 @@ rt_enqueue_request(const char *resgroupname, int request, logt_print(LOG_DEBUG, "Failed to queue %d request for %s: Would block\n", request, resgroupname); - return -1; + return 0; } ret = rq_queue_request(resgroup->rt_queue, resgroup->rt_name,

1 0

cluster: RHEL6 - mkfs.gfs2: Check locktable more strictly for valid chars
by Andrew Price 15 Oct '12

15 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=8f339d0e5c151… Commit: 8f339d0e5c151c6e444c0108b98a8c3b63fd28b8 Parent: b257ab953eaa3acc20fbdd47c34579fa0282d737 Author: Andrew Price <anprice(a)redhat.com> AuthorDate: Fri Oct 12 15:48:08 2012 +0100 Committer: Andrew Price <anprice(a)redhat.com> CommitterDate: Mon Oct 15 12:22:20 2012 +0100 mkfs.gfs2: Check locktable more strictly for valid chars Previously mkfs.gfs2 allowed any printable characters to be used in the locktable name. This causes problems when the locktable contains special characters such as '/'. This patch limits the locktable to alphanumeric characters plus hyphens and underscores. Resolves: rhbz#862847 Signed-off-by: Andrew Price <anprice(a)redhat.com> --- gfs2/man/mkfs.gfs2.8 | 3 ++- gfs2/mkfs/main_mkfs.c | 6 ++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/gfs2/man/mkfs.gfs2.8 b/gfs2/man/mkfs.gfs2.8 index 63348f8..c83b432 100644 --- a/gfs2/man/mkfs.gfs2.8 +++ b/gfs2/man/mkfs.gfs2.8 @@ -73,7 +73,8 @@ Clustername must match that in cluster.conf; only members of this cluster are permitted to use this file system. Fsname is a unique file system name used to distinguish this GFS2 file system from others created (1 to 16 characters). Lock_nolock doesn't -use this field. +use this field. Valid \fIclustername\fRs and \fIfsname\fRs may only contain +alphanumeric characters, hyphens (-) and underscores (_). .TP \fB-u\fP \fIMegaBytes\fR Initial size of each journal's unlinked tag file diff --git a/gfs2/mkfs/main_mkfs.c b/gfs2/mkfs/main_mkfs.c index bcc60e4..7163cf1 100644 --- a/gfs2/mkfs/main_mkfs.c +++ b/gfs2/mkfs/main_mkfs.c @@ -263,10 +263,8 @@ static void test_locking(char *lockproto, char *locktable) exit(-1); } for (c = locktable; *c; c++) { - if (isspace(*c)) - die( _("locktable error: contains space characters\n")); - if (!isprint(*c)) - die( _("locktable error: contains unprintable characters\n")); + if (!isalnum(*c) && (*c != '-') && (*c != '_') && (*c != ':')) + die( _("locktable error: invalid character '%c'\n"), *c); } c = strstr(locktable, ":");

1 0

gfs2-utils: master - mkfs.gfs2: Check locktable more strictly for valid chars
by Andrew Price 15 Oct '12

15 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=24fad71d36… Commit: 24fad71d36ecce70a5d0d4206d0b13e7b77ec94c Parent: abe3d4b88afe39d839692865b29bd800f09cba8a Author: Andrew Price <anprice(a)redhat.com> AuthorDate: Fri Oct 12 01:36:32 2012 +0100 Committer: Andrew Price <anprice(a)redhat.com> CommitterDate: Fri Oct 12 01:36:32 2012 +0100 mkfs.gfs2: Check locktable more strictly for valid chars Previously mkfs.gfs2 allowed any printable characters to be used in the locktable name. This causes problems when the locktable contains special characters such as '/'. This patch limits the locktable to alphanumeric characters plus hyphens and underscores. Ref: bz#862847 Signed-off-by: Andrew Price <anprice(a)redhat.com> --- gfs2/man/mkfs.gfs2.8 | 3 ++- gfs2/mkfs/main_mkfs.c | 6 ++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/gfs2/man/mkfs.gfs2.8 b/gfs2/man/mkfs.gfs2.8 index d17e272..4613305 100644 --- a/gfs2/man/mkfs.gfs2.8 +++ b/gfs2/man/mkfs.gfs2.8 @@ -73,7 +73,8 @@ Clustername must match that in cluster.conf; only members of this cluster are permitted to use this file system. Fsname is a unique file system name used to distinguish this GFS2 file system from others created (1 to 16 characters). Lock_nolock doesn't -use this field. +use this field. Valid \fIclustername\fRs and \fIfsname\fRs may only contain +alphanumeric characters, hyphens (-) and underscores (_). .TP \fB-V\fP Print program version information, then exit. diff --git a/gfs2/mkfs/main_mkfs.c b/gfs2/mkfs/main_mkfs.c index 2d529d7..3bbb5b4 100644 --- a/gfs2/mkfs/main_mkfs.c +++ b/gfs2/mkfs/main_mkfs.c @@ -259,10 +259,8 @@ static void test_locking(char *lockproto, char *locktable) exit(-1); } for (c = locktable; *c; c++) { - if (isspace(*c)) - die( _("locktable error: contains space characters\n")); - if (!isprint(*c)) - die( _("locktable error: contains unprintable characters\n")); + if (!isalnum(*c) && (*c != '-') && (*c != '_') && (*c != ':')) + die( _("locktable error: invalid character '%c'\n"), *c); } c = strstr(locktable, ":");

1 0

cluster: STABLE32 - rgmanager: Fix return code when a service would deadlock
by Ryan McCabe 12 Oct '12

12 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=a844e71abe9da… Commit: a844e71abe9da79e7b6830449e3f5d5d8fed1224 Parent: cdd37c317a1b0ebfb4daaf56f5a6beac20356792 Author: Ryan McCabe <rmccabe(a)redhat.com> AuthorDate: Fri Oct 12 21:14:19 2012 -0400 Committer: Ryan McCabe <rmccabe(a)redhat.com> CommitterDate: Fri Oct 12 21:14:19 2012 -0400 rgmanager: Fix return code when a service would deadlock When we detect that starting a service would cause a deadlock, return 0 instead of -1. This fixes a crash that occurred when -1 was returned. Signed-off-by: Ryan McCabe <rmccabe(a)redhat.com> --- rgmanager/src/daemons/rg_thread.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rgmanager/src/daemons/rg_thread.c b/rgmanager/src/daemons/rg_thread.c index 31f289c..4f46c25 100644 --- a/rgmanager/src/daemons/rg_thread.c +++ b/rgmanager/src/daemons/rg_thread.c @@ -759,7 +759,7 @@ rt_enqueue_request(const char *resgroupname, int request, logt_print(LOG_DEBUG, "Failed to queue %d request for %s: Would block\n", request, resgroupname); - return -1; + return 0; } ret = rq_queue_request(resgroup->rt_queue, resgroup->rt_name,

1 0

cluster: RHEL6 - rgmanager: OCF_NOT_INSTALLED is OK if we stop when stopped
by Ryan McCabe 12 Oct '12

12 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=b257ab953eaa3… Commit: b257ab953eaa3acc20fbdd47c34579fa0282d737 Parent: c348f23fee6e4781d6150c68195528e3b7767d8e Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Thu Dec 15 15:44:26 2011 -0500 Committer: Ryan McCabe <rmccabe(a)redhat.com> CommitterDate: Fri Oct 12 13:13:37 2012 -0400 rgmanager: OCF_NOT_INSTALLED is OK if we stop when stopped Scripts often live in file systems which are mounted by rgmanager. This patch makes rgmanager ignore the OCF_NOT_INSTALLED error returned from the script agent if we attempt to stop when a start failed. Furthermore, don't mark the resource as failed if a start failure occurs due to the program not existing. The combination of these create the ability for a missing script to move to a node where the script exists, or be placed in to the stopped state. Cherrypicked from STABLE32 (and RHEL59) Resolves: rhbz#853251 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> Reviewed-by: Adam Drew <adrew(a)redhat.com> Tested-by: Adam Drew <adrew(a)redhat.com> Signed-off-by: Ryan McCabe <rmccabe(a)redhat.com> --- rgmanager/src/daemons/restree.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/rgmanager/src/daemons/restree.c b/rgmanager/src/daemons/restree.c index a13f907..9cd38a2 100644 --- a/rgmanager/src/daemons/restree.c +++ b/rgmanager/src/daemons/restree.c @@ -464,6 +464,10 @@ res_exec(resource_node_t *node, int op, const char *arg, int depth) ret = WEXITSTATUS(ret); + if (node->rn_state == RES_STOPPED && + op == RS_STOP && ret == OCF_RA_NOT_INSTALLED) + ret = 0; + #ifndef NO_CCS if ((op == RS_STATUS && node->rn_state == RES_STARTED && ret) || @@ -1468,7 +1472,8 @@ _res_op_internal(resource_node_t __attribute__ ((unused)) **tree, } node->rn_flags &= ~(RF_NEEDSTART | RF_RECONFIG); if (rv != 0) { - node->rn_state = RES_FAILED; + if (rv != OCF_RA_NOT_INSTALLED) + node->rn_state = RES_FAILED; pthread_mutex_unlock(&node->rn_resource->r_mutex); return SFL_FAILURE; }

1 0

cluster: RHEL59 - fence_rhevm: Fix API changes in RHEV-M
by Marek Grác 11 Oct '12

11 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=b0c42d287f7f7… Commit: b0c42d287f7f749794a61796f016c2e56148d64b Parent: 432045a49e4930e6f1c406f6f279c608655dac04 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Thu Oct 11 15:46:47 2012 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Thu Oct 11 15:46:47 2012 +0200 fence_rhevm: Fix API changes in RHEV-M Resolves: rhbz#863567 --- fence/agents/rhevm/fence_rhevm.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fence/agents/rhevm/fence_rhevm.py b/fence/agents/rhevm/fence_rhevm.py index f7854f2..b05da55 100755 --- a/fence/agents/rhevm/fence_rhevm.py +++ b/fence/agents/rhevm/fence_rhevm.py @@ -11,7 +11,7 @@ REDHAT_COPYRIGHT="" BUILD_DATE="" #END_VERSION_GENERATION -re_get_id = re.compile("<vm id=\"(.*?)\"", re.IGNORECASE); +re_get_id = re.compile("<vm( .*)? id=\"(.*?)\"", re.IGNORECASE); re_status = re.compile("<state>(.*?)</state>", re.IGNORECASE); re_get_name = re.compile("<name>(.*?)</name>", re.IGNORECASE); @@ -28,7 +28,7 @@ def get_power_status(conn, options): # Unable to obtain ID needed to access virtual machine fail(EC_STATUS) - options["id"] = result.group(1); + options["id"] = result.group(2); re_status.search(res) result = re_status.search(res)

1 0

cluster: RHEL6 - checkquorum.wdmd: add integration script with wdmd
by Fabio M. Di Nitto 10 Oct '12

10 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=c348f23fee6e4… Commit: c348f23fee6e4781d6150c68195528e3b7767d8e Parent: cdce3c1925cb75e21c79c31b60269642e98e256d Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Tue Oct 9 11:30:50 2012 +0200 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Wed Oct 10 10:26:04 2012 +0200 checkquorum.wdmd: add integration script with wdmd requires wdmd >= 2.6 Resolves: rhbz#509056 Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- cman/scripts/Makefile | 2 +- cman/scripts/checkquorum.wdmd | 104 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+), 1 deletions(-) diff --git a/cman/scripts/Makefile b/cman/scripts/Makefile index b4866c8..7950311 100644 --- a/cman/scripts/Makefile +++ b/cman/scripts/Makefile @@ -1,4 +1,4 @@ -SHAREDIRTEX=checkquorum +SHAREDIRTEX=checkquorum checkquorum.wdmd include ../../make/defines.mk include $(OBJDIR)/make/clean.mk diff --git a/cman/scripts/checkquorum.wdmd b/cman/scripts/checkquorum.wdmd new file mode 100644 index 0000000..1d81ff6 --- /dev/null +++ b/cman/scripts/checkquorum.wdmd @@ -0,0 +1,104 @@ +#!/bin/bash +# Quorum detection watchdog script +# +# This script will return -2 if the node had quorum at one point +# and then subsequently lost it +# +# Copyright 2012 Red Hat, Inc. + +# defaults + +# Amount of time in seconds to wait after quorum is lost to fail script +waittime=60 + +# action to take if quorum is missing for over > waittime +# autodetect|hardreboot|crashdump|watchdog +action=autodetect + +# Location of temporary file to capture timeouts +timerfile="/var/run/cluster/checkquorum-timer" + +# rpm based distros +[ -d /etc/sysconfig ] && \ + [ -f /etc/sysconfig/checkquorum ] && \ + . /etc/sysconfig/checkquorum + +# deb based distros +[ ! -d /etc/sysconfig ] && \ + [ -f /etc/default/checkquorum ] && \ + . /etc/default/checkquorum + +has_quorum() { + corosync-quorumtool -s 2>/dev/null | \ + grep ^Quorate: | \ + grep -q Yes$ +} + +had_quorum() { + output="$(corosync-objctl 2>/dev/null | \ + grep runtime.totem.pg.mrp.srp.operational_entered | cut -d "=" -f 2)" + [ -n "$output" ] && { + [ "$output" -ge 1 ] && return 0 + return 1 + } +} + +take_action() { + case "$action" in + watchdog) + [ -n "$wdmd_action" ] && return 1 + ;; + hardreboot) + echo 1 > /proc/sys/kernel/sysrq + echo b > /proc/sysrq-trigger + ;; + crashdump) + echo 1 > /proc/sys/kernel/sysrq + echo c > /proc/sysrq-trigger + ;; + autodetect) + service kdump status > /dev/null 2>&1 + usekexec="$?" + [ -n "$wdmd_action" ] && [ "$usekexec" != "0" ] && return 1 + echo 1 > /proc/sys/kernel/sysrq + [ "$usekexec" = "0" ] && echo c > /proc/sysrq-trigger + echo b > /proc/sysrq-trigger + esac +} + +# watchdog uses $1 = test or = repair +# with no arguments we are called by wdmd +[ -z "$1" ] && wdmd_action=yes + +# we don't support watchdog repair action +[ "$1" = "repair" ] && exit 1 + +service corosync status > /dev/null 2>&1 +ret=$? + +case "$ret" in + 3) # corosync is not running (clean) + rm -f "$timerfile" + exit 0 + ;; + 1) # corosync crashed or did exit abonormally (dirty - take action) + logger -t checkquorum.wdmd "corosync crashed or exited abonarmally. Node will soon reboot" + take_action + ;; + 0) # corosync is running (clean) + # check quorum here + has_quorum && { + echo -e "oldtime=$(date +%s)" > "$timerfile" + exit 0 + } + . "$timerfile" + newtime="$(date +%s)" + delta=$((newtime - oldtime)) + logger -t checkquorum.wdmd "Node has lost quorum. Node will soon reboot" + had_quorum && [ "$delta" -gt "$waittime" ] && { + take_action + } + ;; +esac + +exit $?

1 0

cluster: RHEL6 - cman init: make sure we start after fence_sanlockd and warn users
by Fabio M. Di Nitto 10 Oct '12

10 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=cdce3c1925cb7… Commit: cdce3c1925cb75e21c79c31b60269642e98e256d Parent: 5fa8099c3dad18712941a5fbea1379a6e2ffdadd Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Tue Oct 9 11:28:43 2012 +0200 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Wed Oct 10 10:25:58 2012 +0200 cman init: make sure we start after fence_sanlockd and warn users Resolves: rhbz#509056 Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- cman/init.d/cman.in | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in index b64bb17..0f40097 100644 --- a/cman/init.d/cman.in +++ b/cman/init.d/cman.in @@ -8,8 +8,8 @@ # ### BEGIN INIT INFO # Provides: cman -# Required-Start: $network $time -# Required-Stop: $network $time +# Required-Start: $network $time fence_sanlockd +# Required-Stop: $network $time fence_sanlockd # Default-Start: # Default-Stop: # Short-Description: Starts and stops cman @@ -678,6 +678,13 @@ stop_cmannotifyd() stop_daemon cmannotifyd } +fence_sanlock_check() +{ + service fence_sanlockd status > /dev/null 2>&1 && + echo " fence_sanlockd detected. Unfencing might take several minutes!" + return 0 +} + unfence_self() { # fence_node returns 0 on success, 1 on failure, 2 if unconfigured @@ -818,6 +825,8 @@ start() [ "$breakpoint" = "daemons" ] && exit 0 + fence_sanlock_check + runwrap unfence_self \ none \ "Unfencing self"

1 0

cluster: STABLE32 - checkquorum.wdmd: add integration script with wdmd
by Fabio M. Di Nitto 09 Oct '12

09 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=cdd37c317a1b0… Commit: cdd37c317a1b0ebfb4daaf56f5a6beac20356792 Parent: f478706e70f45bee691cfedd6177226a81aedd16 Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Tue Oct 9 11:30:50 2012 +0200 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Tue Oct 9 11:30:50 2012 +0200 checkquorum.wdmd: add integration script with wdmd requires wdmd >= 2.6 Resolves: rhbz#509056 Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- cman/scripts/Makefile | 2 +- cman/scripts/checkquorum.wdmd | 104 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+), 1 deletions(-) diff --git a/cman/scripts/Makefile b/cman/scripts/Makefile index b4866c8..7950311 100644 --- a/cman/scripts/Makefile +++ b/cman/scripts/Makefile @@ -1,4 +1,4 @@ -SHAREDIRTEX=checkquorum +SHAREDIRTEX=checkquorum checkquorum.wdmd include ../../make/defines.mk include $(OBJDIR)/make/clean.mk diff --git a/cman/scripts/checkquorum.wdmd b/cman/scripts/checkquorum.wdmd new file mode 100644 index 0000000..1d81ff6 --- /dev/null +++ b/cman/scripts/checkquorum.wdmd @@ -0,0 +1,104 @@ +#!/bin/bash +# Quorum detection watchdog script +# +# This script will return -2 if the node had quorum at one point +# and then subsequently lost it +# +# Copyright 2012 Red Hat, Inc. + +# defaults + +# Amount of time in seconds to wait after quorum is lost to fail script +waittime=60 + +# action to take if quorum is missing for over > waittime +# autodetect|hardreboot|crashdump|watchdog +action=autodetect + +# Location of temporary file to capture timeouts +timerfile="/var/run/cluster/checkquorum-timer" + +# rpm based distros +[ -d /etc/sysconfig ] && \ + [ -f /etc/sysconfig/checkquorum ] && \ + . /etc/sysconfig/checkquorum + +# deb based distros +[ ! -d /etc/sysconfig ] && \ + [ -f /etc/default/checkquorum ] && \ + . /etc/default/checkquorum + +has_quorum() { + corosync-quorumtool -s 2>/dev/null | \ + grep ^Quorate: | \ + grep -q Yes$ +} + +had_quorum() { + output="$(corosync-objctl 2>/dev/null | \ + grep runtime.totem.pg.mrp.srp.operational_entered | cut -d "=" -f 2)" + [ -n "$output" ] && { + [ "$output" -ge 1 ] && return 0 + return 1 + } +} + +take_action() { + case "$action" in + watchdog) + [ -n "$wdmd_action" ] && return 1 + ;; + hardreboot) + echo 1 > /proc/sys/kernel/sysrq + echo b > /proc/sysrq-trigger + ;; + crashdump) + echo 1 > /proc/sys/kernel/sysrq + echo c > /proc/sysrq-trigger + ;; + autodetect) + service kdump status > /dev/null 2>&1 + usekexec="$?" + [ -n "$wdmd_action" ] && [ "$usekexec" != "0" ] && return 1 + echo 1 > /proc/sys/kernel/sysrq + [ "$usekexec" = "0" ] && echo c > /proc/sysrq-trigger + echo b > /proc/sysrq-trigger + esac +} + +# watchdog uses $1 = test or = repair +# with no arguments we are called by wdmd +[ -z "$1" ] && wdmd_action=yes + +# we don't support watchdog repair action +[ "$1" = "repair" ] && exit 1 + +service corosync status > /dev/null 2>&1 +ret=$? + +case "$ret" in + 3) # corosync is not running (clean) + rm -f "$timerfile" + exit 0 + ;; + 1) # corosync crashed or did exit abonormally (dirty - take action) + logger -t checkquorum.wdmd "corosync crashed or exited abonarmally. Node will soon reboot" + take_action + ;; + 0) # corosync is running (clean) + # check quorum here + has_quorum && { + echo -e "oldtime=$(date +%s)" > "$timerfile" + exit 0 + } + . "$timerfile" + newtime="$(date +%s)" + delta=$((newtime - oldtime)) + logger -t checkquorum.wdmd "Node has lost quorum. Node will soon reboot" + had_quorum && [ "$delta" -gt "$waittime" ] && { + take_action + } + ;; +esac + +exit $?

1 0

cluster: STABLE32 - cman init: make sure we start after fence_sanlockd and warn users
by Fabio M. Di Nitto 09 Oct '12

09 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=f478706e70f45… Commit: f478706e70f45bee691cfedd6177226a81aedd16 Parent: 5a4cc0c888396c4efc8d7f6ffffd0e960b5259cb Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Tue Oct 9 11:28:43 2012 +0200 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Tue Oct 9 11:28:43 2012 +0200 cman init: make sure we start after fence_sanlockd and warn users Resolves: rhbz#509056 Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- cman/init.d/cman.in | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in index a88f52f..849739b 100644 --- a/cman/init.d/cman.in +++ b/cman/init.d/cman.in @@ -8,8 +8,8 @@ # ### BEGIN INIT INFO # Provides: cman -# Required-Start: $network $time -# Required-Stop: $network $time +# Required-Start: $network $time fence_sanlockd +# Required-Stop: $network $time fence_sanlockd # Default-Start: # Default-Stop: # Short-Description: Starts and stops cman @@ -740,6 +740,13 @@ stop_cmannotifyd() stop_daemon cmannotifyd } +fence_sanlock_check() +{ + service fence_sanlockd status > /dev/null 2>&1 && + echo " fence_sanlockd detected. Unfencing might take several minutes!" + return 0 +} + unfence_self() { # fence_node returns 0 on success, 1 on failure, 2 if unconfigured @@ -881,6 +888,8 @@ start() [ "$breakpoint" = "daemons" ] && exit 0 + fence_sanlock_check + runwrap unfence_self \ none \ "Unfencing self"

1 0

fence-agents: RHEL6 - fence_rhevm: fix typo in RE
by Marek Grác 09 Oct '12

09 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=825ca4f8… Commit: 825ca4f88958060fb408ba0e1798e1eef58426d3 Parent: a98e0b19e31a05e69c4347f6cd39714e8a2c72a3 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Tue Oct 9 11:21:06 2012 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Tue Oct 9 11:22:24 2012 +0200 fence_rhevm: fix typo in RE Resolves: rhbz#863568 --- fence/agents/rhevm/fence_rhevm.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fence/agents/rhevm/fence_rhevm.py b/fence/agents/rhevm/fence_rhevm.py index fa75030..4310dd0 100644 --- a/fence/agents/rhevm/fence_rhevm.py +++ b/fence/agents/rhevm/fence_rhevm.py @@ -12,7 +12,7 @@ BUILD_DATE="March, 2008" #END_VERSION_GENERATION -re_get_id = re.compile("<vm( .*)? id=\"(.*?)\"", re.IGNORECASE); +re_get_id = re.compile("<vm( .*)? id=\"(.*?)\"", re.IGNORECASE); re_status = re.compile("<state>(.*?)</state>", re.IGNORECASE); re_get_name = re.compile("<name>(.*?)</name>", re.IGNORECASE);

1 0

fence-agents: master - fence_rhevm: fix typo in RE
by Marek Grác 09 Oct '12

09 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=dd0e31de… Commit: dd0e31de6cd4dd6926effaee8824eccc79bbf2a1 Parent: 2233dbef63729fca7bd74ec4ef93b3a649e149f6 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Tue Oct 9 11:21:06 2012 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Tue Oct 9 11:21:06 2012 +0200 fence_rhevm: fix typo in RE Resolves: rhbz#863568 --- fence/agents/rhevm/fence_rhevm.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fence/agents/rhevm/fence_rhevm.py b/fence/agents/rhevm/fence_rhevm.py index fa75030..4310dd0 100644 --- a/fence/agents/rhevm/fence_rhevm.py +++ b/fence/agents/rhevm/fence_rhevm.py @@ -12,7 +12,7 @@ BUILD_DATE="March, 2008" #END_VERSION_GENERATION -re_get_id = re.compile("<vm( .*)? id=\"(.*?)\"", re.IGNORECASE); +re_get_id = re.compile("<vm( .*)? id=\"(.*?)\"", re.IGNORECASE); re_status = re.compile("<state>(.*?)</state>", re.IGNORECASE); re_get_name = re.compile("<name>(.*?)</name>", re.IGNORECASE);

1 0

cluster: RHEL6 - rgmanager: Fix a crash when dbus notifications are enabled
by Ryan McCabe 08 Oct '12

08 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=5fa8099c3dad1… Commit: 5fa8099c3dad18712941a5fbea1379a6e2ffdadd Parent: de7ae8fdcd3b46a23affbbe397f3e14462e0c905 Author: Ryan McCabe <rmccabe(a)redhat.com> AuthorDate: Fri May 18 07:30:31 2012 -0400 Committer: Ryan McCabe <rmccabe(a)redhat.com> CommitterDate: Mon Oct 8 10:27:42 2012 -0400 rgmanager: Fix a crash when dbus notifications are enabled dbus doesn't lock internal data unless dbus_threads_init is called. Acked-by: Lon Hohberger <lhh(a)redhat.com> Signed-off-by: Ryan McCabe <rmccabe(a)redhat.com> --- rgmanager/src/daemons/update-dbus.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/rgmanager/src/daemons/update-dbus.c b/rgmanager/src/daemons/update-dbus.c index e706746..474140e 100644 --- a/rgmanager/src/daemons/update-dbus.c +++ b/rgmanager/src/daemons/update-dbus.c @@ -69,6 +69,7 @@ rgm_dbus_init(void) return 0; } + dbus_threads_init_default(); dbus_error_init(&err); dbc = dbus_bus_get_private(DBUS_BUS_SYSTEM, &err);

1 0

fence-agents: RHEL6 - fence agents: Some agents do not support action=metadata on STDIN
by Marek Grác 08 Oct '12

08 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=a98e0b19… Commit: a98e0b19e31a05e69c4347f6cd39714e8a2c72a3 Parent: fec1c4b83857a302a8423ef2070977a7e900ca99 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Thu Jul 12 18:30:48 2012 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Mon Oct 8 14:06:51 2012 +0200 fence agents: Some agents do not support action=metadata on STDIN Resolves rhbz#837174 --- fence/agents/baytech/fence_baytech.pl | 9 +++++---- fence/agents/brocade/fence_brocade.pl | 5 +++++ fence/agents/bullpap/fence_bullpap.pl | 7 ++++++- fence/agents/cpint/fence_cpint.pl | 10 ++++++++++ fence/agents/drac/fence_drac.pl | 5 +++++ fence/agents/egenera/fence_egenera.pl | 9 +++++---- fence/agents/mcdata/fence_mcdata.pl | 7 ++++++- fence/agents/rackswitch/do_rack.c | 9 +++++++++ fence/agents/xcat/fence_xcat.pl | 5 +++++ fence/agents/zvm/fence_zvm.pl | 10 ++++++++++ 10 files changed, 66 insertions(+), 10 deletions(-) diff --git a/fence/agents/baytech/fence_baytech.pl b/fence/agents/baytech/fence_baytech.pl index c978ec5..e218b78 100644 --- a/fence/agents/baytech/fence_baytech.pl +++ b/fence/agents/baytech/fence_baytech.pl @@ -166,14 +166,15 @@ sub get_options fail_usage "Unkown parameter." if (@ARGV > 0); - if ((defined $opt_o) && ($opt_o =~ /metadata/i)) { - print_metadata(); - exit 0; - } } else { get_options_stdin(); } + if ((defined $opt_o) && ($opt_o =~ /metadata/i)) { + print_metadata(); + exit 0; + } + fail "failed: must specify hostname" unless defined $opt_a; $host=$opt_a; $port=23 unless ($opt_a =~ /:/); diff --git a/fence/agents/brocade/fence_brocade.pl b/fence/agents/brocade/fence_brocade.pl index e3d1612..e3f7290 100644 --- a/fence/agents/brocade/fence_brocade.pl +++ b/fence/agents/brocade/fence_brocade.pl @@ -162,6 +162,11 @@ if (@ARGV > 0) { } else { get_options_stdin(); + if ((defined $opt_o) && ($opt_o =~ /metadata/i)) { + print_metadata(); + exit 0; + } + fail "failed: no IP address" unless defined $opt_a; fail "failed: no plug number" unless defined $opt_n; fail "failed: no login name" unless defined $opt_l; diff --git a/fence/agents/bullpap/fence_bullpap.pl b/fence/agents/bullpap/fence_bullpap.pl index 3309c18..e31ab6d 100644 --- a/fence/agents/bullpap/fence_bullpap.pl +++ b/fence/agents/bullpap/fence_bullpap.pl @@ -179,7 +179,7 @@ sub get_options_stdin { $login = $val; } - elsif ($name eq "option" ) + elsif (($name eq "option" ) || ($name eq "action")) { $action = $val; } @@ -312,6 +312,11 @@ else { get_options_stdin(); + if ((defined $action) && ($action =~ /metadata/i)) { + print_metadata(); + exit 0; + } + fail "failed: no IP address" unless defined $host; fail "failed: no domain" unless defined $domain; fail "failed: no login name" unless defined $login; diff --git a/fence/agents/cpint/fence_cpint.pl b/fence/agents/cpint/fence_cpint.pl index d3c016a..eb2ad3a 100644 --- a/fence/agents/cpint/fence_cpint.pl +++ b/fence/agents/cpint/fence_cpint.pl @@ -142,6 +142,11 @@ sub get_options_stdin $opt_u = $val; } + elsif ($name eq "action" ) + { + $opt_o = $val; + } + else { print stderr "parse error: unknown option \"$opt\"\n"; @@ -166,6 +171,11 @@ if (@ARGV > 0){ } else { get_options_stdin(); + if ((defined $opt_o) && ($opt_o =~ /metadata/i)) { + print_metadata(); + exit 0; + } + fail "no userid" unless defined $opt_u; } diff --git a/fence/agents/drac/fence_drac.pl b/fence/agents/drac/fence_drac.pl index 825391f..b26fbcb 100644 --- a/fence/agents/drac/fence_drac.pl +++ b/fence/agents/drac/fence_drac.pl @@ -717,6 +717,11 @@ if (@ARGV > 0) { } else { get_options_stdin(); + if ((defined $action) && ($action =~ /metadata/i)) { + print_metadata(); + exit 0; + } + fail "failed: no IP address" unless defined $address; fail "failed: no login name" unless defined $login; diff --git a/fence/agents/egenera/fence_egenera.pl b/fence/agents/egenera/fence_egenera.pl index 30eaca1..308338b 100644 --- a/fence/agents/egenera/fence_egenera.pl +++ b/fence/agents/egenera/fence_egenera.pl @@ -139,10 +139,6 @@ if (@ARGV > 0) fail_usage "Unkown parameter." if (@ARGV > 0); - if ((defined $opt_o) && ($opt_o =~ /metadata/i)) { - print_metadata(); - exit 0; - } $cserv = $opt_c if defined $opt_c; $lpan = $opt_l if defined $opt_l; @@ -156,6 +152,11 @@ else get_options_stdin(); } +if (((defined $opt_o) && ($opt_o =~ /metadata/i)) || ((defined $action) && ($action =~ /metadata/i))) { + print_metadata(); + exit 0; +} + $action = "reboot" unless defined $action; $user = "root" unless defined $user; diff --git a/fence/agents/mcdata/fence_mcdata.pl b/fence/agents/mcdata/fence_mcdata.pl index a469a1c..5bc9dcf 100644 --- a/fence/agents/mcdata/fence_mcdata.pl +++ b/fence/agents/mcdata/fence_mcdata.pl @@ -176,7 +176,7 @@ sub get_options_stdin { $opt_l = $val; } - elsif ($name eq "option" ) + elsif (($name eq "option" ) || ($name eq "action")) { $opt_o = $val; } @@ -235,6 +235,11 @@ if (@ARGV > 0) { } else { get_options_stdin(); + if ((defined $opt_o) && ($opt_o =~ /metadata/i)) { + print_metadata(); + exit 0; + } + fail "failed: no IP address" unless defined $opt_a; fail "failed: no plug number" unless defined $opt_n; fail "failed: no login name" unless defined $opt_l; diff --git a/fence/agents/rackswitch/do_rack.c b/fence/agents/rackswitch/do_rack.c index 67d24a2..d8050bf 100644 --- a/fence/agents/rackswitch/do_rack.c +++ b/fence/agents/rackswitch/do_rack.c @@ -301,6 +301,15 @@ static void get_options(int argc, char **argv) strcpy(name, pname); if (!strcmp(arg, "ipaddr")) strcpy(ipaddr, value); + + if (!strcmp(arg, "action")) + if (strncasecmp(value, "metadata", 254) == 0) { + print_metadata(); + exit(DID_SUCCESS); + } else { + fprintf(stderr, "Only 'metadata' option is aviable for this fence agent\n"); + exit(DID_FAILURE); + } if (!strcmp(arg, "portnumber")) strcpy(portnumber, value); diff --git a/fence/agents/xcat/fence_xcat.pl b/fence/agents/xcat/fence_xcat.pl index f984ec1..3cd16aa 100644 --- a/fence/agents/xcat/fence_xcat.pl +++ b/fence/agents/xcat/fence_xcat.pl @@ -184,6 +184,11 @@ if (@ARGV > 0) { } else { get_options_stdin(); + if ((defined $opt_o) && ($opt_o =~ /metadata/i)) { + print_metadata(); + exit 0; + } + fail "failed: no plug number" unless defined $opt_n; $opt_o=lc($opt_o); fail "failed: unrecognised action: $opt_o" diff --git a/fence/agents/zvm/fence_zvm.pl b/fence/agents/zvm/fence_zvm.pl index e6386e4..04a29e2 100644 --- a/fence/agents/zvm/fence_zvm.pl +++ b/fence/agents/zvm/fence_zvm.pl @@ -299,6 +299,11 @@ sub get_options_stdin { $opt_r = $val; } + + elsif ($name eq "action") + { + $opt_o = $val; + } # FIXME -- depreicated residue of old fencing system elsif ($name eq "name" ) { } @@ -352,6 +357,11 @@ if (@ARGV > 0){ } else { get_options_stdin(); + if ((defined $opt_o) && ($opt_o =~ /metadata/i)) { + print_metadata(); + exit 0; + } + fail "no IP address" unless defined $opt_a; fail "no userid" unless defined $opt_u;

1 0

fence-agents: RHEL6 - fence_rhevm: Support new API used in RHEV-M 3.1
by Marek Grác 08 Oct '12

08 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=fec1c4b8… Commit: fec1c4b83857a302a8423ef2070977a7e900ca99 Parent: 99975a5ffa708a17139cc1d61234c650395197b5 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Mon Oct 8 10:52:46 2012 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Mon Oct 8 10:56:36 2012 +0200 fence_rhevm: Support new API used in RHEV-M 3.1 Resolves: rhbz#863568 --- fence/agents/rhevm/fence_rhevm.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fence/agents/rhevm/fence_rhevm.py b/fence/agents/rhevm/fence_rhevm.py index 3578b5f..fa75030 100644 --- a/fence/agents/rhevm/fence_rhevm.py +++ b/fence/agents/rhevm/fence_rhevm.py @@ -12,7 +12,7 @@ BUILD_DATE="March, 2008" #END_VERSION_GENERATION -re_get_id = re.compile("<vm id=\"(.*?)\"", re.IGNORECASE); +re_get_id = re.compile("<vm( .*)? id=\"(.*?)\"", re.IGNORECASE); re_status = re.compile("<state>(.*?)</state>", re.IGNORECASE); re_get_name = re.compile("<name>(.*?)</name>", re.IGNORECASE); @@ -29,7 +29,7 @@ def get_power_status(conn, options): # Unable to obtain ID needed to access virtual machine fail(EC_STATUS) - options["id"] = result.group(1); + options["id"] = result.group(2); re_status.search(res) result = re_status.search(res)

1 0

fence-agents: master - fence_rhevm: Support new API used in RHEV-M 3.1
by Marek Grác 08 Oct '12

08 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=2233dbef… Commit: 2233dbef63729fca7bd74ec4ef93b3a649e149f6 Parent: 582aa5f7f285e225928765fff50979154eafa138 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Mon Oct 8 10:52:46 2012 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Mon Oct 8 10:52:46 2012 +0200 fence_rhevm: Support new API used in RHEV-M 3.1 Resolves: rhbz#863568 --- fence/agents/rhevm/fence_rhevm.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fence/agents/rhevm/fence_rhevm.py b/fence/agents/rhevm/fence_rhevm.py index 3578b5f..fa75030 100644 --- a/fence/agents/rhevm/fence_rhevm.py +++ b/fence/agents/rhevm/fence_rhevm.py @@ -12,7 +12,7 @@ BUILD_DATE="March, 2008" #END_VERSION_GENERATION -re_get_id = re.compile("<vm id=\"(.*?)\"", re.IGNORECASE); +re_get_id = re.compile("<vm( .*)? id=\"(.*?)\"", re.IGNORECASE); re_status = re.compile("<state>(.*?)</state>", re.IGNORECASE); re_get_name = re.compile("<name>(.*?)</name>", re.IGNORECASE); @@ -29,7 +29,7 @@ def get_power_status(conn, options): # Unable to obtain ID needed to access virtual machine fail(EC_STATUS) - options["id"] = result.group(1); + options["id"] = result.group(2); re_status.search(res) result = re_status.search(res)

1 0

fence-agents: RHEL6 - fence_vmware_soap: Faster fencing, fix crash on VM without valid UUID
by Marek Grác 08 Oct '12

08 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=99975a5f… Commit: 99975a5ffa708a17139cc1d61234c650395197b5 Parent: 29063ac151e702fa184c2e201dd41652ff329da8 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Thu Sep 27 13:00:37 2012 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Mon Oct 8 10:36:04 2012 +0200 fence_vmware_soap: Faster fencing, fix crash on VM without valid UUID Improve speed of fencing by removing requests for attributes that are not needed. This change is significant when there are hundrens of VM on vSphere server. On the systems with <10 VM improvement is still about 20%. This patch also fixes situation when there are VM which do not have valid UUID. This can happend when P2V (physical to virtual machine process) failed. Patch was proposed by: Rodrigo A B Freire Resolves: rhbz#769798 --- fence/agents/vmware_soap/fence_vmware_soap.py | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/fence/agents/vmware_soap/fence_vmware_soap.py b/fence/agents/vmware_soap/fence_vmware_soap.py index 9bebd08..0da7f0d 100644 --- a/fence/agents/vmware_soap/fence_vmware_soap.py +++ b/fence/agents/vmware_soap/fence_vmware_soap.py @@ -44,9 +44,12 @@ def process_results(results, machines, uuid, mappingToUUID): info = {} for i in m.propSet: info[i.name] = i.val - machines[info["name"]] = (info["config.uuid"], info["summary.runtime.powerState"]) - uuid[info["config.uuid"]] = info["summary.runtime.powerState"] - mappingToUUID[m.obj.value] = info["config.uuid"] + # Prevent error KeyError: 'config.uuid' when reaching systems which P2V failed, + # since these systems don't have a valid UUID + if info.has_key("config.uuid"): + machines[info["name"]] = (info["config.uuid"], info["summary.runtime.powerState"]) + uuid[info["config.uuid"]] = info["summary.runtime.powerState"] + mappingToUUID[m.obj.value] = info["config.uuid"] return (machines, uuid, mappingToUUID) @@ -77,7 +80,7 @@ def get_power_status(conn, options): propSpec = conn.factory.create('ns0:PropertySpec') propSpec.all = False - propSpec.pathSet = ["name", "summary.runtime.powerState", "config.uuid", "summary", "config", "capability", "network"] + propSpec.pathSet = ["name", "summary.runtime.powerState", "config.uuid"] propSpec.type = "VirtualMachine" propFilterSpec = conn.factory.create('ns0:PropertyFilterSpec') @@ -101,6 +104,9 @@ def get_power_status(conn, options): machines.update(more_machines) uuid.update(more_uuid) mappingToUUID.update(more_mappingToUUID) + # Do not run unnecessary SOAP requests + if options.has_key("-U") and options["-U"] in uuid: + break if ["list", "monitor"].count(options["-o"]) == 1: return machines

1 0

cluster: STABLE32 - fenced: silence dbus error
by David Teigland 05 Oct '12

05 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=5a4cc0c888396… Commit: 5a4cc0c888396c4efc8d7f6ffffd0e960b5259cb Parent: 13b5aea8fb2fe7f7e59b049dc4c45e8777b2fbbb Author: David Teigland <teigland(a)redhat.com> AuthorDate: Fri Oct 5 10:19:35 2012 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Fri Oct 5 10:26:16 2012 -0500 fenced: silence dbus error Don't log unimportant error that worries people. bz 861340 Signed-off-by: David Teigland <teigland(a)redhat.com> --- fence/fenced/dbus.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fence/fenced/dbus.c b/fence/fenced/dbus.c index 5d1e1d5..9d7be2f 100644 --- a/fence/fenced/dbus.c +++ b/fence/fenced/dbus.c @@ -13,7 +13,7 @@ static DBusConnection *bus = NULL; void fd_dbus_init(void) { if (!(bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, NULL))) { - log_error("failed to get dbus connection"); + log_debug("failed to get dbus connection"); } else { log_debug("connected to dbus %s", dbus_bus_get_unique_name(bus)); }

1 0

cluster: RHEL6 - fenced: silence dbus error
by David Teigland 05 Oct '12

05 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=de7ae8fdcd3b4… Commit: de7ae8fdcd3b46a23affbbe397f3e14462e0c905 Parent: 8d3265089fcb45cb6653c2c6947f78ab9e996be5 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Fri Oct 5 10:19:35 2012 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Fri Oct 5 10:19:35 2012 -0500 fenced: silence dbus error Don't log unimportant error that worries people. bz 861340 Signed-off-by: David Teigland <teigland(a)redhat.com> --- fence/fenced/dbus.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fence/fenced/dbus.c b/fence/fenced/dbus.c index 5d1e1d5..9d7be2f 100644 --- a/fence/fenced/dbus.c +++ b/fence/fenced/dbus.c @@ -13,7 +13,7 @@ static DBusConnection *bus = NULL; void fd_dbus_init(void) { if (!(bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, NULL))) { - log_error("failed to get dbus connection"); + log_debug("failed to get dbus connection"); } else { log_debug("connected to dbus %s", dbus_bus_get_unique_name(bus)); }

1 0

fence-agents: the annotated tag v3.1.10 has been created
by Marek Grác 04 Oct '12

04 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=b5c493d1… Commit: b5c493d1db0b71fef9b8b639c7d6b1b76c9a512a Parent: 0000000000000000000000000000000000000000 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: 2012-10-04 14:20 +0000 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: 2012-10-04 14:20 +0000 annotated tag: v3.1.10 has been created at b5c493d1db0b71fef9b8b639c7d6b1b76c9a512a (tag) tagging 582aa5f7f285e225928765fff50979154eafa138 (commit) replaces v3.1.9 v3.1.10 release Fabio M. Di Nitto (1): eaton_snmp: add tested models Marek 'marx' Grac (3): fence_eaton_snmp: Fix default power-wait option value, remove support for -n switch:port fence_virsh: Support for using sudo for running virsh fence_vmware_soap: Faster fencing, fix crash on VM without valid UUID Masatake YAMATO (1): fence_kdump: Typo in fence_kdump_send man page. Ryan O'Hara (1): Add metadata to list of accepted actions.

1 0

fence-agents: RHEL6 - fence_ilo2 was not correctly cleaned by Makefile
by Marek Grác 04 Oct '12

04 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=29063ac1… Commit: 29063ac151e702fa184c2e201dd41652ff329da8 Parent: e1b648e6247e0b98e55a64d45d38c28464648a8c Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Thu Jul 26 14:35:44 2012 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Thu Oct 4 10:50:13 2012 +0200 fence_ilo2 was not correctly cleaned by Makefile Related: rhbz#800650 --- fence/agents/ilo/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fence/agents/ilo/Makefile.am b/fence/agents/ilo/Makefile.am index 120727a..8df9a39 100644 --- a/fence/agents/ilo/Makefile.am +++ b/fence/agents/ilo/Makefile.am @@ -20,4 +20,4 @@ include $(top_srcdir)/make/fencebuild.mk include $(top_srcdir)/make/fenceman.mk clean-local: clean-man - rm -f $(TARGET) + rm -f $(TARGET) $(SYMTARGET)

1 0

fence-agents: RHEL6 - Add fence agents specific for HP iLO2, iLO3, IMM and iDrac
by Marek Grác 04 Oct '12

04 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=e1b648e6… Commit: e1b648e6247e0b98e55a64d45d38c28464648a8c Parent: ce7859f3a34d76aaa8cb7361e7996c419904bc67 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Thu Jul 26 14:27:14 2012 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Thu Oct 4 10:49:37 2012 +0200 Add fence agents specific for HP iLO2, iLO3, IMM and iDrac These fence agents runs 'standard' fence agent (fence_ilo, fence_ipmilan) with correct timeout options, encryption, snmp_version, ... Originally they were supposed to be symbolic links but this approach is not recommended so they regular files. Resolves: rhbz#800650 --- fence/agents/ilo/Makefile.am | 10 ++++++++-- fence/agents/ilo/fence_ilo.py | 1 + fence/agents/ipmilan/Makefile.am | 11 +++++++++-- fence/agents/ipmilan/ipmilan.c | 10 ++++++++++ fence/agents/lib/fence2man.xsl | 4 ++++ fence/agents/lib/fencing.py.py | 3 +++ 6 files changed, 35 insertions(+), 4 deletions(-) diff --git a/fence/agents/ilo/Makefile.am b/fence/agents/ilo/Makefile.am index 7b44f59..120727a 100644 --- a/fence/agents/ilo/Makefile.am +++ b/fence/agents/ilo/Makefile.am @@ -2,13 +2,19 @@ MAINTAINERCLEANFILES = Makefile.in TARGET = fence_ilo +SYMTARGET = fence_ilo2 + SRC = $(TARGET).py EXTRA_DIST = $(SRC) -sbin_SCRIPTS = $(TARGET) +sbin_SCRIPTS = $(TARGET) $(SYMTARGET) + +man_MANS = $(TARGET).8 $(SYMTARGET).8 + +$(SYMTARGET): $(TARGET) + cp $^ $@ -man_MANS = $(TARGET).8 include $(top_srcdir)/make/fencebuild.mk include $(top_srcdir)/make/fenceman.mk diff --git a/fence/agents/ilo/fence_ilo.py b/fence/agents/ilo/fence_ilo.py index f70dc9c..d4e34df 100644 --- a/fence/agents/ilo/fence_ilo.py +++ b/fence/agents/ilo/fence_ilo.py @@ -82,6 +82,7 @@ The agent opens an SSL connection to the iLO card. Once the SSL \ connection is established, the agent is able to communicate with \ the iLO card through an XML stream." docs["vendorurl"] = "http://www.hp.com" + docs["symlink"] = [("fence_ilo2", "Fence agent for HP iLO2")] show_docs(options, docs) ## diff --git a/fence/agents/ipmilan/Makefile.am b/fence/agents/ipmilan/Makefile.am index 17ac8f2..c4fc636 100644 --- a/fence/agents/ipmilan/Makefile.am +++ b/fence/agents/ipmilan/Makefile.am @@ -2,15 +2,22 @@ MAINTAINERCLEANFILES = Makefile.in TARGET = fence_ipmilan +SYMTARGET = fence_ilo3 fence_imm fence_idrac + sbin_PROGRAMS = $(TARGET) +sbin_SCRIPTS = $(SYMTARGET) + noinst_HEADERS = expect.h fence_ipmilan_SOURCES = expect.c ipmilan.c -man_MANS = $(TARGET).8 +man_MANS = $(TARGET).8 $(SYMTARGET:%=%.8) + +$(SYMTARGET): $(TARGET) + cp $^ $@ include $(top_srcdir)/make/fencemanc.mk clean-local: clean-man - rm -f $(TARGET) + rm -f $(TARGET) $(SYMTARGET) diff --git a/fence/agents/ipmilan/ipmilan.c b/fence/agents/ipmilan/ipmilan.c index ef2b582..d1a0530 100644 --- a/fence/agents/ipmilan/ipmilan.c +++ b/fence/agents/ipmilan/ipmilan.c @@ -903,6 +903,9 @@ static void print_xml_metadata(char *pname) { printf("%s\n","<?xml version=\"1.0\" ?>"); printf("%s%s%s\n","<resource-agent name=\"",pname,"\" shortdesc=\"Fence agent for IPMI over LAN\">"); + printf("<symlink name=\"fence_ilo3\" shortdesc=\"Fence agent for HP iLO2\"/>\n"); + printf("<symlink name=\"fence_idrac\" shortdesc=\"Fence agent for Dell iDRAC\"/>\n"); + printf("<symlink name=\"fence_imm\" shortdesc=\"Fence agent for IBM Integrated Management Module\"/>\n"); printf("<longdesc>\n"); printf("fence_ipmilan is an I/O Fencing agent which can be used with " "machines controlled by IPMI. This agent calls support software " @@ -967,6 +970,7 @@ main(int argc, char **argv) int cipher=-1; int print_final_status=1; int translated_ret = -1; + char *filename; memset(ip, 0, sizeof(ip)); memset(authtype, 0, sizeof(authtype)); @@ -977,6 +981,12 @@ main(int argc, char **argv) memset(method, 0, sizeof(method)); memset(delay, 0, sizeof(delay)); + if (!strcmp(pname, "fence_ilo3")) { + lanplus = 1; + down_sleep = 4; + strncpy(method, "cycle\0", 6); + } + if (argc > 1) { /* Parse command line options if any were specified diff --git a/fence/agents/lib/fence2man.xsl b/fence/agents/lib/fence2man.xsl index 0fd71be..89baf7f 100644 --- a/fence/agents/lib/fence2man.xsl +++ b/fence/agents/lib/fence2man.xsl @@ -33,6 +33,10 @@ .TH FENCE_AGENT 8 2009-10-20 "<xsl:value-of select="@name"/> (Fence Agent)" .SH NAME <xsl:value-of select="@name" /> - <xsl:value-of select="@shortdesc" /> +<xsl:for-each select="symlink"> +.P +<xsl:value-of select="@name" /> - <xsl:value-of select="@shortdesc" /> (symlink) +</xsl:for-each> .SH DESCRIPTION .P <xsl:value-of select="longdesc"/> diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index a9c287a..cb8ec26 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -471,6 +471,9 @@ def metadata(avail_opt, options, docs): print "<?xml version=\"1.0\" ?>" print "<resource-agent name=\"" + os.path.basename(sys.argv[0]) + "\" shortdesc=\"" + docs["shortdesc"] + "\" >" + if "symlink" in docs: + for (symlink,desc) in docs["symlink"]: + print "<symlink name=\"" + symlink + "\" shortdesc=\"" + desc + "\"/>" print "<longdesc>" + docs["longdesc"] + "</longdesc>" if docs.has_key("vendorurl"): print "<vendor-url>" + docs["vendorurl"] + "</vendor-url>"

1 0

fence-agents: RHEL6 - fence_ipdu: Minor fixes to fence agent
by Marek Grác 04 Oct '12

04 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=ce7859f3… Commit: ce7859f3a34d76aaa8cb7361e7996c419904bc67 Parent: 0199cc9a5add0b4d3a6b0da1a5dcacba2539d232 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Mon Jul 23 11:24:43 2012 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Thu Oct 4 10:49:03 2012 +0200 fence_ipdu: Minor fixes to fence agent * replace code to use 'default' value * remove code for backward compatibility with old options (-n switch:port) Resolves: rhbz#740869 --- fence/agents/ipdu/fence_ipdu.py | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-) diff --git a/fence/agents/ipdu/fence_ipdu.py b/fence/agents/ipdu/fence_ipdu.py index 9c135e6..aac0b7d 100644 --- a/fence/agents/ipdu/fence_ipdu.py +++ b/fence/agents/ipdu/fence_ipdu.py @@ -49,7 +49,7 @@ def ipdu_set_device(conn,options): agents_dir={'.1.3.6.1.4.1.2.6.223':IBMiPDU, None:IBMiPDU} - # First resolve type of APC + # First resolve type of PDU device pdu_type=conn.walk(OID_SYS_OBJECT_ID) if (not ((len(pdu_type)==1) and (agents_dir.has_key(pdu_type[0][1])))): @@ -133,6 +133,7 @@ def get_outlets_status(conn, options): def ipdu_snmp_define_defaults(): all_opt["snmp_version"]["default"]="3" all_opt["community"]["default"]="private" + all_opt["switch"]["default"]="1" device=IBMiPDU # Main agent method @@ -152,16 +153,6 @@ def main(): options=check_input(device_opt,process_input(device_opt)) - ## Support for -n [switch]:[plug] notation that was used before - if ((options.has_key("-n")) and (-1 != options["-n"].find(":"))): - (switch, plug) = options["-n"].split(":", 1) - if ((switch.isdigit()) and (plug.isdigit())): - options["-s"] = switch - options["-n"] = plug - - if (not (options.has_key("-s"))): - options["-s"]="1" - docs = { } docs["shortdesc"] = "Fence agent for iPDU over SNMP" docs["longdesc"] = "fence_ipdu is an I/O Fencing agent \

1 0

fence-agents: RHEL6 - Add iPDU fencing agent for model 46M4002
by Marek Grác 04 Oct '12

04 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=0199cc9a… Commit: 0199cc9a5add0b4d3a6b0da1a5dcacba2539d232 Parent: 54278678366ab2be264d634fe17a305236200188 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Fri Jul 20 15:43:14 2012 -0400 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Thu Oct 4 10:48:27 2012 +0200 Add iPDU fencing agent for model 46M4002 Resolves: rhbz#740869 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> Signed-off-by: Marek 'marx' Grac <mgrac(a)redhat.com> --- .gitignore | 1 + configure.ac | 1 + fence/agents/ipdu/Makefile.am | 17 ++++ fence/agents/ipdu/fence_ipdu.py | 179 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 198 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 3a182d8..c1b028c 100644 --- a/.gitignore +++ b/.gitignore @@ -49,6 +49,7 @@ fence/agents/ifmib/fence_ifmib fence/agents/ilo/fence_ilo fence/agents/ilo_mp/fence_ilo_mp fence/agents/intelmodular/fence_intelmodular +fence/agents/ipdu/fence_ipdu fence/agents/ipmilan/fence_ipmilan fence/agents/ldom/fence_ldom fence/agents/lib/fencing.py diff --git a/configure.ac b/configure.ac index 3e71f43..ec0a368 100644 --- a/configure.ac +++ b/configure.ac @@ -264,6 +264,7 @@ AC_CONFIG_FILES([Makefile fence/agents/eps/Makefile fence/agents/hpblade/Makefile fence/agents/ibmblade/Makefile + fence/agents/ipdu/Makefile fence/agents/ifmib/Makefile fence/agents/ilo/Makefile fence/agents/ilo_mp/Makefile diff --git a/fence/agents/ipdu/Makefile.am b/fence/agents/ipdu/Makefile.am new file mode 100644 index 0000000..fb02cc8 --- /dev/null +++ b/fence/agents/ipdu/Makefile.am @@ -0,0 +1,17 @@ +MAINTAINERCLEANFILES = Makefile.in + +TARGET = fence_ipdu + +SRC = $(TARGET).py + +EXTRA_DIST = $(SRC) + +sbin_SCRIPTS = $(TARGET) + +man_MANS = $(TARGET).8 + +include $(top_srcdir)/make/fencebuild.mk +include $(top_srcdir)/make/fenceman.mk + +clean-local: clean-man + rm -f $(TARGET) diff --git a/fence/agents/ipdu/fence_ipdu.py b/fence/agents/ipdu/fence_ipdu.py new file mode 100644 index 0000000..9c135e6 --- /dev/null +++ b/fence/agents/ipdu/fence_ipdu.py @@ -0,0 +1,179 @@ +#!/usr/bin/python + +# The Following agent has been tested on: +# IBM iPDU model 46M4002 +# Firmware release OPDP_sIBM_v01.2_1 +# + +import sys, re, pexpect +sys.path.append("/usr/share/fence") +from fencing import * +from fencing_snmp import * + +#BEGIN_VERSION_GENERATION +RELEASE_VERSION="IBM iPDU SNMP fence agent" +REDHAT_COPYRIGHT="" +BUILD_DATE="" +#END_VERSION_GENERATION + +### CONSTANTS ### +# oid defining fence device +OID_SYS_OBJECT_ID='.1.3.6.1.2.1.1.2.0' + +### GLOBAL VARIABLES ### +# Device - see IBM iPDU +device=None + +# Port ID +port_id=None +# Switch ID +switch_id=None + +# Classes describing Device params +class IBMiPDU: + # iPDU + status_oid= '.1.3.6.1.4.1.2.6.223.8.2.2.1.11.%d' + control_oid= '.1.3.6.1.4.1.2.6.223.8.2.2.1.11.%d' + outlet_table_oid='.1.3.6.1.4.1.2.6.223.8.2.2.1.2' + ident_str="IBM iPDU" + state_on=1 + state_off=0 + turn_on=1 + turn_off=0 + has_switches=False + +### FUNCTIONS ### +def ipdu_set_device(conn,options): + global device + + agents_dir={'.1.3.6.1.4.1.2.6.223':IBMiPDU, + None:IBMiPDU} + + # First resolve type of APC + pdu_type=conn.walk(OID_SYS_OBJECT_ID) + + if (not ((len(pdu_type)==1) and (agents_dir.has_key(pdu_type[0][1])))): + pdu_type=[[None,None]] + + device=agents_dir[pdu_type[0][1]] + + conn.log_command("Trying %s"%(device.ident_str)) + +def ipdu_resolv_port_id(conn,options): + global port_id,switch_id,device + + if (device==None): + ipdu_set_device(conn,options) + + # Now we resolv port_id/switch_id + if ((options["-n"].isdigit()) and ((not device.has_switches) or (options["-s"].isdigit()))): + port_id=int(options["-n"]) + + if (device.has_switches): + switch_id=int(options["-s"]) + else: + table=conn.walk(device.outlet_table_oid,30) + + for x in table: + if (x[1].strip('"')==options["-n"]): + t=x[0].split('.') + if (device.has_switches): + port_id=int(t[len(t)-1]) + switch_id=int(t[len(t)-3]) + else: + port_id=int(t[len(t)-1]) + + if (port_id==None): + fail_usage("Can't find port with name %s!"%(options["-n"])) + +def get_power_status(conn,options): + global port_id,switch_id,device + + if (port_id==None): + ipdu_resolv_port_id(conn,options) + + oid=((device.has_switches) and device.status_oid%(switch_id,port_id) or device.status_oid%(port_id)) + + (oid,status)=conn.get(oid) + return (status==str(device.state_on) and "on" or "off") + +def set_power_status(conn, options): + global port_id,switch_id,device + + if (port_id==None): + ipdu_resolv_port_id(conn,options) + + oid=((device.has_switches) and device.control_oid%(switch_id,port_id) or device.control_oid%(port_id)) + + conn.set(oid,(options["-o"]=="on" and device.turn_on or device.turn_off)) + + +def get_outlets_status(conn, options): + global device + + result={} + + if (device==None): + ipdu_set_device(conn,options) + + res_ports=conn.walk(device.outlet_table_oid,30) + + for x in res_ports: + t=x[0].split('.') + + port_num=((device.has_switches) and "%s:%s"%(t[len(t)-3],t[len(t)-1]) or "%s"%(t[len(t)-1])) + + port_name=x[1].strip('"') + port_status="" + result[port_num]=(port_name,port_status) + + return result + +# Define new options +def ipdu_snmp_define_defaults(): + all_opt["snmp_version"]["default"]="3" + all_opt["community"]["default"]="private" + device=IBMiPDU + +# Main agent method +def main(): + device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", + "action", "ipaddr", "login", "passwd", "passwd_script", + "test", "port", "separator", "no_login", "no_password", + "snmp_version", "community", "snmp_auth_prot", "snmp_sec_level", + "snmp_priv_prot", "snmp_priv_passwd", "snmp_priv_passwd_script", + "udpport","inet4_only","inet6_only", + "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + + atexit.register(atexit_handler) + + snmp_define_defaults () + ipdu_snmp_define_defaults() + + options=check_input(device_opt,process_input(device_opt)) + + ## Support for -n [switch]:[plug] notation that was used before + if ((options.has_key("-n")) and (-1 != options["-n"].find(":"))): + (switch, plug) = options["-n"].split(":", 1) + if ((switch.isdigit()) and (plug.isdigit())): + options["-s"] = switch + options["-n"] = plug + + if (not (options.has_key("-s"))): + options["-s"]="1" + + docs = { } + docs["shortdesc"] = "Fence agent for iPDU over SNMP" + docs["longdesc"] = "fence_ipdu is an I/O Fencing agent \ +which can be used with the IBM iPDU network power switch. It logs \ +into a device via SNMP and reboots a specified outlet. It supports \ +SNMP v3 with all combinations of authenticity/privacy settings." + docs["vendorurl"] = "http://www.ibm.com" + show_docs(options, docs) + + # Operate the fencing device + result = fence_action(FencingSnmp(options), options, set_power_status, get_power_status, get_outlets_status) + + sys.exit(result) +if __name__ == "__main__": + main()

1 0

fence-agents: RHEL6 - build: fix dist_man_* vs man_*
by Marek Grác 04 Oct '12

04 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=54278678… Commit: 54278678366ab2be264d634fe17a305236200188 Parent: 64a3c22205f7ee8cd1eb8dcc7ab9aafe1c8e9ee6 Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Mon Jun 4 15:43:15 2012 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Thu Oct 4 10:47:00 2012 +0200 build: fix dist_man_* vs man_* those man pages should be generated at build time and not part of the release tarball Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- fence/agents/baytech/Makefile.am | 2 +- fence/agents/brocade/Makefile.am | 2 +- fence/agents/bullpap/Makefile.am | 2 +- fence/agents/cpint/Makefile.am | 2 +- fence/agents/drac/Makefile.am | 2 +- fence/agents/egenera/Makefile.am | 2 +- fence/agents/ipmilan/Makefile.am | 2 +- fence/agents/mcdata/Makefile.am | 2 +- fence/agents/rackswitch/Makefile.am | 4 ++-- fence/agents/vixel/Makefile.am | 2 +- fence/agents/xcat/Makefile.am | 2 +- fence/agents/zvm/Makefile.am | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/fence/agents/baytech/Makefile.am b/fence/agents/baytech/Makefile.am index 5288efa..c0b0b84 100644 --- a/fence/agents/baytech/Makefile.am +++ b/fence/agents/baytech/Makefile.am @@ -8,7 +8,7 @@ EXTRA_DIST = $(SRC) sbin_SCRIPTS = $(TARGET) -dist_man_MANS = $(TARGET).8 +man_MANS = $(TARGET).8 include $(top_srcdir)/make/fencebuild.mk include $(top_srcdir)/make/fencemanperl.mk diff --git a/fence/agents/brocade/Makefile.am b/fence/agents/brocade/Makefile.am index ed3394d..3338804 100644 --- a/fence/agents/brocade/Makefile.am +++ b/fence/agents/brocade/Makefile.am @@ -8,7 +8,7 @@ EXTRA_DIST = $(SRC) sbin_SCRIPTS = $(TARGET) -dist_man_MANS = $(TARGET).8 +man_MANS = $(TARGET).8 include $(top_srcdir)/make/fencebuild.mk include $(top_srcdir)/make/fencemanperl.mk diff --git a/fence/agents/bullpap/Makefile.am b/fence/agents/bullpap/Makefile.am index b454007..a602b5e 100644 --- a/fence/agents/bullpap/Makefile.am +++ b/fence/agents/bullpap/Makefile.am @@ -8,7 +8,7 @@ EXTRA_DIST = $(SRC) sbin_SCRIPTS = $(TARGET) -dist_man_MANS = $(TARGET).8 +man_MANS = $(TARGET).8 include $(top_srcdir)/make/fencebuild.mk include $(top_srcdir)/make/fencemanperl.mk diff --git a/fence/agents/cpint/Makefile.am b/fence/agents/cpint/Makefile.am index e9fee26..c9680bd 100644 --- a/fence/agents/cpint/Makefile.am +++ b/fence/agents/cpint/Makefile.am @@ -8,7 +8,7 @@ EXTRA_DIST = $(SRC) sbin_SCRIPTS = $(TARGET) -dist_man_MANS = $(TARGET).8 +man_MANS = $(TARGET).8 include $(top_srcdir)/make/fencebuild.mk include $(top_srcdir)/make/fencemanperl.mk diff --git a/fence/agents/drac/Makefile.am b/fence/agents/drac/Makefile.am index c9cdeda..392415f 100644 --- a/fence/agents/drac/Makefile.am +++ b/fence/agents/drac/Makefile.am @@ -8,7 +8,7 @@ EXTRA_DIST = $(SRC) sbin_SCRIPTS = $(TARGET) -dist_man_MANS = $(TARGET).8 +man_MANS = $(TARGET).8 include $(top_srcdir)/make/fencebuild.mk include $(top_srcdir)/make/fencemanperl.mk diff --git a/fence/agents/egenera/Makefile.am b/fence/agents/egenera/Makefile.am index 6cd82a6..c69f805 100644 --- a/fence/agents/egenera/Makefile.am +++ b/fence/agents/egenera/Makefile.am @@ -8,7 +8,7 @@ EXTRA_DIST = $(SRC) sbin_SCRIPTS = $(TARGET) -dist_man_MANS = $(TARGET).8 +man_MANS = $(TARGET).8 include $(top_srcdir)/make/fencebuild.mk include $(top_srcdir)/make/fencemanperl.mk diff --git a/fence/agents/ipmilan/Makefile.am b/fence/agents/ipmilan/Makefile.am index f237f92..17ac8f2 100644 --- a/fence/agents/ipmilan/Makefile.am +++ b/fence/agents/ipmilan/Makefile.am @@ -8,7 +8,7 @@ noinst_HEADERS = expect.h fence_ipmilan_SOURCES = expect.c ipmilan.c -dist_man_MANS = $(TARGET).8 +man_MANS = $(TARGET).8 include $(top_srcdir)/make/fencemanc.mk diff --git a/fence/agents/mcdata/Makefile.am b/fence/agents/mcdata/Makefile.am index f1a5939..54b64fc 100644 --- a/fence/agents/mcdata/Makefile.am +++ b/fence/agents/mcdata/Makefile.am @@ -8,7 +8,7 @@ EXTRA_DIST = $(SRC) sbin_SCRIPTS = $(TARGET) -dist_man_MANS = $(TARGET).8 +man_MANS = $(TARGET).8 include $(top_srcdir)/make/fencebuild.mk include $(top_srcdir)/make/fencemanperl.mk diff --git a/fence/agents/rackswitch/Makefile.am b/fence/agents/rackswitch/Makefile.am index d2c9e1f..8c435c0 100644 --- a/fence/agents/rackswitch/Makefile.am +++ b/fence/agents/rackswitch/Makefile.am @@ -8,9 +8,9 @@ noinst_HEADERS = do_rack.h fence_rackswitch_SOURCES = do_rack.c -dist_man_MANS = $(TARGET).8 +man_MANS = $(TARGET).8 include $(top_srcdir)/make/fencemanc.mk clean-local: clean-man - rm -f $(TARGET) \ No newline at end of file + rm -f $(TARGET) diff --git a/fence/agents/vixel/Makefile.am b/fence/agents/vixel/Makefile.am index 64d6010..3159e50 100644 --- a/fence/agents/vixel/Makefile.am +++ b/fence/agents/vixel/Makefile.am @@ -8,7 +8,7 @@ EXTRA_DIST = $(SRC) sbin_SCRIPTS = $(TARGET) -dist_man_MANS = $(TARGET).8 +man_MANS = $(TARGET).8 include $(top_srcdir)/make/fencebuild.mk include $(top_srcdir)/make/fencemanperl.mk diff --git a/fence/agents/xcat/Makefile.am b/fence/agents/xcat/Makefile.am index 27c289c..ef99def 100644 --- a/fence/agents/xcat/Makefile.am +++ b/fence/agents/xcat/Makefile.am @@ -8,7 +8,7 @@ EXTRA_DIST = $(SRC) sbin_SCRIPTS = $(TARGET) -dist_man_MANS = $(TARGET).8 +man_MANS = $(TARGET).8 include $(top_srcdir)/make/fencebuild.mk include $(top_srcdir)/make/fencemanperl.mk diff --git a/fence/agents/zvm/Makefile.am b/fence/agents/zvm/Makefile.am index 3ce3d82..2358d90 100644 --- a/fence/agents/zvm/Makefile.am +++ b/fence/agents/zvm/Makefile.am @@ -8,7 +8,7 @@ EXTRA_DIST = $(SRC) sbin_SCRIPTS = $(TARGET) -dist_man_MANS = $(TARGET).8 +man_MANS = $(TARGET).8 include $(top_srcdir)/make/fencebuild.mk include $(top_srcdir)/make/fencemanperl.mk

1 0

fence-agents: RHEL6 - fence_hpblade: Fence agent for HP BladeSystem
by Marek Grác 04 Oct '12

04 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=64a3c222… Commit: 64a3c22205f7ee8cd1eb8dcc7ab9aafe1c8e9ee6 Parent: ff4b840516ca20fbe55a002d162d27c189261e4f Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Thu May 31 14:57:10 2012 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Thu Oct 4 10:45:21 2012 +0200 fence_hpblade: Fence agent for HP BladeSystem New fence agent for HP BladeSystem enclosures. Be aware that you will have to set -c / cmd_prompt as it vary a lot. Resolves: rhbz#818337 --- configure.ac | 1 + fence/agents/hpblade/Makefile.am | 17 +++++ fence/agents/hpblade/fence_hpblade.py | 115 +++++++++++++++++++++++++++++++++ fence/agents/lib/fencing.py.py | 3 +- 4 files changed, 135 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index e979675..3e71f43 100644 --- a/configure.ac +++ b/configure.ac @@ -262,6 +262,7 @@ AC_CONFIG_FILES([Makefile fence/agents/eaton_snmp/Makefile fence/agents/egenera/Makefile fence/agents/eps/Makefile + fence/agents/hpblade/Makefile fence/agents/ibmblade/Makefile fence/agents/ifmib/Makefile fence/agents/ilo/Makefile diff --git a/fence/agents/hpblade/Makefile.am b/fence/agents/hpblade/Makefile.am new file mode 100644 index 0000000..e8ae6ff --- /dev/null +++ b/fence/agents/hpblade/Makefile.am @@ -0,0 +1,17 @@ +MAINTAINERCLEANFILES = Makefile.in + +TARGET = fence_hpblade + +SRC = $(TARGET).py + +EXTRA_DIST = $(SRC) + +sbin_SCRIPTS = $(TARGET) + +man_MANS = $(TARGET).8 + +include $(top_srcdir)/make/fencebuild.mk +include $(top_srcdir)/make/fenceman.mk + +clean-local: clean-man + rm -f $(TARGET) diff --git a/fence/agents/hpblade/fence_hpblade.py b/fence/agents/hpblade/fence_hpblade.py new file mode 100644 index 0000000..b4e9f1b --- /dev/null +++ b/fence/agents/hpblade/fence_hpblade.py @@ -0,0 +1,115 @@ +#!/usr/bin/python + +##### +## +## The Following Agent Has Been Tested On: +## * BladeSystem c7000 Enclosure +##### + +import sys, re, pexpect, exceptions +sys.path.append("@FENCEAGENTSLIBDIR@") +from fencing import * + +#BEGIN_VERSION_GENERATION +RELEASE_VERSION="New Bladecenter Agent - test release on steroids" +REDHAT_COPYRIGHT="" +BUILD_DATE="March, 2008" +#END_VERSION_GENERATION + +def get_power_status(conn, options): + try: + conn.send_eol("show server status " + options["-n"]) + conn.log_expect(options, options["-c"] , int(options["-Y"])) + + power_re = re.compile("^\s*Power: (.*?)\s*$") + status = "unknown" + for line in conn.before.splitlines(): + res = power_re.search(line) + if res != None: + status = res.group(1) + + if status == "unknown": + if options.has_key("-M"): + return "off" + else: + fail(EC_STATUS) + except pexpect.EOF: + fail(EC_CONNECTION_LOST) + except pexpect.TIMEOUT: + fail(EC_TIMED_OUT) + + return status.lower().strip() + +def set_power_status(conn, options): + try: + if options["-o"] == "on": + conn.send_eol("poweron server " + options["-n"]) + elif options["-o"] == "off": + conn.send_eol("poweroff server " + options["-n"] + " force") + conn.log_expect(options, options["-c"], int(options["-Y"])) + except pexpect.EOF: + fail(EC_CONNECTION_LOST) + except pexpect.TIMEOUT: + fail(EC_TIMED_OUT) + +def get_blades_list(conn, options): + outlets = { } + try: + conn.send_eol("show server list" ) + conn.log_expect(options, options["-c"], int(options["-Y"])) + + list_re = re.compile("^\s*(.*?)\s+(.*?)\s+(.*?)\s+OK\s+(.*?)\s+(.*?)\s*$") + for line in conn.before.splitlines(): + res = list_re.search(line) + if res != None: + outlets[res.group(1)] = (res.group(2), res.group(4).lower()) + except pexpect.EOF: + fail(EC_CONNECTION_LOST) + except pexpect.TIMEOUT: + fail(EC_TIMED_OUT) + + return outlets + +def main(): + device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", + "action", "ipaddr", "login", "passwd", "passwd_script", + "cmd_prompt", "secure", "port", "identity_file", "separator", + "inet4_only", "inet6_only", "ipport", "missing_as_off", + "power_timeout", "shell_timeout", "login_timeout", "power_wait"] + + atexit.register(atexit_handler) + + all_opt["cmd_prompt"]["default"] = "c7000oa>" + + options = check_input(device_opt, process_input(device_opt)) + + docs = { } + docs["shortdesc"] = "Fence agent for HP BladeSystem" + docs["longdesc"] = "fence_hpblade is an I/O Fencing agent \ +which can be used with HP BladeSystem. It logs into an enclosure via telnet or ssh \ +and uses the command line interface to power on and off blades." + docs["vendorurl"] = "http://www.hp.com" + show_docs(options, docs) + + ## + ## Operate the fencing device + ###### + options["eol"] = "\n" + conn = fence_login(options) + result = fence_action(conn, options, set_power_status, get_power_status, get_blades_list) + + ## + ## Logout from system + ###### + try: + conn.send_eol("exit") + conn.close() + except exceptions.OSError: + pass + except pexpect.ExceptionPexpect: + pass + + sys.exit(result) + +if __name__ == "__main__": + main() diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index 2a62242..a9c287a 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -867,7 +867,8 @@ def fence_login(options): if (options.has_key("-4")): force_ipvx="-4 " - options["eol"] = "\r\n" + if (options.has_key("eol") == False): + options["eol"] = "\r\n" ## Do the delay of the fence device before logging in ## Delay is important for two-node clusters fencing but we do not need to delay 'status' operations

1 0

fence-agents: RHEL6 - fence agents: autodetect of EOL in fence agents
by Marek Grác 04 Oct '12

04 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=ff4b8405… Commit: ff4b840516ca20fbe55a002d162d27c189261e4f Parent: 79a412372c3ef67077d55908d5873a94f5a4a0e5 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Mon May 21 11:12:41 2012 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Thu Oct 4 10:44:42 2012 +0200 fence agents: autodetect of EOL in fence agents Fence agents diffes in EOL they accept. EOL \r\n is quite universal but in some cases it is translated to \n\n what makes login process impossible to complete as it ends like (capitals are fence agent response) Login: USER\n Password: \n Login: PASSWORD\n Until now there was a device option that handles that login_eol_lf but we found out that there are few APC devices which does not work correctly with \r\n and needs \n. So we have to autodetect it, this feature was added to standard library. As it can also helps with common problem when you have to write exactly conn.send("message" + "\r\n"). Method conn.sendline("") uses EOL according to platform, so we have decided to create new method conn.send_eol("message") which uses correct EOL. We need conn.sendline in communication with other local application so we should not reuse it for this purpose. Resolves: rhbz#842314 --- fence/agents/alom/fence_alom.py | 6 ++-- fence/agents/apc/fence_apc.py | 44 ++++++++++++------------ fence/agents/bladecenter/fence_bladecenter.py | 18 +++++----- fence/agents/drac5/fence_drac5.py | 12 +++--- fence/agents/ilo_mp/fence_ilo_mp.py | 12 +++--- fence/agents/ldom/fence_ldom.py | 10 +++--- fence/agents/lib/fencing.py.py | 43 ++++++++++++++--------- fence/agents/rsa/fence_rsa.py | 6 ++-- fence/agents/rsb/fence_rsb.py | 10 +++--- fence/agents/sanbox2/fence_sanbox2.py | 32 +++++++++--------- fence/agents/wti/fence_wti.py | 2 +- 11 files changed, 102 insertions(+), 93 deletions(-) diff --git a/fence/agents/alom/fence_alom.py b/fence/agents/alom/fence_alom.py index 6223608..a964be5 100644 --- a/fence/agents/alom/fence_alom.py +++ b/fence/agents/alom/fence_alom.py @@ -18,7 +18,7 @@ BUILD_DATE="" def get_power_status(conn, options): result = "" try: - conn.sendline("showplatform") + conn.send_eol("showplatform") conn.log_expect(options, options["-c"], int(options["-Y"])) status = re.search("standby",conn.before.lower()) result=(status!=None and "off" or "on") @@ -32,7 +32,7 @@ def get_power_status(conn, options): def set_power_status(conn, options): try: cmd_line=(options["-o"]=="on" and "poweron" or "poweroff -f -y") - conn.sendline(cmd_line) + conn.send_eol(cmd_line) conn.log_expect(options, options["-c"],int(options["-g"])) #Get the machine some time between poweron and poweroff time.sleep(int(options["-g"])) @@ -73,7 +73,7 @@ agent which can be used with ALOM connected machines." # Logout from system try: - conn.sendline("logout") + conn.send_eol("logout") conn.close() except exceptions.OSError: pass diff --git a/fence/agents/apc/fence_apc.py b/fence/agents/apc/fence_apc.py index d10dd5f..61463d0 100644 --- a/fence/agents/apc/fence_apc.py +++ b/fence/agents/apc/fence_apc.py @@ -28,7 +28,7 @@ def get_power_status(conn, options): exp_result = 0 outlets = {} try: - conn.send("1\r\n") + conn.send_eol("1") conn.log_expect(options, options["-c"], int(options["-Y"])) version = 0 @@ -57,15 +57,15 @@ def get_power_status(conn, options): if switch == 0: if version == 2: if admin == 0: - conn.send("2\r\n") + conn.send_eol("2") else: - conn.send("3\r\n") + conn.send_eol("3") else: - conn.send("2\r\n") + conn.send_eol("2") conn.log_expect(options, options["-c"], int(options["-Y"])) - conn.send("1\r\n") + conn.send_eol("1") else: - conn.send(options["-s"]+"\r\n") + conn.send_eol(options["-s"]) while True: exp_result = conn.log_expect(options, [ options["-c"], "Press <ENTER>" ], int(options["-Y"])) @@ -75,7 +75,7 @@ def get_power_status(conn, options): res = show_re.search(x) if (res != None): outlets[res.group(2)] = (res.group(3), res.group(4)) - conn.send("\r\n") + conn.send_eol("") if exp_result == 0: break conn.send(chr(03)) @@ -102,7 +102,7 @@ def set_power_status(conn, options): }[options["-o"]] try: - conn.send("1\r\n") + conn.send_eol("1") conn.log_expect(options, options["-c"], int(options["-Y"])) version = 0 @@ -137,41 +137,41 @@ def set_power_status(conn, options): if switch == 0: if version == 2: if admin2 == 0: - conn.send("2\r\n") + conn.send_eol("2") else: - conn.send("3\r\n") + conn.send_eol("3") else: - conn.send("2\r\n") + conn.send_eol("2") conn.log_expect(options, options["-c"], int(options["-Y"])) if (None == re.compile('.*2- Outlet Restriction.*', re.IGNORECASE | re.S).match(conn.before)): admin3 = 0 else: admin3 = 1 - conn.send("1\r\n") + conn.send_eol("1") else: - conn.send(options["-s"] + "\r\n") + conn.send_eol(options["-s"]) while 1 == conn.log_expect(options, [ options["-c"], "Press <ENTER>" ], int(options["-Y"])): - conn.send("\r\n") - conn.send(options["-n"]+"\r\n") + conn.send_eol("") + conn.send_eol(options["-n"]+"") conn.log_expect(options, options["-c"], int(options["-Y"])) if switch == 0: if admin2 == 1: - conn.send("1\r\n") + conn.send_eol("1") conn.log_expect(options, options["-c"], int(options["-Y"])) if admin3 == 1: - conn.send("1\r\n") + conn.send_eol("1") conn.log_expect(options, options["-c"], int(options["-Y"])) else: - conn.send("1\r\n") + conn.send_eol("1") conn.log_expect(options, options["-c"], int(options["-Y"])) - conn.send(action+"\r\n") + conn.send_eol(action) conn.log_expect(options, "Enter 'YES' to continue or <ENTER> to cancel :", int(options["-Y"])) - conn.send("YES\r\n") + conn.send_eol("YES") conn.log_expect(options, "Press <ENTER> to continue...", int(options["-Y"])) - conn.send("\r\n") + conn.send_eol("") conn.log_expect(options, options["-c"], int(options["-Y"])) conn.send(chr(03)) conn.log_expect(options, "- Logout", int(options["-Y"])) @@ -230,7 +230,7 @@ will block any necessary fencing actions." ## a problem because everything is checked before. ###### try: - conn.sendline("4") + conn.send_eol("4") conn.close() except exceptions.OSError: pass diff --git a/fence/agents/bladecenter/fence_bladecenter.py b/fence/agents/bladecenter/fence_bladecenter.py index c699b75..958ceb0 100644 --- a/fence/agents/bladecenter/fence_bladecenter.py +++ b/fence/agents/bladecenter/fence_bladecenter.py @@ -26,7 +26,7 @@ def get_power_status(conn, options): try: node_cmd = "system:blade\[" + options["-n"] + "\]>" - conn.send("env -T system:blade[" + options["-n"] + "]\r\n") + conn.send_eol("env -T system:blade[" + options["-n"] + "]") i = conn.log_expect(options, [ node_cmd, "system>" ] , int(options["-Y"])) if i == 1: ## Given blade number does not exist @@ -34,10 +34,10 @@ def get_power_status(conn, options): return "off" else: fail(EC_STATUS) - conn.send("power -state\r\n") + conn.send_eol("power -state") conn.log_expect(options, node_cmd, int(options["-Y"])) status = conn.before.splitlines()[-1] - conn.send("env -T system\r\n") + conn.send_eol("env -T system") conn.log_expect(options, options["-c"], int(options["-Y"])) except pexpect.EOF: fail(EC_CONNECTION_LOST) @@ -55,7 +55,7 @@ def set_power_status(conn, options): try: node_cmd = "system:blade\[" + options["-n"] + "\]>" - conn.send("env -T system:blade[" + options["-n"] + "]\r\n") + conn.send_eol("env -T system:blade[" + options["-n"] + "]") i = conn.log_expect(options, [ node_cmd, "system>" ] , int(options["-Y"])) if i == 1: ## Given blade number does not exist @@ -64,9 +64,9 @@ def set_power_status(conn, options): else: fail(EC_GENERIC_ERROR) - conn.send("power -"+options["-o"]+"\r\n") + conn.send_eol("power -"+options["-o"]) conn.log_expect(options, node_cmd, int(options["-Y"])) - conn.send("env -T system\r\n") + conn.send_eol("env -T system") conn.log_expect(options, options["-c"], int(options["-Y"])) except pexpect.EOF: fail(EC_CONNECTION_LOST) @@ -78,9 +78,9 @@ def get_blades_list(conn, options): try: node_cmd = "system>" - conn.send("env -T system\r\n") + conn.send_eol("env -T system") conn.log_expect(options, node_cmd, int(options["-Y"])) - conn.send("list -l 2\r\n") + conn.send_eol("list -l 2") conn.log_expect(options, node_cmd, int(options["-Y"])) lines = conn.before.split("\r\n") @@ -130,7 +130,7 @@ and uses the command line interface to power on and off blades." ## Logout from system ###### try: - conn.send("exit\r\n") + conn.send_eol("exit") conn.close() except exceptions.OSError: pass diff --git a/fence/agents/drac5/fence_drac5.py b/fence/agents/drac5/fence_drac5.py index f3102cd..3e9a8d2 100644 --- a/fence/agents/drac5/fence_drac5.py +++ b/fence/agents/drac5/fence_drac5.py @@ -25,9 +25,9 @@ BUILD_DATE="March, 2008" def get_power_status(conn, options): try: if options["model"] == "DRAC CMC": - conn.sendline("racadm serveraction powerstatus -m " + options["-m"]) + conn.send_eol("racadm serveraction powerstatus -m " + options["-m"]) elif options["model"] == "DRAC 5": - conn.sendline("racadm serveraction powerstatus") + conn.send_eol("racadm serveraction powerstatus") conn.log_expect(options, options["-c"], int(options["-Y"])) except pexpect.EOF: @@ -49,9 +49,9 @@ def set_power_status(conn, options): try: if options["model"] == "DRAC CMC": - conn.sendline("racadm serveraction " + action + " -m " + options["-m"]) + conn.send_eol("racadm serveraction " + action + " -m " + options["-m"]) elif options["model"] == "DRAC 5": - conn.sendline("racadm serveraction " + action) + conn.send_eol("racadm serveraction " + action) conn.log_expect(options, options["-c"], int(options["-g"])) except pexpect.EOF: fail(EC_CONNECTION_LOST) @@ -63,7 +63,7 @@ def get_list_devices(conn, options): try: if options["model"] == "DRAC CMC": - conn.sendline("getmodinfo") + conn.send_eol("getmodinfo") list_re = re.compile("^([^\s]*?)\s+Present\s*(ON|OFF)\s*.*$") conn.log_expect(options, options["-c"], int(options["-g"])) @@ -133,7 +133,7 @@ By default, the telnet interface is not enabled." ## Logout from system ###### try: - conn.sendline("exit") + conn.send_eol("exit") time.sleep(1) conn.close() except exceptions.OSError: diff --git a/fence/agents/ilo_mp/fence_ilo_mp.py b/fence/agents/ilo_mp/fence_ilo_mp.py index 1618216..3af3048 100644 --- a/fence/agents/ilo_mp/fence_ilo_mp.py +++ b/fence/agents/ilo_mp/fence_ilo_mp.py @@ -12,7 +12,7 @@ BUILD_DATE="" def get_power_status(conn, options): try: - conn.send("show /system1\r\n") + conn.send_eol("show /system1") re_state = re.compile('EnabledState=(.*)', re.IGNORECASE) conn.log_expect(options, re_state, int(options["-Y"])) @@ -31,9 +31,9 @@ def get_power_status(conn, options): def set_power_status(conn, options): try: if options["-o"] == "on": - conn.send("start /system1\r\n") + conn.send_eol("start /system1") else: - conn.send("stop -f /system1\r\n") + conn.send_eol("stop -f /system1") conn.log_expect(options, options["-c"], int(options["-g"])) @@ -46,7 +46,7 @@ def set_power_status(conn, options): def main(): device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", "action", "ipaddr", "login", "passwd", "passwd_script", - "secure", "identity_file", "cmd_prompt", "ipport", "login_eol_lf", + "secure", "identity_file", "cmd_prompt", "ipport", "separator", "inet4_only", "inet6_only", "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] @@ -64,7 +64,7 @@ def main(): show_docs(options, docs) conn = fence_login(options) - conn.send("SMCLP\r\n") + conn.send_eol("SMCLP") ## ## Fence operations @@ -72,7 +72,7 @@ def main(): result = fence_action(conn, options, set_power_status, get_power_status) try: - conn.send("exit\r\n") + conn.send_eol("exit") except exceptions.OSError: pass except pexpect.ExceptionPexpect: diff --git a/fence/agents/ldom/fence_ldom.py b/fence/agents/ldom/fence_ldom.py index 507a97a..c971c04 100644 --- a/fence/agents/ldom/fence_ldom.py +++ b/fence/agents/ldom/fence_ldom.py @@ -22,11 +22,11 @@ COMMAND_PROMPT_NEW="[PEXPECT]" # Start comunicating after login. Prepare good environment. def start_communication(conn, options): - conn.sendline ("PS1='"+COMMAND_PROMPT_NEW+"'") + conn.send_eol ("PS1='"+COMMAND_PROMPT_NEW+"'") res=conn.expect([pexpect.TIMEOUT, COMMAND_PROMPT_REG],int(options["-Y"])) if res==0: #CSH stuff - conn.sendline("set prompt='"+COMMAND_PROMPT_NEW+"'") + conn.send_eol("set prompt='"+COMMAND_PROMPT_NEW+"'") conn.log_expect(options, COMMAND_PROMPT_REG,int(options["-Y"])) @@ -34,7 +34,7 @@ def get_power_status(conn, options): try: start_communication(conn,options) - conn.sendline("ldm ls") + conn.send_eol("ldm ls") conn.log_expect(options,COMMAND_PROMPT_REG,int(options["-Y"])) @@ -71,7 +71,7 @@ def set_power_status(conn, options): cmd_line="ldm "+(options["-o"]=="on" and "start" or "stop -f")+" \""+options["-n"]+"\"" - conn.sendline(cmd_line) + conn.send_eol(cmd_line) conn.log_expect(options,COMMAND_PROMPT_REG,int(options["-g"])) @@ -126,7 +126,7 @@ root. Than prompt is $, so again, you must use parameter -c." ## Logout from system ###### try: - conn.sendline("logout") + conn.send_eol("logout") conn.close() except exceptions.OSError: pass diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index 5748391..2a62242 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -175,11 +175,6 @@ all_opt = { "required" : "0", "shortdesc" : "Force ribcl version to use", "order" : 1 }, - "login_eol_lf" : { - "getopt" : "", - "help" : "", - "order" : 1 - }, "cmd_prompt" : { "getopt" : "c:", "longopt" : "command-prompt", @@ -407,12 +402,20 @@ all_opt = { common_opt = [ "retry_on", "delay" ] class fspawn(pexpect.spawn): + def __init__(self, options, command): + pexpect.spawn.__init__(self, command) + self.opt = options + def log_expect(self, options, pattern, timeout): result = self.expect(pattern, timeout) if options["log"] >= LOG_MODE_VERBOSE: options["debug_fh"].write(self.before + self.after) return result + # send EOL according to what was detected in login process (telnet) + def send_eol(self, message): + self.send(message + self.opt["eol"]) + def atexit_handler(): try: sys.stdout.close() @@ -864,10 +867,7 @@ def fence_login(options): if (options.has_key("-4")): force_ipvx="-4 " - if (options["device_opt"].count("login_eol_lf")): - login_eol = "\n" - else: - login_eol = "\r\n" + options["eol"] = "\r\n" ## Do the delay of the fence device before logging in ## Delay is important for two-node clusters fencing but we do not need to delay 'status' operations @@ -881,7 +881,7 @@ def fence_login(options): if options.has_key("-z"): command = '%s %s %s %s' % (SSL_PATH, force_ipvx, options["-a"], options["-u"]) try: - conn = fspawn(command) + conn = fspawn(options, command) except pexpect.ExceptionPexpect, ex: ## SSL telnet is part of the fencing package sys.stderr.write(str(ex) + "\n") @@ -891,7 +891,7 @@ def fence_login(options): if options.has_key("ssh_options"): command += ' ' + options["ssh_options"] try: - conn = fspawn(command) + conn = fspawn(options, command) except pexpect.ExceptionPexpect, ex: sys.stderr.write(str(ex) + "\n") sys.stderr.write("Due to limitations, binary dependencies on fence agents " @@ -920,7 +920,7 @@ def fence_login(options): if options.has_key("ssh_options"): command += ' ' + options["ssh_options"] try: - conn = fspawn(command) + conn = fspawn(options, command) except pexpect.ExceptionPexpect, ex: sys.stderr.write(str(ex) + "\n") sys.stderr.write("Due to limitations, binary dependencies on fence agents " @@ -939,7 +939,7 @@ def fence_login(options): fail_usage("Failed: You have to enter passphrase (-p) for identity file") else: try: - conn = fspawn(TELNET_PATH) + conn = fspawn(options, TELNET_PATH) conn.send("set binary\n") conn.send("open %s -%s\n"%(options["-a"], options["-u"])) except pexpect.ExceptionPexpect, ex: @@ -948,11 +948,20 @@ def fence_login(options): "are not in the spec file and must be installed separately." + "\n") sys.exit(EC_GENERIC_ERROR) - conn.log_expect(options, re_login, int(options["-y"])) - conn.send(options["-l"] + login_eol) - conn.log_expect(options, re_pass, int(options["-Y"])) + result = conn.log_expect(options, re_login, int(options["-y"])) + conn.send_eol(options["-l"]) + + ## automatically change end of line separator + screen = conn.read_nonblocking(size=100, timeout=int(options["-Y"])) + if (re_login.search(screen) != None): + options["eol"] = "\n" + conn.send_eol(options["-l"]) + result = conn.log_expect(options, re_pass, int(options["-y"])) + elif (re_pass.search(screen) == None): + conn.log_expect(options, re_pass, int(options["-Y"])) + try: - conn.send(options["-p"] + login_eol) + conn.send_eol(options["-p"]) conn.log_expect(options, options["-c"], int(options["-Y"])) except KeyError: fail(EC_PASSWORD_MISSING) diff --git a/fence/agents/rsa/fence_rsa.py b/fence/agents/rsa/fence_rsa.py index 845bddb..e9f87cd 100644 --- a/fence/agents/rsa/fence_rsa.py +++ b/fence/agents/rsa/fence_rsa.py @@ -19,7 +19,7 @@ BUILD_DATE="" def get_power_status(conn, options): try: - conn.send("power state\r\n") + conn.send_eol("power state") conn.log_expect(options, options["-c"], int(options["-Y"])) except pexpect.EOF: fail(EC_CONNECTION_LOST) @@ -36,7 +36,7 @@ def get_power_status(conn, options): def set_power_status(conn, options): try: - conn.send("power " + options["-o"] + "\r\n") + conn.send_eol("power " + options["-o"]) conn.log_expect(options, options["-c"], int(options["-g"])) except pexpect.EOF: fail(EC_CONNECTION_LOST) @@ -84,7 +84,7 @@ will block any necessary fencing actions." ## Logout from system ###### try: - conn.sendline("exit") + conn.send_eol("exit") conn.close() except exceptions.OSError: pass diff --git a/fence/agents/rsb/fence_rsb.py b/fence/agents/rsb/fence_rsb.py index fe1ec60..7ce1906 100755 --- a/fence/agents/rsb/fence_rsb.py +++ b/fence/agents/rsb/fence_rsb.py @@ -33,13 +33,13 @@ def set_power_status(conn, options): try: conn.send("2") conn.log_expect(options, options["-c"], int(options["-Y"])) - conn.sendline(action) + conn.send_eol(action) conn.log_expect(options, ["want to power off", "'yes' or 'no'"], int(options["-Y"])) - conn.send("yes\r") + conn.send_eol("yes") conn.log_expect(options, "any key to continue", int(options["-g"])) - conn.send("\r") + conn.send_eol("") conn.log_expect(options, options["-c"], int(options["-Y"])) - conn.sendline("0") + conn.send_eol("0") conn.log_expect(options, options["-c"], int(options["-Y"])) except pexpect.EOF: fail(EC_CONNECTION_LOST) @@ -100,7 +100,7 @@ will block any necessary fencing actions." ## a problem because everything is checked before. ###### try: - conn.sendline("0") + conn.send_eol("0") conn.close() except exceptions.OSError: pass diff --git a/fence/agents/sanbox2/fence_sanbox2.py b/fence/agents/sanbox2/fence_sanbox2.py index 47f3bc8..92c5d4a 100644 --- a/fence/agents/sanbox2/fence_sanbox2.py +++ b/fence/agents/sanbox2/fence_sanbox2.py @@ -24,14 +24,14 @@ def get_power_status(conn, options): 'offline' : "off" } try: - conn.send("show port " + options["-n"] + "\n") + conn.send_eol("show port " + options["-n"]) conn.log_expect(options, options["-c"], int(options["-Y"])) except pexpect.EOF: fail(EC_CONNECTION_LOST) except pexpect.TIMEOUT: try: - conn.send("admin end\n") - conn.send("exit\n") + conn.send_eol("admin end") + conn.send_eol("exit") conn.close() except: pass @@ -51,28 +51,28 @@ def set_power_status(conn, options): }[options["-o"]] try: - conn.send("set port " + options["-n"] + " state " + action + "\n") + conn.send_eol("set port " + options["-n"] + " state " + action) conn.log_expect(options, options["-c"], int(options["-g"])) except pexpect.EOF: fail(EC_CONNECTION_LOST) except pexpect.TIMEOUT: try: - conn.send("admin end\n") - conn.send("exit\n") + conn.send_eol("admin end") + conn.send_eol("exit") conn.close() except: pass fail(EC_TIMED_OUT) try: - conn.send("set port " + options["-n"] + " state " + action + "\n") + conn.send_eol("set port " + options["-n"] + " state " + action) conn.log_expect(options, options["-c"], int(options["-g"])) except pexpect.EOF: fail(EC_CONNECTION_LOST) except pexpect.TIMEOUT: try: - conn.send("admin end\n") - conn.send("exit\n") + conn.send_eol("admin end") + conn.send_eol("exit") conn.close() except: pass @@ -82,7 +82,7 @@ def get_list_devices(conn, options): outlets = { } try: - conn.send("show port" + "\n") + conn.send_eol("show port") conn.log_expect(options, options["-c"], int(options["-Y"])) list_re = re.compile("^\s+(\d+?)\s+(Online|Offline)\s+", re.IGNORECASE) @@ -98,8 +98,8 @@ def get_list_devices(conn, options): fail(EC_CONNECTION_LOST) except pexpect.TIMEOUT: try: - conn.send("admin end\n") - conn.send("exit\n") + conn.send_eol("admin end") + conn.send_eol("exit") conn.close() except: pass @@ -110,7 +110,7 @@ def get_list_devices(conn, options): def main(): device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", "io_fencing", "ipaddr", "login", "passwd", "passwd_script", - "cmd_prompt", "port", "ipport", "login_eol_lf", "separator", + "cmd_prompt", "port", "ipport", "separator", "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] atexit.register(atexit_handler) @@ -138,7 +138,7 @@ because the connection will block any necessary fencing actions." ## conn = fence_login(options) - conn.send("admin start\n") + conn.send_eol("admin start") conn.log_expect(options, options["-c"], int(options["-Y"])) if (re.search("$admin$", conn.before, re.MULTILINE) == None): @@ -153,8 +153,8 @@ because the connection will block any necessary fencing actions." ## Logout from system ###### try: - conn.send("admin end\n") - conn.send("exit\n") + conn.send_eol("admin end") + conn.send_eol("exit\n") conn.close() except exceptions.OSError: pass diff --git a/fence/agents/wti/fence_wti.py b/fence/agents/wti/fence_wti.py index 8caa4c2..b7c41f3 100644 --- a/fence/agents/wti/fence_wti.py +++ b/fence/agents/wti/fence_wti.py @@ -124,7 +124,7 @@ is running because the connection will block any necessary fencing actions." if 0 == options.has_key("-x"): try: try: - conn = fspawn(TELNET_PATH) + conn = fspawn(options, TELNET_PATH) conn.send("set binary\n") conn.send("open %s -%s\n"%(options["-a"], options["-u"])) except pexpect.ExceptionPexpect, ex:

1 0

fence-agents: RHEL6 - fence agents: Fix unique attribute for agents which are not based on fencing library
by Marek Grác 04 Oct '12

04 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=79a41237… Commit: 79a412372c3ef67077d55908d5873a94f5a4a0e5 Parent: fdb96874c75600864048a752c08aa1e45d2cc534 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Mon May 21 10:16:02 2012 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Thu Oct 4 10:41:25 2012 +0200 fence agents: Fix unique attribute for agents which are not based on fencing library Resolves: rhbz#822507 --- fence/agents/brocade/fence_brocade.pl | 14 +++++++------- fence/agents/drac/fence_drac.pl | 22 +++++++++++----------- fence/agents/egenera/fence_egenera.pl | 14 +++++++------- fence/agents/kdump/fence_kdump.c | 16 ++++++++-------- fence/agents/scsi/fence_scsi.pl | 12 ++++++------ 5 files changed, 39 insertions(+), 39 deletions(-) diff --git a/fence/agents/brocade/fence_brocade.pl b/fence/agents/brocade/fence_brocade.pl index c820779..e3d1612 100644 --- a/fence/agents/brocade/fence_brocade.pl +++ b/fence/agents/brocade/fence_brocade.pl @@ -84,37 +84,37 @@ After a fence operation has taken place the fenced machine can no longer connec </longdesc> <vendor-url>http://www.brocade.com</vendor-url> <parameters> - <parameter name="action" unique="1" required="1"> + <parameter name="action" unique="0" required="1"> <getopt mixed="-o <action>" /> <content type="string" default="disable" /> <shortdesc lang="en">Fencing Action</shortdesc> </parameter> - <parameter name="ipaddr" unique="1" required="1"> + <parameter name="ipaddr" unique="0" required="1"> <getopt mixed="-a <ip>" /> <content type="string" /> <shortdesc lang="en">IP Address or Hostname</shortdesc> </parameter> - <parameter name="login" unique="1" required="1"> + <parameter name="login" unique="0" required="1"> <getopt mixed="-l <name>" /> <content type="string" /> <shortdesc lang="en">Login Name</shortdesc> </parameter> - <parameter name="passwd" unique="1" required="0"> + <parameter name="passwd" unique="0" required="0"> <getopt mixed="-p <password>" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="1" required="0"> + <parameter name="passwd_script" unique="0" required="0"> <getopt mixed="-S <script>" /> <content type="string" /> <shortdesc lang="en">Script to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="1" required="1"> + <parameter name="port" unique="0" required="1"> <getopt mixed="-n <id>" /> <content type="string" /> <shortdesc lang="en">Physical plug number or name of virtual machine</shortdesc> </parameter> - <parameter name="help" unique="1" required="0"> + <parameter name="help" unique="0" required="0"> <getopt mixed="-h" /> <content type="string" /> <shortdesc lang="en">Display help and exit</shortdesc> diff --git a/fence/agents/drac/fence_drac.pl b/fence/agents/drac/fence_drac.pl index 5e1b966..825391f 100644 --- a/fence/agents/drac/fence_drac.pl +++ b/fence/agents/drac/fence_drac.pl @@ -143,57 +143,57 @@ fence_drac is an I/O Fencing agent which can be used with the Dell Remote Access </longdesc> <vendor-url>http://www.dell.com</vendor-url> <parameters> - <parameter name="action" unique="1" required="1"> + <parameter name="action" unique="0" required="1"> <getopt mixed="-o <action>" /> <content type="string" default="reboot" /> <shortdesc lang="en">Fencing Action</shortdesc> </parameter> - <parameter name="ipaddr" unique="1" required="1"> + <parameter name="ipaddr" unique="0" required="1"> <getopt mixed="-a <ip>" /> <content type="string" /> <shortdesc lang="en">IP Address or Hostname</shortdesc> </parameter> - <parameter name="login" unique="1" required="1"> + <parameter name="login" unique="0" required="1"> <getopt mixed="-l <name>" /> <content type="string" /> <shortdesc lang="en">Login Name</shortdesc> </parameter> - <parameter name="passwd" unique="1" required="0"> + <parameter name="passwd" unique="0" required="0"> <getopt mixed="-p <password>" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="1" required="0"> + <parameter name="passwd_script" unique="0" required="0"> <getopt mixed="-S <script>" /> <content type="string" /> <shortdesc lang="en">Script to retrieve password</shortdesc> </parameter> - <parameter name="cmd_prompt" unique="1" required="0"> + <parameter name="cmd_prompt" unique="0" required="0"> <getopt mixed="-c <prompt>" /> <content type="string" /> <shortdesc lang="en">Force fence_drac to use cmd_prompt as the command prompt</shortdesc> </parameter> - <parameter name="drac_version" unique="1" required="0"> + <parameter name="drac_version" unique="0" required="0"> <getopt mixed="-d <version>" /> <content type="string" /> <shortdesc lang="en">Force fence_drac to treat the device as though it was for the specified drac version</shortdesc> </parameter> - <parameter name="module_name" unique="1" required="0"> + <parameter name="module_name" unique="0" required="0"> <getopt mixed="-m <modulename>" /> <content type="string"/> <shortdesc lang="en">The module name of the blade when using DRAC/MC firmware.</shortdesc> </parameter> - <parameter name="debug" unique="1" required="0"> + <parameter name="debug" unique="0" required="0"> <getopt mixed="-D <dumpfile>" /> <content type="string"/> <shortdesc lang="en">Debug file of the telnet interaction</shortdesc> </parameter> - <parameter name="delay" unique="1" required="0"> + <parameter name="delay" unique="0" required="0"> <getopt mixed="-f <seconds>" /> <content type="string" default="0"/> <shortdesc lang="en">Wait X seconds before fencing is started</shortdesc> </parameter> - <parameter name="help" unique="1" required="0"> + <parameter name="help" unique="0" required="0"> <getopt mixed="-h" /> <content type="string" /> <shortdesc lang="en">Display help and exit</shortdesc> diff --git a/fence/agents/egenera/fence_egenera.pl b/fence/agents/egenera/fence_egenera.pl index 6270cee..30eaca1 100644 --- a/fence/agents/egenera/fence_egenera.pl +++ b/fence/agents/egenera/fence_egenera.pl @@ -83,37 +83,37 @@ fence_egenera is an I/O Fencing agent which can be used with the Egenera Blade </longdesc> <vendor-url>http://www.bull.com</vendor-url> <parameters> - <parameter name="action" unique="1" required="1"> + <parameter name="action" unique="0" required="1"> <getopt mixed="-o <action>" /> <content type="string" default="reboot" /> <shortdesc lang="en">Fencing Action</shortdesc> </parameter> - <parameter name="cserver" unique="1" required="1"> + <parameter name="cserver" unique="0" required="1"> <getopt mixed="-c <cserver>" /> <content type="string" /> <shortdesc lang="en">The cserver to ssh to. cserver can be in the form user@hostname to specify a different user to login as.</shortdesc> </parameter> - <parameter name="pserver" unique="1" required="1"> + <parameter name="pserver" unique="0" required="1"> <getopt mixed="-p <pserver>" /> <content type="string" /> <shortdesc lang="en">The pserver to operate on.</shortdesc> </parameter> - <parameter name="user" unique="1" required="1"> + <parameter name="user" unique="0" required="1"> <getopt mixed="-u <name>" /> <content type="string" default="root" /> <shortdesc lang="en">Login Name</shortdesc> </parameter> - <parameter name="lpan" unique="1" required="1"> + <parameter name="lpan" unique="0" required="1"> <getopt mixed="-l <lpan>" /> <content type="string" /> <shortdesc lang="en">The lpan to operate on.</shortdesc> </parameter> - <parameter name="delay" unique="1" required="0"> + <parameter name="delay" unique="0" required="0"> <getopt mixed="-f <seconds>" /> <content type="string" default="0"/> <shortdesc lang="en">Wait X seconds before fencing is started</shortdesc> </parameter> - <parameter name="help" unique="1" required="0"> + <parameter name="help" unique="0" required="0"> <getopt mixed="-h" /> <content type="string" /> <shortdesc lang="en">Display help and exit</shortdesc> diff --git a/fence/agents/kdump/fence_kdump.c b/fence/agents/kdump/fence_kdump.c index e224db3..fa1f6a4 100644 --- a/fence/agents/kdump/fence_kdump.c +++ b/fence/agents/kdump/fence_kdump.c @@ -181,56 +181,56 @@ do_action_metadata (const char *self) fprintf (stdout, "<parameters>\n"); - fprintf (stdout, "\t<parameter name=\"nodename\" unique=\"1\" required=\"0\">\n"); + fprintf (stdout, "\t<parameter name=\"nodename\" unique=\"0\" required=\"0\">\n"); fprintf (stdout, "\t\t<getopt mixed=\"-n, --nodename\" />\n"); fprintf (stdout, "\t\t<content type=\"string\" />\n"); fprintf (stdout, "\t\t<shortdesc lang=\"en\">%s</shortdesc>\n", "Name or IP address of node to be fenced"); fprintf (stdout, "\t</parameter>\n"); - fprintf (stdout, "\t<parameter name=\"ipport\" unique=\"1\" required=\"0\">\n"); + fprintf (stdout, "\t<parameter name=\"ipport\" unique=\"0\" required=\"0\">\n"); fprintf (stdout, "\t\t<getopt mixed=\"-p, --ipport\" />\n"); fprintf (stdout, "\t\t<content type=\"string\" default=\"7410\" />\n"); fprintf (stdout, "\t\t<shortdesc lang=\"en\">%s</shortdesc>\n", "Port number"); fprintf (stdout, "\t</parameter>\n"); - fprintf (stdout, "\t<parameter name=\"family\" unique=\"1\" required=\"0\">\n"); + fprintf (stdout, "\t<parameter name=\"family\" unique=\"0\" required=\"0\">\n"); fprintf (stdout, "\t\t<getopt mixed=\"-f, --family\" />\n"); fprintf (stdout, "\t\t<content type=\"string\" default=\"auto\" />\n"); fprintf (stdout, "\t\t<shortdesc lang=\"en\">%s</shortdesc>\n", "Network family"); fprintf (stdout, "\t</parameter>\n"); - fprintf (stdout, "\t<parameter name=\"action\" unique=\"1\" required=\"0\">\n"); + fprintf (stdout, "\t<parameter name=\"action\" unique=\"0\" required=\"0\">\n"); fprintf (stdout, "\t\t<getopt mixed=\"-o, --action\" />\n"); fprintf (stdout, "\t\t<content type=\"string\" default=\"off\" />\n"); fprintf (stdout, "\t\t<shortdesc lang=\"en\">%s</shortdesc>\n", "Fencing action"); fprintf (stdout, "\t</parameter>\n"); - fprintf (stdout, "\t<parameter name=\"timeout\" unique=\"1\" required=\"0\">\n"); + fprintf (stdout, "\t<parameter name=\"timeout\" unique=\"0\" required=\"0\">\n"); fprintf (stdout, "\t\t<getopt mixed=\"-t, --timeout\" />\n"); fprintf (stdout, "\t\t<content type=\"string\" default=\"60\" />\n"); fprintf (stdout, "\t\t<shortdesc lang=\"en\">%s</shortdesc>\n", "Timeout in seconds"); fprintf (stdout, "\t</parameter>\n"); - fprintf (stdout, "\t<parameter name=\"verbose\" unique=\"1\" required=\"0\">\n"); + fprintf (stdout, "\t<parameter name=\"verbose\" unique=\"0\" required=\"0\">\n"); fprintf (stdout, "\t\t<getopt mixed=\"-v, --verbose\" />\n"); fprintf (stdout, "\t\t<content type=\"boolean\" />\n"); fprintf (stdout, "\t\t<shortdesc lang=\"en\">%s</shortdesc>\n", "Print verbose output"); fprintf (stdout, "\t</parameter>\n"); - fprintf (stdout, "\t<parameter name=\"version\" unique=\"1\" required=\"0\">\n"); + fprintf (stdout, "\t<parameter name=\"version\" unique=\"0\" required=\"0\">\n"); fprintf (stdout, "\t\t<getopt mixed=\"-V, --version\" />\n"); fprintf (stdout, "\t\t<content type=\"boolean\" />\n"); fprintf (stdout, "\t\t<shortdesc lang=\"en\">%s</shortdesc>\n", "Print version"); fprintf (stdout, "\t</parameter>\n"); - fprintf (stdout, "\t<parameter name=\"usage\" unique=\"1\" required=\"0\">\n"); + fprintf (stdout, "\t<parameter name=\"usage\" unique=\"0\" required=\"0\">\n"); fprintf (stdout, "\t\t<getopt mixed=\"-h, --help\" />\n"); fprintf (stdout, "\t\t<content type=\"boolean\" />\n"); fprintf (stdout, "\t\t<shortdesc lang=\"en\">%s</shortdesc>\n", diff --git a/fence/agents/scsi/fence_scsi.pl b/fence/agents/scsi/fence_scsi.pl index 87a599c..ef7d14d 100644 --- a/fence/agents/scsi/fence_scsi.pl +++ b/fence/agents/scsi/fence_scsi.pl @@ -702,42 +702,42 @@ sub print_metadata () " shortdesc=\"fence agent for SCSI-3 persistent reservations\">\n"; print "<longdesc>fence_scsi</longdesc>\n"; print "<parameters>\n"; - print "\t<parameter name=\"aptpl\" unique=\"1\" required=\"0\">\n"; + print "\t<parameter name=\"aptpl\" unique=\"0\" required=\"0\">\n"; print "\t\t<getopt mixed=\"-a\"/>\n"; print "\t\t<content type=\"boolean\"/>\n"; print "\t\t<shortdesc lang=\"en\">" . "Use APTPL flag for registrations" . "</shortdesc>\n"; print "\t</parameter>\n"; - print "\t<parameter name=\"devices\" unique=\"1\" required=\"0\">\n"; + print "\t<parameter name=\"devices\" unique=\"0\" required=\"0\">\n"; print "\t\t<getopt mixed=\"-d\"/>\n"; print "\t\t<content type=\"string\"/>\n"; print "\t\t<shortdesc lang=\"en\">" . "List of devices to be used for fencing action" . "</shortdesc>\n"; print "\t</parameter>\n"; - print "\t<parameter name=\"logfile\" unique=\"1\" required=\"0\">\n"; + print "\t<parameter name=\"logfile\" unique=\"0\" required=\"0\">\n"; print "\t\t<getopt mixed=\"-f\"/>\n"; print "\t\t<content type=\"string\"/>\n"; print "\t\t<shortdesc lang=\"en\">" . "File to write error/debug messages" . "</shortdesc>\n"; print "\t</parameter>\n"; - print "\t<parameter name=\"key\" unique=\"1\" required=\"0\">\n"; + print "\t<parameter name=\"key\" unique=\"0\" required=\"0\">\n"; print "\t\t<getopt mixed=\"-k\"/>\n"; print "\t\t<content type=\"string\"/>\n"; print "\t\t<shortdesc lang=\"en\">" . "Key value to be used for fencing action" . "</shortdesc>\n"; print "\t</parameter>\n"; - print "\t<parameter name=\"action\" unique=\"1\" required=\"0\">\n"; + print "\t<parameter name=\"action\" unique=\"0\" required=\"0\">\n"; print "\t\t<getopt mixed=\"-o\"/>\n"; print "\t\t<content type=\"string\" default=\"off\"/>\n"; print "\t\t<shortdesc lang=\"en\">" . "Fencing action" . "</shortdesc>\n"; print "\t</parameter>\n"; - print "\t<parameter name=\"nodename\" unique=\"1\" required=\"0\">\n"; + print "\t<parameter name=\"nodename\" unique=\"0\" required=\"0\">\n"; print "\t\t<getopt mixed=\"-n\"/>\n"; print "\t\t<content type=\"string\"/>\n"; print "\t\t<shortdesc lang=\"en\">" .

1 0

cluster: RHEL6 - rgmanager: Fix for deadlock
by Ryan McCabe 03 Oct '12

03 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=8d3265089fcb4… Commit: 8d3265089fcb45cb6653c2c6947f78ab9e996be5 Parent: de3d3adfc52c0872e9576dc3119fc61d6fc414bb Author: Ryan McCabe <rmccabe(a)redhat.com> AuthorDate: Thu Sep 27 15:08:52 2012 -0400 Committer: Ryan McCabe <rmccabe(a)redhat.com> CommitterDate: Wed Oct 3 02:31:56 2012 -0400 rgmanager: Fix for deadlock This patch fixes a deadlock in rgmanager that could occur when a node starts rgmanager while a service is recovering. Resolves: rhbz#861157 Acked-by: Lon Hohberger <lhh(a)redhat.com> Signed-off-by: Ryan McCabe <rmccabe(a)redhat.com> --- rgmanager/src/daemons/rg_state.c | 1 + rgmanager/src/daemons/rg_thread.c | 19 ++++++++++++++++++- rgmanager/src/daemons/service_op.c | 1 + 3 files changed, 20 insertions(+), 1 deletions(-) diff --git a/rgmanager/src/daemons/rg_state.c b/rgmanager/src/daemons/rg_state.c index 8c5af5b..80e8667 100644 --- a/rgmanager/src/daemons/rg_state.c +++ b/rgmanager/src/daemons/rg_state.c @@ -1963,6 +1963,7 @@ retry: /* Deliberate */ case RG_EDEPEND: case RG_EFAIL: + case RG_EDEADLCK: /* Uh oh - we failed to relocate to this node. ensure that we tell the next node to start it from the 'recovering' state. */ diff --git a/rgmanager/src/daemons/rg_thread.c b/rgmanager/src/daemons/rg_thread.c index 72b5f96..5e551c3 100644 --- a/rgmanager/src/daemons/rg_thread.c +++ b/rgmanager/src/daemons/rg_thread.c @@ -9,6 +9,8 @@ #include <rg_queue.h> #include <assert.h> #include <members.h> +#include <liblogthread.h> + /** * Resource thread list entry. @@ -735,13 +737,28 @@ rt_enqueue_request(const char *resgroupname, int request, ret = 0; break; } - fprintf(stderr, "Failed to queue request: Would block\n"); /* EWOULDBLOCK */ pthread_mutex_unlock(resgroup->rt_queue_mutex); pthread_mutex_unlock(&reslist_mutex); + logt_print(LOG_DEBUG, + "Failed to queue %d request for %s: Would block\n", + request, resgroupname); return ret; } + if (resgroup->rt_request == RG_START && + (request == RG_START_REMOTE || request == RG_START_RECOVER)) { + send_ret(response_ctx, resgroup->rt_name, RG_EDEADLCK, + request, 0); + msg_free_ctx(response_ctx); + pthread_mutex_unlock(resgroup->rt_queue_mutex); + pthread_mutex_unlock(&reslist_mutex); + logt_print(LOG_DEBUG, + "Failed to queue %d request for %s: Would block\n", + request, resgroupname); + return -1; + } + ret = rq_queue_request(resgroup->rt_queue, resgroup->rt_name, request, 0, 0, response_ctx, 0, target, arg0, arg1); diff --git a/rgmanager/src/daemons/service_op.c b/rgmanager/src/daemons/service_op.c index f094129..4b74427 100644 --- a/rgmanager/src/daemons/service_op.c +++ b/rgmanager/src/daemons/service_op.c @@ -62,6 +62,7 @@ service_op_start(char *svcName, ++dep; continue; case RG_EFAIL: + case RG_EDEADLCK: ++fail; continue; case RG_EABORT:

1 0

cluster: STABLE32 - Revert "rgmanager: Fix for services stuck in recovery"
by Ryan McCabe 02 Oct '12

02 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=13b5aea8fb2fe… Commit: 13b5aea8fb2fe7f7e59b049dc4c45e8777b2fbbb Parent: b17d6ffc82e75553cfee7c2fd21d3bbdac0d1e86 Author: Ryan McCabe <rmccabe(a)redhat.com> AuthorDate: Tue Oct 2 13:59:45 2012 -0400 Committer: Ryan McCabe <rmccabe(a)redhat.com> CommitterDate: Tue Oct 2 13:59:45 2012 -0400 Revert "rgmanager: Fix for services stuck in recovery" This reverts commit 03e2215bd277fd79b8a6ee70a49de711e0f343ad. Commit b17d6ffc82e75553cfee7c2fd21d3bbdac0d1e86 contains a better fix for the problem this was trying to solve. Signed-off-by: Ryan McCabe <rmccabe(a)redhat.com> --- rgmanager/src/daemons/groups.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/rgmanager/src/daemons/groups.c b/rgmanager/src/daemons/groups.c index 0caa33e..4a22dca 100644 --- a/rgmanager/src/daemons/groups.c +++ b/rgmanager/src/daemons/groups.c @@ -736,8 +736,7 @@ eval_groups(int local, uint32_t nodeid, int nodeStatus) (svcStatus.rs_state == RG_STATE_STARTED || svcStatus.rs_state == RG_STATE_RECOVER || svcStatus.rs_state == RG_STATE_STARTING || - svcStatus.rs_state == RG_STATE_STOPPING || - svcStatus.rs_state == RG_STATE_ERROR)) { + svcStatus.rs_state == RG_STATE_STOPPING )) { logt_print(LOG_DEBUG, "Marking %s on down member %d as stopped", @@ -779,8 +778,7 @@ eval_groups(int local, uint32_t nodeid, int nodeStatus) /* Disabled/failed/in recovery? Do nothing */ if ((svcStatus.rs_state == RG_STATE_DISABLED) || (svcStatus.rs_state == RG_STATE_FAILED) || - (svcStatus.rs_state == RG_STATE_RECOVER) || - (svcStatus.rs_state == RG_STATE_ERROR)) { + (svcStatus.rs_state == RG_STATE_RECOVER)) { continue; }

1 0

cluster: RHEL59 - Revert "rgmanager: Fix for services stuck in recovery"
by Ryan McCabe 02 Oct '12

02 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=432045a49e493… Commit: 432045a49e4930e6f1c406f6f279c608655dac04 Parent: 321427f22fba4a073e814db3468ade553d6dac24 Author: Ryan McCabe <rmccabe(a)redhat.com> AuthorDate: Tue Oct 2 11:42:15 2012 -0400 Committer: Ryan McCabe <rmccabe(a)redhat.com> CommitterDate: Tue Oct 2 11:42:15 2012 -0400 Revert "rgmanager: Fix for services stuck in recovery" This reverts commit 467d015c53e5e2d00025708cda95b3df41ebda1f. The patch in commit 321427f22fba4a073e814db3468ade553d6dac24 better solves the issue this patch tried to address. Signed-off-by: Ryan McCabe <rmccabe(a)redhat.com> --- rgmanager/src/daemons/groups.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/rgmanager/src/daemons/groups.c b/rgmanager/src/daemons/groups.c index bd406c8..20ed2e1 100644 --- a/rgmanager/src/daemons/groups.c +++ b/rgmanager/src/daemons/groups.c @@ -747,8 +747,7 @@ eval_groups(int local, uint32_t nodeid, int nodeStatus) (svcStatus.rs_state == RG_STATE_STARTED || svcStatus.rs_state == RG_STATE_RECOVER || svcStatus.rs_state == RG_STATE_STARTING || - svcStatus.rs_state == RG_STATE_STOPPING || - svcStatus.rs_state == RG_STATE_ERROR)) { + svcStatus.rs_state == RG_STATE_STOPPING )) { clulog(LOG_DEBUG, "Marking %s on down member %d as stopped", @@ -790,8 +789,7 @@ eval_groups(int local, uint32_t nodeid, int nodeStatus) /* Disabled/failed/in recovery? Do nothing */ if ((svcStatus.rs_state == RG_STATE_DISABLED) || (svcStatus.rs_state == RG_STATE_FAILED) || - (svcStatus.rs_state == RG_STATE_RECOVER) || - (svcStatus.rs_state == RG_STATE_ERROR)) { + (svcStatus.rs_state == RG_STATE_RECOVER)) { continue; }

1 0

cluster: RHEL59 - rgmanager: Fix for deadlock
by Ryan McCabe 02 Oct '12

02 Oct '12

Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=321427f22fba4… Commit: 321427f22fba4a073e814db3468ade553d6dac24 Parent: c404f3305d156a89232c1f8294aadd23fdd2a15f Author: Ryan McCabe <rmccabe(a)redhat.com> AuthorDate: Mon Oct 1 11:28:35 2012 -0400 Committer: Ryan McCabe <rmccabe(a)redhat.com> CommitterDate: Mon Oct 1 11:31:55 2012 -0400 rgmanager: Fix for deadlock This patch fixes a deadlock in rgmanager that could occur when a node starts rgmanager while a service is recovering. Resolves: rhbz#834459 Acked-by: Lon Hohberger <lhh(a)redhat.com> Signed-off-by: Ryan McCabe <rmccabe(a)redhat.com> --- rgmanager/src/daemons/rg_state.c | 1 + rgmanager/src/daemons/rg_thread.c | 17 ++++++++++++++++- rgmanager/src/daemons/service_op.c | 1 + 3 files changed, 18 insertions(+), 1 deletions(-) diff --git a/rgmanager/src/daemons/rg_state.c b/rgmanager/src/daemons/rg_state.c index 9000f1b..b447cb3 100644 --- a/rgmanager/src/daemons/rg_state.c +++ b/rgmanager/src/daemons/rg_state.c @@ -2009,6 +2009,7 @@ retry: /* Deliberate */ case RG_EDEPEND: case RG_EFAIL: + case RG_EDEADLCK: /* Uh oh - we failed to relocate to this node. ensure that we tell the next node to start it from the 'recovering' state. */ diff --git a/rgmanager/src/daemons/rg_thread.c b/rgmanager/src/daemons/rg_thread.c index 769ca1e..60bf0c6 100644 --- a/rgmanager/src/daemons/rg_thread.c +++ b/rgmanager/src/daemons/rg_thread.c @@ -23,6 +23,7 @@ #include <rg_queue.h> #include <assert.h> #include <members.h> +#include <clulog.h> /** * Resource thread list entry. @@ -749,13 +750,27 @@ rt_enqueue_request(const char *resgroupname, int request, msg_free_ctx(response_ctx); break; } - fprintf(stderr, "Failed to queue request: Would block\n"); + pthread_mutex_unlock(resgroup->rt_queue_mutex); + pthread_mutex_unlock(&reslist_mutex); + clulog(LOG_DEBUG, "Failed to queue request: Would block\n"); /* EWOULDBLOCK */ + return -1; + } + + if (resgroup->rt_request == RG_START && + (request == RG_START_REMOTE || request == RG_START_RECOVER)) { + send_ret(response_ctx, resgroup->rt_name, RG_EDEADLCK, + request, 0); + msg_free_ctx(response_ctx); pthread_mutex_unlock(resgroup->rt_queue_mutex); pthread_mutex_unlock(&reslist_mutex); + clulog(LOG_DEBUG, + "Failed to queue %d request for %s: Would block\n", + request, resgroupname); return -1; } + ret = rq_queue_request(resgroup->rt_queue, resgroup->rt_name, request, 0, 0, response_ctx, 0, target, arg0, arg1); diff --git a/rgmanager/src/daemons/service_op.c b/rgmanager/src/daemons/service_op.c index 2ea59f9..bf0e1fc 100644 --- a/rgmanager/src/daemons/service_op.c +++ b/rgmanager/src/daemons/service_op.c @@ -82,6 +82,7 @@ service_op_start(char *svcName, ++dep; continue; case RG_EFAIL: + case RG_EDEADLCK: ++fail; continue; case RG_EABORT:

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

cluster-commits October 2012