cluster-commits December 2012

cluster-commits@lists.stg.fedorahosted.org

6 participants
21 discussions

gfs2-utils: master - fsck.gfs2: Detect and fix mismatch in GFS1 formal inode number
by Bob Peterson 21 Dec '12

21 Dec '12

Gitweb: http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=efd9859b14… Commit: efd9859b14143d5c124bba686a6bc19983d29e42 Parent: 506995267a25075634a1427ec5960b5b98f7556a Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Wed Dec 19 09:09:27 2012 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Thu Dec 20 14:31:24 2012 -0600 fsck.gfs2: Detect and fix mismatch in GFS1 formal inode number This patch adds code to fsck.gfs2 that checks and fixes GFS1 formal inode numbers. In GFS1 only, the formal inode number is supposed to match the block address. If it doesn't, it's a problem that should be fixed. If the problem goes undetected, further conversions to GFS2 via the gfs2_convert tool will treat the dinode as not being GFS1, which, in turn, yields the wrong type number in the dirent. This causes the file in question to be improperly treated (by gfs2_convert) as a GFS2 fifo (DT_FIFO==1) rather than a GFS1 file (GFS_FILE_REG==1). The end result is something like this, from pass2 in fsck.gfs2, after the gfs2_convert: Type 'fifo' in dir entry (lost_file_20431, 20431/0x4fcf) conflicts with type 'file' in dinode. (Dir entry is stale.) rhbz#888053 --- gfs2/fsck/pass1.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/gfs2/fsck/pass1.c b/gfs2/fsck/pass1.c index 0f80f87..540f2a9 100644 --- a/gfs2/fsck/pass1.c +++ b/gfs2/fsck/pass1.c @@ -1311,6 +1311,23 @@ static int handle_di(struct gfs2_sbd *sdp, struct gfs2_buffer_head *bh) (unsigned long long)block, (unsigned long long)block); } + if (sdp->gfs1 && ip->i_di.di_num.no_formal_ino != block) { + log_err( _("Inode #%llu (0x%llx): GFS1 formal inode number " + "mismatch: was %llu (0x%llx)\n"), + (unsigned long long)block, (unsigned long long)block, + (unsigned long long)ip->i_di.di_num.no_formal_ino, + (unsigned long long)ip->i_di.di_num.no_formal_ino); + if (query( _("Fix formal inode number in inode #%llu" + " (0x%llx)? (y/n) "), (unsigned long long)block, + (unsigned long long)block)) { + ip->i_di.di_num.no_formal_ino = block; + bmodified(ip->i_bh); + } else + log_err( _("Inode number in inode at block #%lld " + "(0x%llx) not fixed\n"), + (unsigned long long)block, + (unsigned long long)block); + } error = handle_ip(sdp, ip); fsck_inode_put(&ip); return error;

1 0

gfs2-utils: master - gfs2_convert: mask out proper bits when identifying symlinks
by Bob Peterson 21 Dec '12

21 Dec '12

