cluster-commits July 2010

cluster-commits@lists.fedorahosted.org

9 participants
175 discussions

cluster: STABLE3 - Make gfs2_edit show bit-to-block translation when viewing bitmaps
by Bob Peterson 28 Jul '10

28 Jul '10

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=06… Commit: 0697d629bf2908b0ea09caf974352410762a566e Parent: 83d827ee2ee5bf1d333e979cd6a21d746b00f287 Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Wed Jul 28 10:43:22 2010 -0500 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Wed Jul 28 15:13:39 2010 -0500 Make gfs2_edit show bit-to-block translation when viewing bitmaps This patch makes the gfs2_edit utility show the blocks and block allocation values associated with the highlighted byte when walking through the rgrp bitmaps in hex mode. This means you can simply walk your cursor to any given byte of any given bitmap and see which four blocks are represented by that byte in the bitmap, and whether each of them is free, data, metadata, or unlinked. --- gfs2/edit/hexedit.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++-- gfs2/libgfs2/rgrp.c | 6 +++++ 2 files changed, 66 insertions(+), 3 deletions(-) diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c index 408b763..cfc3634 100644 --- a/gfs2/edit/hexedit.c +++ b/gfs2/edit/hexedit.c @@ -497,7 +497,7 @@ int display_block_type(int from_restore) break; case GFS2_METATYPE_RB: /* 3 */ print_gfs2("(rsrc grp bitblk)"); - struct_len = 512; + struct_len = sizeof(struct gfs2_meta_header); break; case GFS2_METATYPE_DI: /* 4 */ print_gfs2("(disk inode)"); @@ -566,8 +566,11 @@ int display_block_type(int from_restore) rgd = gfs2_blk2rgrpd(&sbd, block); if (rgd) { gfs2_rgrp_read(&sbd, rgd); - type = gfs2_get_bitmap(&sbd, block, rgd); - gfs2_rgrp_relse(rgd); + if ((*(bh->b_data + 7) == GFS2_METATYPE_RG) || + (*(bh->b_data + 7) == GFS2_METATYPE_RB)) + type = 4; + else + type = gfs2_get_bitmap(&sbd, block, rgd); } else type = 4; screen_chunk_size = ((termlines - 4) * 16) >> 8 << 8; @@ -594,6 +597,60 @@ int display_block_type(int from_restore) print_gfs2(" pointer 0x%x", pnum); } } + else if ((*(bh->b_data + 7) == GFS2_METATYPE_RG)) { + int ptroffset = edit_row[dmode] * 16 + edit_col[dmode]; + + if (ptroffset >= struct_len || pgnum) { + int blknum, b, btype; + + blknum = pgnum * screen_chunk_size; + blknum += (ptroffset - struct_len); + blknum *= 4; + blknum += rgd->ri.ri_data0; + + print_gfs2(" blk "); + for (b = blknum; b < blknum + 4; b++) { + btype = gfs2_get_bitmap(&sbd, b, rgd); + print_gfs2("0x%x-%s ", b, + allocdesc[gfs1][btype]); + } + } + } + else if ((*(bh->b_data + 7) == GFS2_METATYPE_RB)) { + int ptroffset = edit_row[dmode] * 16 + edit_col[dmode]; + + if (ptroffset >= struct_len || pgnum) { + int blknum, b, btype, rb_number; + + rb_number = block - rgd->ri.ri_addr; + blknum = 0; + /* count the number of bytes representing + blocks prior to the displayed screen. */ + for (b = 0; b < rb_number; b++) { + struct_len = (b ? + sizeof(struct gfs2_meta_header) : + sizeof(struct gfs2_rgrp)); + blknum += (sbd.bsize - struct_len); + } + struct_len = sizeof(struct gfs2_meta_header); + /* add the number of bytes on this screen */ + blknum += (ptroffset - struct_len); + /* factor in the page number */ + blknum += pgnum * screen_chunk_size; + /* convert bytes to blocks */ + blknum *= GFS2_NBBY; + /* add the starting offset for this rgrp */ + blknum += rgd->ri.ri_data0; + print_gfs2(" blk "); + for (b = blknum; b < blknum + 4; b++) { + btype = gfs2_get_bitmap(&sbd, b, rgd); + print_gfs2("0x%x-%s ", b, + allocdesc[gfs1][btype]); + } + } + } + if (rgd) + gfs2_rgrp_relse(rgd); } if (block == sbd.sd_sb.sb_root_dir.no_addr) print_gfs2("--------------- Root directory ------------------"); diff --git a/gfs2/libgfs2/rgrp.c b/gfs2/libgfs2/rgrp.c index 8d2d405..cc835c7 100644 --- a/gfs2/libgfs2/rgrp.c +++ b/gfs2/libgfs2/rgrp.c @@ -102,12 +102,18 @@ struct rgrp_list *gfs2_blk2rgrpd(struct gfs2_sbd *sdp, uint64_t blk) ri = &prev_rgd->ri; if (ri->ri_data0 <= blk && blk < ri->ri_data0 + ri->ri_data) return prev_rgd; + if (blk >= ri->ri_addr && blk < ri->ri_addr + ri->ri_length) + return prev_rgd; } for (tmp = sdp->rglist.next; tmp != &sdp->rglist; tmp = tmp->next) { rgd = osi_list_entry(tmp, struct rgrp_list, list); ri = &rgd->ri; + if (blk >= ri->ri_addr && blk < ri->ri_addr + ri->ri_length) { + prev_rgd = rgd; + return rgd; + } if (ri->ri_data0 <= blk && blk < ri->ri_data0 + ri->ri_data) { prev_rgd = rgd; return rgd;

1 0

gfs2-utils: master - Make gfs2_edit show bit-to-block translation when viewing bitmaps
by Bob Peterson 28 Jul '10

28 Jul '10

Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdif… Commit: aa6b5156a0d16ae78fcc49ba89e94094cf144a2f Parent: 89d49877de559e99505098a742b846e27184f04c Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Wed Jul 28 10:43:22 2010 -0500 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Wed Jul 28 10:43:22 2010 -0500 Make gfs2_edit show bit-to-block translation when viewing bitmaps This patch makes the gfs2_edit utility show the blocks and block allocation values associated with the highlighted byte when walking through the rgrp bitmaps in hex mode. This means you can simply walk your cursor to any given byte of any given bitmap and see which four blocks are represented by that byte in the bitmap, and whether each of them is free, data, metadata, or unlinked. --- gfs2/edit/hexedit.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++-- gfs2/libgfs2/rgrp.c | 6 +++++ 2 files changed, 66 insertions(+), 3 deletions(-) diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c index 8d2561f..5c207e2 100644 --- a/gfs2/edit/hexedit.c +++ b/gfs2/edit/hexedit.c @@ -499,7 +499,7 @@ int display_block_type(int from_restore) break; case GFS2_METATYPE_RB: /* 3 */ print_gfs2("(rsrc grp bitblk)"); - struct_len = 512; + struct_len = sizeof(struct gfs2_meta_header); break; case GFS2_METATYPE_DI: /* 4 */ print_gfs2("(disk inode)"); @@ -568,8 +568,11 @@ int display_block_type(int from_restore) rgd = gfs2_blk2rgrpd(&sbd, block); if (rgd) { gfs2_rgrp_read(&sbd, rgd); - type = gfs2_get_bitmap(&sbd, block, rgd); - gfs2_rgrp_relse(rgd); + if ((*(bh->b_data + 7) == GFS2_METATYPE_RG) || + (*(bh->b_data + 7) == GFS2_METATYPE_RB)) + type = 4; + else + type = gfs2_get_bitmap(&sbd, block, rgd); } else type = 4; screen_chunk_size = ((termlines - 4) * 16) >> 8 << 8; @@ -596,6 +599,60 @@ int display_block_type(int from_restore) print_gfs2(" pointer 0x%x", pnum); } } + else if ((*(bh->b_data + 7) == GFS2_METATYPE_RG)) { + int ptroffset = edit_row[dmode] * 16 + edit_col[dmode]; + + if (ptroffset >= struct_len || pgnum) { + int blknum, b, btype; + + blknum = pgnum * screen_chunk_size; + blknum += (ptroffset - struct_len); + blknum *= 4; + blknum += rgd->ri.ri_data0; + + print_gfs2(" blk "); + for (b = blknum; b < blknum + 4; b++) { + btype = gfs2_get_bitmap(&sbd, b, rgd); + print_gfs2("0x%x-%s ", b, + allocdesc[gfs1][btype]); + } + } + } + else if ((*(bh->b_data + 7) == GFS2_METATYPE_RB)) { + int ptroffset = edit_row[dmode] * 16 + edit_col[dmode]; + + if (ptroffset >= struct_len || pgnum) { + int blknum, b, btype, rb_number; + + rb_number = block - rgd->ri.ri_addr; + blknum = 0; + /* count the number of bytes representing + blocks prior to the displayed screen. */ + for (b = 0; b < rb_number; b++) { + struct_len = (b ? + sizeof(struct gfs2_meta_header) : + sizeof(struct gfs2_rgrp)); + blknum += (sbd.bsize - struct_len); + } + struct_len = sizeof(struct gfs2_meta_header); + /* add the number of bytes on this screen */ + blknum += (ptroffset - struct_len); + /* factor in the page number */ + blknum += pgnum * screen_chunk_size; + /* convert bytes to blocks */ + blknum *= GFS2_NBBY; + /* add the starting offset for this rgrp */ + blknum += rgd->ri.ri_data0; + print_gfs2(" blk "); + for (b = blknum; b < blknum + 4; b++) { + btype = gfs2_get_bitmap(&sbd, b, rgd); + print_gfs2("0x%x-%s ", b, + allocdesc[gfs1][btype]); + } + } + } + if (rgd) + gfs2_rgrp_relse(rgd); } if (block == sbd.sd_sb.sb_root_dir.no_addr) print_gfs2("--------------- Root directory ------------------"); diff --git a/gfs2/libgfs2/rgrp.c b/gfs2/libgfs2/rgrp.c index e3e230e..84ea6d3 100644 --- a/gfs2/libgfs2/rgrp.c +++ b/gfs2/libgfs2/rgrp.c @@ -104,12 +104,18 @@ struct rgrp_list *gfs2_blk2rgrpd(struct gfs2_sbd *sdp, uint64_t blk) ri = &prev_rgd->ri; if (ri->ri_data0 <= blk && blk < ri->ri_data0 + ri->ri_data) return prev_rgd; + if (blk >= ri->ri_addr && blk < ri->ri_addr + ri->ri_length) + return prev_rgd; } for (tmp = sdp->rglist.next; tmp != &sdp->rglist; tmp = tmp->next) { rgd = osi_list_entry(tmp, struct rgrp_list, list); ri = &rgd->ri; + if (blk >= ri->ri_addr && blk < ri->ri_addr + ri->ri_length) { + prev_rgd = rgd; + return rgd; + } if (ri->ri_data0 <= blk && blk < ri->ri_data0 + ri->ri_data) { prev_rgd = rgd; return rgd;

1 0

cluster: STABLE3 - fencing: Not all parameters appear in metadata
by Marek Grác 28 Jul '10

28 Jul '10

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=83… Commit: 83d827ee2ee5bf1d333e979cd6a21d746b00f287 Parent: 12e94f9677164031b53012a9157288a177ef30b7 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Wed Jul 28 15:18:37 2010 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Wed Jul 28 15:18:37 2010 +0200 fencing: Not all parameters appear in metadata Resolves: rhbz#618703 --- fence/agents/lib/fencing.py.py | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index 6646eb9..84794dd 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -325,35 +325,47 @@ all_opt = { "longopt" : "login-timeout", "help" : "--login-timeout <seconds> Wait X seconds for cmd prompt after login", "default" : "5", + "required" : "0", + "shortdesc" : "Wait X seconds for cmd prompt after login", "order" : 200 }, "shell_timeout" : { "getopt" : "Y:", "longopt" : "shell-timeout", "help" : "--shell-timeout <seconds> Wait X seconds for cmd prompt after issuing command", "default" : "3", + "required" : "0", + "shortdesc" : "Wait X seconds for cmd promprt after issuing command", "order" : 200 }, "power_timeout" : { "getopt" : "g:", "longopt" : "power-timeout", "help" : "--power-timeout <seconds> Test X seconds for status change after ON/OFF", "default" : "20", + "required" : "0", + "shortdesc" : "Test X seconds for status change after ON/OFF", "order" : 200 }, "power_wait" : { "getopt" : "G:", "longopt" : "power-wait", "help" : "--power-wait <seconds> Wait X seconds after issuing ON/OFF", "default" : "0", + "required" : "0", + "shortdesc" : "Wait X seconds after issuing ON/OFF", "order" : 200 }, "missing_as_off" : { "getopt" : "M", "longopt" : "missing-as-off", "help" : "--missing-as-off Missing port returns OFF instead of failure", + "required" : "0", + "shortdesc" : "Missing port returns OFF instead of failure", "order" : 200 }, "retry_on" : { "getopt" : "F:", "longopt" : "retry-on", "help" : "--retry-on <attempts> Count of attempts to retry power on", "default" : "1", + "required" : "0", + "shortdesc" : "Count of attempts to retry power on", "order" : 200 } }

1 0

fence-agents: master - fencing: Not all parameters appear in metadata
by Marek Grác 28 Jul '10

28 Jul '10

Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commi… Commit: d1128ab1406df77566bc91db28d1f97f6ba101cb Parent: 4a957a54e6e7474ee228695024fd405ddf70867f Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Wed Jul 28 15:05:20 2010 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Wed Jul 28 15:05:20 2010 +0200 fencing: Not all parameters appear in metadata Resolves: rhbz#618703 --- fence/agents/lib/fencing.py.py | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index 9f8cabf..7d967de 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -333,35 +333,47 @@ all_opt = { "longopt" : "login-timeout", "help" : "--login-timeout <seconds> Wait X seconds for cmd prompt after login", "default" : "5", + "required" : "0", + "shortdesc" : "Wait X seconds for cmd prompt after login", "order" : 200 }, "shell_timeout" : { "getopt" : "Y:", "longopt" : "shell-timeout", "help" : "--shell-timeout <seconds> Wait X seconds for cmd prompt after issuing command", "default" : "3", + "required" : "0", + "shortdesc" : "Wait X seconds for cmd promprt after issuing command", "order" : 200 }, "power_timeout" : { "getopt" : "g:", "longopt" : "power-timeout", "help" : "--power-timeout <seconds> Test X seconds for status change after ON/OFF", "default" : "20", + "required" : "0", + "shortdesc" : "Test X seconds for status change after ON/OFF", "order" : 200 }, "power_wait" : { "getopt" : "G:", "longopt" : "power-wait", "help" : "--power-wait <seconds> Wait X seconds after issuing ON/OFF", "default" : "0", + "required" : "0", + "shortdesc" : "Wait X seconds after issuing ON/OFF", "order" : 200 }, "missing_as_off" : { "getopt" : "M", "longopt" : "missing-as-off", "help" : "--missing-as-off Missing port returns OFF instead of failure", + "required" : "0", + "shortdesc" : "Missing port returns OFF instead of failure", "order" : 200 }, "retry_on" : { "getopt" : "F:", "longopt" : "retry-on", "help" : "--retry-on <attempts> Count of attempts to retry power on", "default" : "1", + "required" : "0", + "shortdesc" : "Count of attempts to retry power on", "order" : 201 } }

1 0

fence-agents: master - fencing: Method to cause one node to delay fencing [2]
by Marek Grác 28 Jul '10

28 Jul '10

Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commi… Commit: 4a957a54e6e7474ee228695024fd405ddf70867f Parent: 5bff4d9b9fd523a20884ba068c89f7e957dfcc9b Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Wed Jul 28 14:54:44 2010 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Wed Jul 28 14:54:44 2010 +0200 fencing: Method to cause one node to delay fencing [2] Option was not correctly showed in metadata Resolves: rhbz#614046 --- fence/agents/lib/fencing.py.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index bc4e60e..9f8cabf 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -67,6 +67,8 @@ all_opt = { "getopt" : "f:", "longopt" : "delay", "help" : "--delay <seconds> Wait X seconds before fencing is started", + "required" : "0", + "shortdesc" : "Wait X seconds before fencing is started", "default" : "0", "order" : 200 }, "agent" : {

1 0

fence-agents: master - fencing: Method to cause one node to delay fencing
by Marek Grác 28 Jul '10

28 Jul '10

Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commi… Commit: 5bff4d9b9fd523a20884ba068c89f7e957dfcc9b Parent: 0836ec51f4a916748f4dce0ba39ce0a7d56264b6 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Wed Jul 28 14:49:36 2010 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Wed Jul 28 14:49:36 2010 +0200 fencing: Method to cause one node to delay fencing Resolves: rhbz#614046 --- fence/agents/lib/fencing.py.py | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index 6646eb9..bc4e60e 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -63,6 +63,12 @@ all_opt = { "required" : "0", "shortdesc" : "Write debug information to given file", "order" : 52 }, + "delay" : { + "getopt" : "f:", + "longopt" : "delay", + "help" : "--delay <seconds> Wait X seconds before fencing is started", + "default" : "0", + "order" : 200 }, "agent" : { "getopt" : "", "help" : "", @@ -354,10 +360,10 @@ all_opt = { "longopt" : "retry-on", "help" : "--retry-on <attempts> Count of attempts to retry power on", "default" : "1", - "order" : 200 } + "order" : 201 } } -common_opt = [ "retry_on" ] +common_opt = [ "retry_on", "delay" ] class fspawn(pexpect.spawn): def log_expect(self, options, pattern, timeout): @@ -581,7 +587,7 @@ def check_input(device_opt, opt): ## ## Add options which are available for every fence agent ##### - device_opt.extend(common_opt) + device_opt.extend([x for x in common_opt if device_opt.count(x) == 0]) options = dict(opt) options["device_opt"] = device_opt @@ -723,6 +729,8 @@ def fence_action(tn, options, set_power_fn, get_power_fn, get_outlet_list = None print o + options["-C"] + alias return + if options["-o"] in ["off", "reboot"]: + time.sleep(int(options["-f"])) status = get_power_fn(tn, options) if status != "on" and status != "off":

1 0

cluster: RHEL6 - GFS2: libgfs2 bitfit algorithm using wrong shift point
by Bob Peterson 27 Jul '10

27 Jul '10

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=3a… Commit: 3a16ab778ddaa51d52994b615cab1522b938e5af Parent: 043c603d46ab401e69cb8e09a3a818e2006134c5 Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Tue Jul 27 20:18:18 2010 -0500 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Tue Jul 27 20:30:29 2010 -0500 GFS2: libgfs2 bitfit algorithm using wrong shift point This patch fixes a problem specific to 32-bit architectures. The shift point calculation for determining where to start looking for a desired value in the bitmap was wrong because it was using sizeof(unsigned long) rather than sizeof(unsigned long long). That caused the bitfit function to start in the wrong place, which in some circumstances caused the same block to be returned repeatedly which resulted in infinite loops in fsck.gfs2. rhbz#608154 --- gfs2/libgfs2/fs_bits.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/gfs2/libgfs2/fs_bits.c b/gfs2/libgfs2/fs_bits.c index 380dd81..c2934a6 100644 --- a/gfs2/libgfs2/fs_bits.c +++ b/gfs2/libgfs2/fs_bits.c @@ -64,7 +64,7 @@ static inline uint64_t gfs2_bit_search(const unsigned long long *ptr, unsigned long gfs2_bitfit(const unsigned char *buf, const unsigned int len, unsigned long goal, unsigned char state) { - unsigned long spoint = (goal << 1) & ((8 * sizeof(unsigned long)) - 1); + unsigned long spoint = (goal << 1) & ((8 * sizeof(unsigned long long)) - 1); const unsigned long long *ptr = ((unsigned long long *)buf) + (goal >> 5); const unsigned long long *end = (unsigned long long *) (buf + ALIGN(len, sizeof(unsigned long long)));

1 0

cluster: STABLE3 - GFS2: libgfs2 bitfit algorithm using wrong shift point
by Bob Peterson 27 Jul '10

27 Jul '10

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=12… Commit: 12e94f9677164031b53012a9157288a177ef30b7 Parent: b45a6cf730bd9e4be9c8570e8cbaf670ad59172c Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Tue Jul 27 20:18:18 2010 -0500 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Tue Jul 27 20:25:48 2010 -0500 GFS2: libgfs2 bitfit algorithm using wrong shift point This patch fixes a problem specific to 32-bit architectures. The shift point calculation for determining where to start looking for a desired value in the bitmap was wrong because it was using sizeof(unsigned long) rather than sizeof(unsigned long long). That caused the bitfit function to start in the wrong place, which in some circumstances caused the same block to be returned repeatedly which resulted in infinite loops in fsck.gfs2. rhbz#608154 --- gfs2/libgfs2/fs_bits.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/gfs2/libgfs2/fs_bits.c b/gfs2/libgfs2/fs_bits.c index 380dd81..c2934a6 100644 --- a/gfs2/libgfs2/fs_bits.c +++ b/gfs2/libgfs2/fs_bits.c @@ -64,7 +64,7 @@ static inline uint64_t gfs2_bit_search(const unsigned long long *ptr, unsigned long gfs2_bitfit(const unsigned char *buf, const unsigned int len, unsigned long goal, unsigned char state) { - unsigned long spoint = (goal << 1) & ((8 * sizeof(unsigned long)) - 1); + unsigned long spoint = (goal << 1) & ((8 * sizeof(unsigned long long)) - 1); const unsigned long long *ptr = ((unsigned long long *)buf) + (goal >> 5); const unsigned long long *end = (unsigned long long *) (buf + ALIGN(len, sizeof(unsigned long long)));

1 0

gfs2-utils: master - GFS2: libgfs2 bitfit algorithm using wrong shift point
by Bob Peterson 27 Jul '10

27 Jul '10

Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdif… Commit: 89d49877de559e99505098a742b846e27184f04c Parent: 3fce665dffac8537f520e33674020988ae011fcf Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Tue Jul 27 20:18:18 2010 -0500 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Tue Jul 27 20:28:14 2010 -0500 GFS2: libgfs2 bitfit algorithm using wrong shift point This patch fixes a problem specific to 32-bit architectures. The shift point calculation for determining where to start looking for a desired value in the bitmap was wrong because it was using sizeof(unsigned long) rather than sizeof(unsigned long long). That caused the bitfit function to start in the wrong place, which in some circumstances caused the same block to be returned repeatedly which resulted in infinite loops in fsck.gfs2. rhbz#608154 --- gfs2/libgfs2/fs_bits.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/gfs2/libgfs2/fs_bits.c b/gfs2/libgfs2/fs_bits.c index d98919a..6f096f3 100644 --- a/gfs2/libgfs2/fs_bits.c +++ b/gfs2/libgfs2/fs_bits.c @@ -66,7 +66,7 @@ static inline uint64_t gfs2_bit_search(const unsigned long long *ptr, unsigned long gfs2_bitfit(const unsigned char *buf, const unsigned int len, unsigned long goal, unsigned char state) { - unsigned long spoint = (goal << 1) & ((8 * sizeof(unsigned long)) - 1); + unsigned long spoint = (goal << 1) & ((8 * sizeof(unsigned long long)) - 1); const unsigned long long *ptr = ((unsigned long long *)buf) + (goal >> 5); const unsigned long long *end = (unsigned long long *) (buf + ALIGN(len, sizeof(unsigned long long)));

1 0

cluster: STABLE3 - dlm_controld: fix plock owner in checkpoints
by David Teigland 27 Jul '10

27 Jul '10

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=b4… Commit: b45a6cf730bd9e4be9c8570e8cbaf670ad59172c Parent: 782091c04c4cd718d2279ec0ab31ced262adc7b2 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue Jul 27 14:06:53 2010 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Tue Jul 27 16:39:32 2010 -0500 dlm_controld: fix plock owner in checkpoints The wrong plock resource owner is written into checkpoints when plock_ownership is 0. This causes a node that mounts the fs to have incorrect owner values, which cause the plock operations to permanently hang. This bug seems to have existed since the plock code was originally copied into dlm_controld from gfs_controld. As part of the copy, there were some small code changes. One was to always include the resource owner in the checkpoint data, instead of only including it when plock_ownership was 1. The owner was then written and read incorrectly when plock_ownership was 0. bz 618814 Signed-off-by: David Teigland <teigland(a)redhat.com> --- group/dlm_controld/plock.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/group/dlm_controld/plock.c b/group/dlm_controld/plock.c index 861a39b..d18d1f5 100644 --- a/group/dlm_controld/plock.c +++ b/group/dlm_controld/plock.c @@ -1924,7 +1924,9 @@ void store_plocks(struct lockspace *ls, uint32_t *sig) (there should be no SYNCING plocks) */ list_for_each_entry(r, &ls->plock_resources, list) { - if (r->owner == -1) + if (!cfgd_plock_ownership) + owner = 0; + else if (r->owner == -1) continue; else if (r->owner == our_nodeid) owner = our_nodeid;

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

cluster-commits July 2010