Gitweb: http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=506995267a… Commit: 506995267a25075634a1427ec5960b5b98f7556a Parent: caeb3efcb35b19c2a251cece2e59e13774baa108 Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Wed Dec 19 07:47:15 2012 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Thu Dec 20 14:31:17 2012 -0600 gfs2_convert: mask out proper bits when identifying symlinks This patch masks out the proper file type bit in order to distinguish files from symlinks. Include stat.h defines: So the check for "di_mode & S_IFLNK" will match regular files, not just symlinks. The problem was that gfs2_convert was matching regular files and treating them as symlinks, which destroyed the di_blocks field in the dinode. The patch also has some minor cleanups. rhbz#887374 --- gfs2/convert/gfs2_convert.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/gfs2/convert/gfs2_convert.c b/gfs2/convert/gfs2_convert.c index aa1d5aa..72c974f 100644 --- a/gfs2/convert/gfs2_convert.c +++ b/gfs2/convert/gfs2_convert.c @@ -830,7 +830,6 @@ static int has_cdpn(const char *str) static int fix_cdpn_symlink(struct gfs2_sbd *sbp, struct gfs2_buffer_head *bh, struct gfs2_inode *ip) { - int ret = 0; char *linkptr = NULL; if (ip->i_di.di_height != 0) @@ -851,7 +850,7 @@ static int fix_cdpn_symlink(struct gfs2_sbd *sbp, struct gfs2_buffer_head *bh, s (osi_list_t *)&cdpns_to_fix); } - return ret; + return 0; } /* @@ -866,7 +865,7 @@ static int fix_cdpn_symlink(struct gfs2_sbd *sbp, struct gfs2_buffer_head *bh, s */ static int fix_xattr(struct gfs2_sbd *sbp, struct gfs2_buffer_head *bh, struct gfs2_inode *ip) { - int ret = 0, len, old_hdr_sz, new_hdr_sz; + int len, old_hdr_sz, new_hdr_sz; struct gfs2_buffer_head *eabh; char *buf; @@ -890,7 +889,7 @@ static int fix_xattr(struct gfs2_sbd *sbp, struct gfs2_buffer_head *bh, struct g } brelse(eabh); - return ret; + return 0; } /* ------------------------------------------------------------------------- */ @@ -913,8 +912,8 @@ static int adjust_inode(struct gfs2_sbd *sbp, struct gfs2_buffer_head *bh) inode_was_gfs1 = (inode->i_di.di_num.no_formal_ino == inode->i_di.di_num.no_addr); /* Fix the inode number: */ - inode->i_di.di_num.no_formal_ino = sbp->md.next_inum; ; - + inode->i_di.di_num.no_formal_ino = sbp->md.next_inum; + /* Fix the inode type: gfs1 uses di_type, gfs2 uses di_mode. */ inode->i_di.di_mode &= ~S_IFMT; switch (inode->i_di.__pad1) { /* formerly di_type */ @@ -981,7 +980,7 @@ static int adjust_inode(struct gfs2_sbd *sbp, struct gfs2_buffer_head *bh) if (adjust_indirect_blocks(sbp, inode)) return -1; /* Check for cdpns */ - if (inode->i_di.di_mode & S_IFLNK) { + if (S_ISLNK(inode->i_di.di_mode)) { ret = fix_cdpn_symlink(sbp, bh, inode); if (ret) return -1;

1 0

gfs2-utils: master - gfs2_convert: clear out old di_mode before setting it
by Bob Peterson 21 Dec '12

21 Dec '12

Gitweb: http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=caeb3efcb3… Commit: caeb3efcb35b19c2a251cece2e59e13774baa108 Parent: fd9ccf25cadd901079a6a801b098c606223375d2 Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Tue Dec 18 14:14:08 2012 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Thu Dec 20 14:31:11 2012 -0600 gfs2_convert: clear out old di_mode before setting it This patch clears the dinode 'di_mode' inode type field before setting it based on the GFS1 value. In rare circumstances (e.g. fsck.gfs2 ran on a GFS1 file system and created lost+found with both GFS1 and GFS2 data) di_mode might have an old value. In these cases, simply doing a logical 'or' with the correct value produces an invalid value. Zeroing it out beforehand ensures it is set correctly based on the GFS1 type. rhbz#888053 --- gfs2/convert/gfs2_convert.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/gfs2/convert/gfs2_convert.c b/gfs2/convert/gfs2_convert.c index a38bbff..aa1d5aa 100644 --- a/gfs2/convert/gfs2_convert.c +++ b/gfs2/convert/gfs2_convert.c @@ -916,6 +916,7 @@ static int adjust_inode(struct gfs2_sbd *sbp, struct gfs2_buffer_head *bh) inode->i_di.di_num.no_formal_ino = sbp->md.next_inum; ; /* Fix the inode type: gfs1 uses di_type, gfs2 uses di_mode. */ + inode->i_di.di_mode &= ~S_IFMT; switch (inode->i_di.__pad1) { /* formerly di_type */ case GFS_FILE_DIR: /* directory */ inode->i_di.di_mode |= S_IFDIR;

1 0

gfs2-utils: master - gfs2_convert: calculate height 1 for small files that were once big
by Bob Peterson 21 Dec '12

21 Dec '12

Gitweb: http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=fd9ccf25ca… Commit: fd9ccf25cadd901079a6a801b098c606223375d2 Parent: e7820f91c1b5bf5dbe5966dcf0b982df0d3e4ba7 Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Mon Dec 17 15:11:34 2012 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Thu Dec 20 14:31:05 2012 -0600 gfs2_convert: calculate height 1 for small files that were once big This patch changes function calc_gfs2_tree_height so that it gives a height of 1 to small files that once were big. The problems here is with files that were once big (needed two levels of indirection (height 2)) and then are truncated to a tiny non-zero size (ordinarily, they would be stuffed, but due to the growth followed by truncate, they're still at height 2). The required GFS2 height is zero, whereas the GFS1 height is 2. After the conversion the file will not really be stuffed, because function fix_metatree will unstuff the dinode as part of its conversion. So at least it will be at height 1. The problem is that if we don't fix the 0 height to its proper value of 1, fix_ind_reg_or_dir gets called with gfs2_hgt=0, which then calls mp_gfs1_to_gfs2, which then tries to set: gfs2factor[gfs2_h - 1] = 1ull. This results in a negative index of the array. rhbz#887374 --- gfs2/convert/gfs2_convert.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/gfs2/convert/gfs2_convert.c b/gfs2/convert/gfs2_convert.c index 36ca1a3..a38bbff 100644 --- a/gfs2/convert/gfs2_convert.c +++ b/gfs2/convert/gfs2_convert.c @@ -272,6 +272,12 @@ static unsigned int calc_gfs2_tree_height(struct gfs2_inode *ip, uint64_t size) for (height = 0; height < max; height++) if (arr[height] >= size) break; + /* If calc_gfs2_tree_height was called, the dinode is not stuffed or + we would have returned before this point. After the call, a call is + made to fix_metatree, which unstuffs the dinode. Therefore, the + smallest height that can result after this call is 1. */ + if (!height) + height = 1; return height; }

1 0

gfs2-utils: master - gfs2_convert: Use proper header size when reordering meta pointers
by Bob Peterson 21 Dec '12

21 Dec '12

Gitweb: http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=e7820f91c1… Commit: e7820f91c1b5bf5dbe5966dcf0b982df0d3e4ba7 Parent: b180bc7302d47319674be977d1d621405eca406f Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Mon Dec 17 15:01:02 2012 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Thu Dec 20 14:30:58 2012 -0600 gfs2_convert: Use proper header size when reordering meta pointers This patch changes function fix_metatree to use a proper metadata header size. Before, it was using sizeof(struct gfs2_meta_header). That's correct in almost all cases. But if you make a big file, such that it goes into height==2 (two levels of indirection), then truncate the file back to where it only would normally only need height==1, then run gfs2_convert, it gets into trouble. That's because you have a small file size, which calculates a much smaller number of GFS2 pointers needed, due to the truncation. Function fix_metatree will ensure at least one level of indirection by unstuffing the converted dinode, but we need to start pushing out the pointers onto the dinode's buffer, and for that, we need to calculate the right header size. rhbz#887374 --- gfs2/convert/gfs2_convert.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/gfs2/convert/gfs2_convert.c b/gfs2/convert/gfs2_convert.c index 61d1504..36ca1a3 100644 --- a/gfs2/convert/gfs2_convert.c +++ b/gfs2/convert/gfs2_convert.c @@ -356,7 +356,8 @@ static void fix_metatree(struct gfs2_sbd *sbp, struct gfs2_inode *ip, gfs2_meta_header_out(&mh, bh); } - hdrsize = sizeof(struct gfs2_meta_header); + hdrsize = blk->height ? sizeof(struct gfs2_meta_header) : + sizeof(struct gfs2_dinode); if (amount > sbp->bsize - hdrsize - ptramt) amount = sbp->bsize - hdrsize - ptramt;

1 0

gfs2-utils: master - gfs2_convert: remember number of blocks when converting quotas
by Bob Peterson 21 Dec '12

21 Dec '12

Gitweb: http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=b180bc7302… Commit: b180bc7302d47319674be977d1d621405eca406f Parent: 606330ca9fec696123c075da069b0790811aa58d Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Mon Dec 17 14:56:16 2012 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Thu Dec 20 14:30:52 2012 -0600 gfs2_convert: remember number of blocks when converting quotas This patch changes function copy_quotas so that it properly copies the di_blocks field from the GFS1 quotas file to its new GFS2 file. If the quota file had a non-trivial size, gfs2_convert was copying all the data and pointers, but not properly setting the di_blocks. This ordinarily isn't tragic because the file is never deleted, but it did flag fsck.gfs2 errors. rhbz#887374 --- gfs2/convert/gfs2_convert.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/gfs2/convert/gfs2_convert.c b/gfs2/convert/gfs2_convert.c index 095f4ed..61d1504 100644 --- a/gfs2/convert/gfs2_convert.c +++ b/gfs2/convert/gfs2_convert.c @@ -2084,6 +2084,7 @@ static void copy_quotas(struct gfs2_sbd *sdp) nq_ip->i_di.di_height = oq_ip->i_di.di_height; nq_ip->i_di.di_size = oq_ip->i_di.di_size; + nq_ip->i_di.di_blocks = oq_ip->i_di.di_blocks; memcpy(nq_ip->i_bh->b_data + sizeof(struct gfs2_dinode), oq_ip->i_bh->b_data + sizeof(struct gfs2_dinode), sdp->bsize - sizeof(struct gfs2_dinode));

1 0

gfs2-utils: master - gfs2_convert: mark buffer dirty when switching dirs from meta to data
by Bob Peterson 21 Dec '12

21 Dec '12

Gitweb: http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=606330ca9f… Commit: 606330ca9fec696123c075da069b0790811aa58d Parent: e59fbaad61d1a2b8286fa6ea3d37975fa21de64a Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Mon Dec 17 14:47:50 2012 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Thu Dec 20 14:30:45 2012 -0600 gfs2_convert: mark buffer dirty when switching dirs from meta to data This patch changes function inode_renumber so that it properly marks the rgrp bitmap dirty after switching bits from "meta" to "data". This happens when directory leaf, hash table, eattr, etc. blocks come in from GFS1 as "meta" and need to be switched to GFS2 as "data". In GFS2, only dinodes get the "meta" designation. This conversion was taking place, but the code broke out of the loop before properly marking the buffer as modified. So if no other modifications were done to that bitmap, the bitmap change would be forgotten. rhbz#887374 --- gfs2/convert/gfs2_convert.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/gfs2/convert/gfs2_convert.c b/gfs2/convert/gfs2_convert.c index da5c7dd..095f4ed 100644 --- a/gfs2/convert/gfs2_convert.c +++ b/gfs2/convert/gfs2_convert.c @@ -1074,10 +1074,10 @@ static int inode_renumber(struct gfs2_sbd *sbp, uint64_t root_inode_addr, osi_li ~(0x03 << (GFS2_BIT_SIZE * byte_bit)); rgd->bh[blk]->b_data[buf_offset + bitmap_byte] |= (0x01 << (GFS2_BIT_SIZE * byte_bit)); + bmodified(rgd->bh[blk]); break; } bitmap_byte -= (sbp->bsize - buf_offset); - bmodified(rgd->bh[blk]); } } brelse(bh);

1 0

gfs2-utils: master - gfs2_convert: mark rgrp bitmaps dirty when converting
by Bob Peterson 21 Dec '12

21 Dec '12

Gitweb: http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=e59fbaad61… Commit: e59fbaad61d1a2b8286fa6ea3d37975fa21de64a Parent: 41991d08c42ff779d26143598d0835e88ab24f65 Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Mon Dec 17 14:43:04 2012 -0600 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Thu Dec 20 14:30:37 2012 -0600 gfs2_convert: mark rgrp bitmaps dirty when converting This patch changes gfs2_convert function convert_bitmaps so that it marks the affected rgrp buffers as modified when bitmap bits are switched from unlinked metadata to free blocks. rhbz#887374 --- gfs2/convert/gfs2_convert.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/gfs2/convert/gfs2_convert.c b/gfs2/convert/gfs2_convert.c index b5d993d..da5c7dd 100644 --- a/gfs2/convert/gfs2_convert.c +++ b/gfs2/convert/gfs2_convert.c @@ -198,8 +198,10 @@ static void convert_bitmaps(struct gfs2_sbd *sdp, struct rgrp_tree *rg) for (y = 0; y < GFS2_NBBY; y++) { state = (rg->bh[blk]->b_data[x] >> (GFS2_BIT_SIZE * y)) & 0x03; - if (state == 0x02) /* unallocated metadata state invalid */ + if (state == 0x02) {/* unallocated metadata state invalid */ rg->bh[blk]->b_data[x] &= ~(0x02 << (GFS2_BIT_SIZE * y)); + bmodified(rg->bh[blk]); + } } } }/* convert_bitmaps */

1 0

fence-agents: RHEL6 - fence_scsi: Fix on_target attibute in metadata
by rohara 20 Dec '12

20 Dec '12

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=e0b9090c… Commit: e0b9090cac46a1010f7b57f7aef9412753a312b6 Parent: 069a3de2ff46c8c43aad437cd636049c91e14737 Author: Ryan O'Hara <rohara(a)redhat.com> AuthorDate: Thu Dec 20 11:55:30 2012 -0600 Committer: Ryan O'Hara <rohara(a)redhat.com> CommitterDate: Thu Dec 20 11:55:30 2012 -0600 fence_scsi: Fix on_target attibute in metadata The "on_target" attribute should be associated with the on action, not the metadata action. Signed-off-by: Ryan O'Hara <rohara(a)redhat.com> --- fence/agents/scsi/fence_scsi.pl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fence/agents/scsi/fence_scsi.pl b/fence/agents/scsi/fence_scsi.pl index 60923f2..45cfe22 100644 --- a/fence/agents/scsi/fence_scsi.pl +++ b/fence/agents/scsi/fence_scsi.pl @@ -746,10 +746,10 @@ sub print_metadata () print "\t</parameter>\n"; print "</parameters>\n"; print "<actions>\n"; - print "\t<action name=\"on\"/>\n"; + print "\t<action name=\"on\" on_target=\"1\"/>\n"; print "\t<action name=\"off\"/>\n"; print "\t<action name=\"status\"/>\n"; - print "\t<action name=\"metadata\" on_target=\"1\"/>\n"; + print "\t<action name=\"metadata\"/>\n"; print "</actions>\n"; print "</resource-agent>\n";

1 0

fence-agents: RHEL6 - fence_scsi: allow action=metadata via STDIN
by rohara 20 Dec '12

20 Dec '12

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=069a3de2… Commit: 069a3de2ff46c8c43aad437cd636049c91e14737 Parent: 825ca4f88958060fb408ba0e1798e1eef58426d3 Author: Ryan O'Hara <rohara(a)redhat.com> AuthorDate: Thu Dec 20 11:41:11 2012 -0600 Committer: Ryan O'Hara <rohara(a)redhat.com> CommitterDate: Thu Dec 20 11:41:11 2012 -0600 fence_scsi: allow action=metadata via STDIN Resolves: rhbz#837174 Signed-off-by: Ryan O'Hara <rohara(a)redhat.com> --- fence/agents/scsi/fence_scsi.pl | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/fence/agents/scsi/fence_scsi.pl b/fence/agents/scsi/fence_scsi.pl index ef7d14d..60923f2 100644 --- a/fence/agents/scsi/fence_scsi.pl +++ b/fence/agents/scsi/fence_scsi.pl @@ -749,7 +749,7 @@ sub print_metadata () print "\t<action name=\"on\"/>\n"; print "\t<action name=\"off\"/>\n"; print "\t<action name=\"status\"/>\n"; - print "\t<action name=\"metadata\"/>\n"; + print "\t<action name=\"metadata\" on_target=\"1\"/>\n"; print "</actions>\n"; print "</resource-agent>\n"; @@ -763,16 +763,16 @@ if (@ARGV > 0) { print_usage if (defined $opt_h); print_version if (defined $opt_V); - - ## handle the metadata action here to avoid other parameter checks - ## - if ($opt_o =~ /^metadata$/i) { - print_metadata; - } } else { get_options_stdin (); } +## handle the metadata action here to avoid other parameter checks +## +if ($opt_o =~ /^metadata$/i) { + print_metadata; +} + ## if the logfile (-f) parameter was specified, open the logfile ## and redirect STDOUT and STDERR to the logfile. ##

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

cluster-commits December 2012