cluster-commits October 2009

cluster-commits@lists.fedorahosted.org

9 participants
151 discussions

cluster: RHEL55 - GFS2: gfs2_edit savemeta wasn't saving indirect eattribute blocks
by Bob Peterson 07 Oct '09

07 Oct '09

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=c6… Commit: c6b18e82311206fb9beca7c7e33dbeed4d60c71d Parent: 9d1b57ae8baa0592b556654feaa86414cadc4e2b Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Mon Jun 15 14:59:20 2009 -0500 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Wed Oct 7 14:05:21 2009 -0500 GFS2: gfs2_edit savemeta wasn't saving indirect eattribute blocks Normal eattribute blocks were being saved, but dinodes that had an eattribute pointer that leads to an indirect block (GFS2_METATYPE_IN) weren't being handled properly and saving off the sub-blocks. This adds that capability. rhbz#527770 --- gfs2/edit/savemeta.c | 70 ++++++++++++++++++++++++++++++++------------------ 1 files changed, 45 insertions(+), 25 deletions(-) diff --git a/gfs2/edit/savemeta.c b/gfs2/edit/savemeta.c index d2fca05..55e1b29 100644 --- a/gfs2/edit/savemeta.c +++ b/gfs2/edit/savemeta.c @@ -303,6 +303,35 @@ void save_indirect_blocks(int out_fd, osi_list_t *cur_list, } /* + * save_ea_block - save off an extended attribute block + */ +void save_ea_block(int out_fd, struct gfs2_buffer_head *metabh) +{ + int i, e, ea_len = sbd.bsize; + struct gfs2_ea_header ea; + + for (e = sizeof(struct gfs2_meta_header); e < sbd.bsize; e += ea_len) { + uint64_t blk, *b; + int charoff; + + gfs2_ea_header_in(&ea, metabh->b_data + e); + for (i = 0; i < ea.ea_num_ptrs; i++) { + charoff = e + ea.ea_name_len + + sizeof(struct gfs2_ea_header) + + sizeof(uint64_t) - 1; + charoff /= sizeof(uint64_t); + b = (uint64_t *)(metabh->b_data); + b += charoff + i; + blk = be64_to_cpu(*b); + save_block(sbd.device_fd, out_fd, blk); + } + if (!ea.ea_rec_len) + break; + ea_len = ea.ea_rec_len; + } +} + +/* * save_inode_data - save off important data associated with an inode * * out_fd - destination file descriptor @@ -371,36 +400,27 @@ void save_inode_data(int out_fd) } } if (inode->i_di.di_eattr) { /* if this inode has extended attributes */ - struct gfs2_ea_header ea; struct gfs2_meta_header mh; - int e; metabh = bread(&sbd.buf_list, inode->i_di.di_eattr); save_block(sbd.device_fd, out_fd, inode->i_di.di_eattr); gfs2_meta_header_in(&mh, metabh->b_data); - if (mh.mh_magic == GFS2_MAGIC) { - for (e = sizeof(struct gfs2_meta_header); - e < sbd.bsize; e += ea.ea_rec_len) { - uint64_t blk, *b; - int charoff; - - gfs2_ea_header_in(&ea, metabh->b_data + e); - for (i = 0; i < ea.ea_num_ptrs; i++) { - charoff = e + ea.ea_name_len + - sizeof(struct gfs2_ea_header) + - sizeof(uint64_t) - 1; - charoff /= sizeof(uint64_t); - b = (uint64_t *)(metabh->b_data); - b += charoff + i; - blk = be64_to_cpu(*b); - save_block(sbd.device_fd, out_fd, blk); - } - if (!ea.ea_rec_len) - break; - } - } else { - fprintf(stderr, "\nWarning: corrupt extended attribute" - " at block %llu (0x%llx) detected.\n", + if (mh.mh_magic == GFS2_MAGIC && + mh.mh_type == GFS2_METATYPE_EA) + save_ea_block(out_fd, metabh); + else if (mh.mh_magic == GFS2_MAGIC && + mh.mh_type == GFS2_METATYPE_IN) + save_indirect_blocks(out_fd, cur_list, metabh, 2, 2); + else { + if (mh.mh_magic == GFS2_MAGIC) /* if it's metadata */ + save_block(sbd.device_fd, out_fd, + inode->i_di.di_eattr); + fprintf(stderr, + "\nWarning: corrupt extended " + "attribute at block %llu (0x%llx) " + "detected in inode %lld (0x%llx).\n", + (unsigned long long)inode->i_di.di_eattr, + (unsigned long long)inode->i_di.di_eattr, (unsigned long long)block, (unsigned long long)block); }

1 0

cluster: RHEL55 - GFS2: gfs2_edit savemeta wasn't saving ea sub-blocks
by Bob Peterson 07 Oct '09

07 Oct '09

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=9d… Commit: 9d1b57ae8baa0592b556654feaa86414cadc4e2b Parent: cf17511802fceb706729b0cdddeb0e960300d3aa Author: Bob Peterson <rpeterso(a)redhat.com> AuthorDate: Tue Jun 16 14:46:09 2009 -0500 Committer: Bob Peterson <rpeterso(a)redhat.com> CommitterDate: Wed Oct 7 14:03:22 2009 -0500 GFS2: gfs2_edit savemeta wasn't saving ea sub-blocks Indirect extended attribute blocks may have sub-blocks, and those weren't getting saved. This adds that capability. rhbz#527770 --- gfs2/edit/savemeta.c | 43 +++++++++++++++++++++++++++++++++++++++---- 1 files changed, 39 insertions(+), 4 deletions(-) diff --git a/gfs2/edit/savemeta.c b/gfs2/edit/savemeta.c index b5bf33f..d2fca05 100644 --- a/gfs2/edit/savemeta.c +++ b/gfs2/edit/savemeta.c @@ -200,8 +200,9 @@ int save_block(int fd, int out_fd, uint64_t blk) char *p; if (blk > last_fs_block) { - fprintf(stderr, "\nWarning: bad block pointer ignored in " - "block (block %llu (%llx))", + fprintf(stderr, "\nWarning: bad block pointer '0x%llx' " + "ignored in block (block %llu (%llx))", + (unsigned long long)blk, (unsigned long long)block, (unsigned long long)block); return 0; } @@ -235,6 +236,35 @@ int save_block(int fd, int out_fd, uint64_t blk) } /* + * save_ea_block - save off an extended attribute block + */ +void save_ea_block(int out_fd, struct gfs2_buffer_head *metabh) +{ + int i, e, ea_len = sbd.bsize; + struct gfs2_ea_header ea; + + for (e = sizeof(struct gfs2_meta_header); e < sbd.bsize; e += ea_len) { + uint64_t blk, *b; + int charoff; + + gfs2_ea_header_in(&ea, metabh->b_data + e); + for (i = 0; i < ea.ea_num_ptrs; i++) { + charoff = e + ea.ea_name_len + + sizeof(struct gfs2_ea_header) + + sizeof(uint64_t) - 1; + charoff /= sizeof(uint64_t); + b = (uint64_t *)(metabh->b_data); + b += charoff + i; + blk = be64_to_cpu(*b); + save_block(sbd.device_fd, out_fd, blk); + } + if (!ea.ea_rec_len) + break; + ea_len = ea.ea_rec_len; + } +} + +/* * save_indirect_blocks - save all indirect blocks for the given buffer */ void save_indirect_blocks(int out_fd, osi_list_t *cur_list, @@ -242,7 +272,7 @@ void save_indirect_blocks(int out_fd, osi_list_t *cur_list, { uint64_t old_block = 0, indir_block; uint64_t *ptr; - int head_size; + int head_size, blktype; struct gfs2_buffer_head *nbh; head_size = (hgt > 1 ? @@ -257,7 +287,12 @@ void save_indirect_blocks(int out_fd, osi_list_t *cur_list, if (indir_block == old_block) continue; old_block = indir_block; - save_block(sbd.device_fd, out_fd, indir_block); + blktype = save_block(sbd.device_fd, out_fd, indir_block); + if (blktype == GFS2_METATYPE_EA) { + nbh = bread(&sbd.buf_list, indir_block); + save_ea_block(out_fd, nbh); + brelse(nbh, not_updated); + } if (height != hgt) { /* If not at max height */ nbh = bread(&sbd.buf_list, indir_block); osi_list_add_prev(&nbh->b_altlist,

1 0

fence-agents: master - fence_sanbox2: Re-implemenatition based on fencing library
by Marek Grác 07 Oct '09

07 Oct '09

Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commi… Commit: 5ef5470a890f2768a819f6dd387199983b60c839 Parent: a2f8c2a64bfe9909de3d96def9729963e2516412 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Wed Oct 7 17:49:42 2009 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Wed Oct 7 17:51:30 2009 +0200 fence_sanbox2: Re-implemenatition based on fencing library Resolves: bz#512947 --- fence/agents/lib/fencing.py.py | 26 +++- fence/agents/sanbox2/fence_sanbox2.pl | 250 --------------------------------- fence/agents/sanbox2/fence_sanbox2.py | 109 ++++++++++++++ 3 files changed, 132 insertions(+), 253 deletions(-) diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index 2d0205d..96f25e0 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -78,6 +78,14 @@ 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", + "order" : 1 }, "ipaddr" : { "getopt" : "a:", "longopt" : "ip", @@ -504,6 +512,8 @@ 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" ## ###### @@ -554,9 +564,13 @@ def check_input(device_opt, opt): else: options["log"] = LOG_MODE_QUIET - if 0 == ["on", "off", "reboot", "status", "list", "monitor"].count(options["-o"].lower()): - fail_usage("Failed: Unrecognised action '" + options["-o"] + "'") - + 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"] + "'") + else: + if 0 == ["enable", "disable", "status", "list", "monitor"].count(options["-o"].lower()): + fail_usage("Failed: Unrecognised action '" + options["-o"] + "'") + 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") @@ -663,6 +677,12 @@ 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": print "Success: Already ON" diff --git a/fence/agents/sanbox2/fence_sanbox2.pl b/fence/agents/sanbox2/fence_sanbox2.pl deleted file mode 100644 index c8c37a5..0000000 --- a/fence/agents/sanbox2/fence_sanbox2.pl +++ /dev/null @@ -1,250 +0,0 @@ -#!/usr/bin/perl - -use Getopt::Std; -use Net::Telnet (); - -my $ME = $0; - -END { - defined fileno STDOUT or return; - close STDOUT and return; - warn "$ME: failed to close standard output: $!\n"; - $? ||= 1; -} - -# Get the program name from $0 and strip directory names -$_=$0; -s/.*\///; -my $pname = $_; - -$opt_o = 'disable'; # Default fence action - -# WARNING!! Do not add code bewteen "#BEGIN_VERSION_GENERATION" and -# "#END_VERSION_GENERATION" It is generated by the Makefile - -#BEGIN_VERSION_GENERATION -$RELEASE_VERSION=""; -$REDHAT_COPYRIGHT=""; -$BUILD_DATE=""; -#END_VERSION_GENERATION - - -sub usage -{ - print "Usage:\n"; - print "\n"; - print "$pname [options]\n"; - print "\n"; - print "Options:\n"; - print " -a <ip> IP address or hostname of switch\n"; - print " -h usage\n"; - print " -l <name> Login name\n"; - print " -n <num> Port number to disable\n"; - print " -o <string> Action: disable (default) or enable\n"; - print " -p <string> Password for login\n"; - print " -S <path> Script to run to retrieve login password\n"; - print " -q quiet mode\n"; - print " -V version\n"; - - exit 0; -} - -sub fail -{ - ($msg) = @_; - print $msg."\n" unless defined $opt_q; - $t->close if defined $t; - exit 1; -} - -sub fail_usage -{ - ($msg)=@_; - print STDERR $msg."\n" if $msg; - print STDERR "Please use '-h' for usage.\n"; - exit 1; -} - -sub version -{ - print "$pname $RELEASE_VERSION $BUILD_DATE\n"; - print "$REDHAT_COPYRIGHT\n" if ( $REDHAT_COPYRIGHT ); - - exit 0; -} - - -if (@ARGV > 0) { - getopts("a:hl:n:o:p:S:qV") || fail_usage ; - - usage if defined $opt_h; - version if defined $opt_V; - - fail_usage "Unknown parameter." if (@ARGV > 0); - - fail_usage "No '-a' flag specified." unless defined $opt_a; - fail_usage "No '-n' flag specified." unless defined $opt_n; - fail_usage "No '-l' flag specified." unless defined $opt_l; - - if (defined $opt_S) { - $pwd_script_out = `$opt_S`; - chomp($pwd_script_out); - if ($pwd_script_out) { - $opt_p = $pwd_script_out; - } - } - - fail_usage "No '-p' or '-S' flag specified." unless defined $opt_p; - fail_usage "Unrecognised action '$opt_o' for '-o' flag" - unless $opt_o =~ /^(disable|enable)$/i; - -} else { - get_options_stdin(); - - 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; - - if (defined $opt_S) { - $pwd_script_out = `$opt_S`; - chomp($pwd_script_out); - if ($pwd_script_out) { - $opt_p = $pwd_script_out; - } - } - - fail "failed: no password" unless defined $opt_p; - fail "failed: unrecognised action: $opt_o" - unless $opt_o =~ /^(disable|enable)$/i; -} - - if ( $opt_o =~ /^disable$/i ) -{ - $command = "set port $opt_n state offline"; -} -elsif ( $opt_o =~ /^enable$/i ) -{ - $command = "set port $opt_n state online"; -} - -# -# Set up and log in -# - -$t = new Net::Telnet; - -$t->open($opt_a); - -$t->waitfor('/login:/'); - -$t->print($opt_l); - -$t->waitfor('/assword:/'); - -$t->print($opt_p); - -$t->waitfor('/\>/'); - -# -# Go to admin mode and check if we're really in it -# -$t->print ("admin start"); -($text, $match) = $t->waitfor('/\>/'); -if ($text =~ /Switch is already in Admin Mode/i) { - fail "failed: parallel telnet session\n"; -}; - -# -# Do the command -# -$t->print($command); -print "$command \n"; - -# -# Assume here that the word "error" will appear after errors (bad assumption! see next check) -# - -($text, $match) = $t->waitfor('/\>/'); - -# -# Do a portshow on the port and look for the DISABLED string to verify success -# - -$t->print("show port $opt_n"); -($text, $match) = $t->waitfor('/\>/'); - -if (!((($opt_o =~ /disable/i) && ($text =~ /AdminState\ *Offline/i)) || - (($opt_o =~ /enable/i) && ($text =~ /AdminState\ *Online/i)))) -{ - # Get out of admin mode before failing - $t->print("admin end"); - $t->waitfor('/\>/'); - fail "failed: could not change state to $opt_o\n"; -} - - -print "success: $opt_o $opt_n\n" unless defined $opt_q; -$t->print("admin end"); -$t->waitfor('/\>/'); -$t->print("quit"); - -exit 0; - -sub get_options_stdin -{ - my $opt; - my $line = 0; - while( defined($in = <>) ) - { - $_ = $in; - chomp; - - # strip leading and trailing whitespace - s/^\s*//; - s/\s*$//; - - # skip comments - next if /^#/; - - $line+=1; - $opt=$_; - next unless $opt; - - ($name,$val)=split /\s*=\s*/, $opt; - - if ( $name eq "" ) - { - print STDERR "parse error: illegal name in option $line\n"; - exit 2; - } - - # DO NOTHING -- this field is used by fenced - elsif ($name eq "agent" ) { } - - elsif ($name eq "ipaddr" ) - { - $opt_a = $val; - } - elsif ($name eq "login" ) - { - $opt_l = $val; - } - - elsif ($name eq "option" ) - { - $opt_o = $val; - } - elsif ($name eq "passwd" ) - { - $opt_p = $val; - } - elsif ($name eq "passwd_script" ) - { - $opt_S = $val; - } - elsif ($name eq "port" ) - { - $opt_n = $val; - } - } -} diff --git a/fence/agents/sanbox2/fence_sanbox2.py b/fence/agents/sanbox2/fence_sanbox2.py new file mode 100644 index 0000000..79d1f02 --- /dev/null +++ b/fence/agents/sanbox2/fence_sanbox2.py @@ -0,0 +1,109 @@ +#!/usr/bin/python + +##### +## +## The Following Agent Has Been Tested On: +## +## Version Firmware +## +-----------------+---------------------------+ +##### + +import sys, re, pexpect +sys.path.append("@FENCEAGENTSLIBDIR@") +from fencing import * + +#BEGIN_VERSION_GENERATION +RELEASE_VERSION="New Sanbox2 Agent - test release on steroids" +REDHAT_COPYRIGHT="" +BUILD_DATE="March, 2008" +#END_VERSION_GENERATION + +def get_power_status(conn, options): + status_trans = { + 'online' : "on", + 'offline' : "off" + } + try: + conn.send("show port " + options["-n"] + "\n") + conn.log_expect(options, options["-c"], SHELL_TIMEOUT) + except pexpect.EOF: + fail(EC_CONNECTION_LOST) + except pexpect.TIMEOUT: + fail(EC_TIMED_OUT) + + status = re.compile(".*AdminState\s+(online|offline)\s+", re.IGNORECASE | re.MULTILINE).search(conn.before).group(1) + + try: + return status_trans[status.lower().strip()] + except KeyError: + return "PROBLEM" + +def set_power_status(conn, options): + action = { + 'on' : "online", + 'off' : "offline" + }[options["-o"]] + + try: + conn.send("set port " + options["-n"] + " state " + action + "\n") + conn.log_expect(options, options["-c"], POWER_TIMEOUT) + except pexpect.EOF: + fail(EC_CONNECTION_LOST) + except pexpect.TIMEOUT: + fail(EC_TIMED_OUT) + + try: + conn.send("set port " + options["-n"] + " state " + action + "\n") + conn.log_expect(options, options["-c"], POWER_TIMEOUT) + except pexpect.EOF: + fail(EC_CONNECTION_LOST) + except pexpect.TIMEOUT: + fail(EC_TIMED_OUT) + +def main(): + device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", + "io_fencing", "ipaddr", "login", "passwd", "passwd_script", + "cmd_prompt", "port", "ipport", "login_eol_lf" ] + + atexit.register(atexit_handler) + + options = check_input(device_opt, process_input(device_opt)) + + ## + ## Fence agent specific defaults + ##### + if 0 == options.has_key("-c"): + options["-c"] = [ " #> " ] + + show_docs(options) + + ## + ## Operate the fencing device + ## + conn = fence_login(options) + + conn.send("admin start\n") + conn.log_expect(options, options["-c"], SHELL_TIMEOUT) + + if (re.search("$admin$", conn.before, re.MULTILINE) == None): + ## Someone else is in admin section, we can't enable/disable + ## ports so we will rather exit + sys.stderr.write("Failed: Unable to switch to admin section\n") + sys.exit(EC_GENERIC_ERROR) + + fence_action(conn, options, set_power_status, get_power_status) + + ## + ## Logout from system + ###### + try: + conn.send("admin end\n") + conn.send("exit\n") + conn.close() + except exceptions.OSError: + pass + except pexpect.ExceptionPexpect: + pass + +if __name__ == "__main__": + main()

1 0

cluster: STABLE3 - fence_sanbox2: Re-implemenatition based on fencing library
by Marek Grác 07 Oct '09

07 Oct '09

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=d2… Commit: d2b2ae7958f293733fb25622603c4ba63baa8879 Parent: 4be8562fc103f2496ab5ed60caeddda5db2980d3 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Wed Oct 7 17:46:18 2009 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Wed Oct 7 17:46:18 2009 +0200 fence_sanbox2: Re-implemenatition based on fencing library Resolves: bz#512947 --- fence/agents/lib/fencing.py.py | 26 +++- fence/agents/sanbox2/fence_sanbox2.pl | 250 --------------------------------- fence/agents/sanbox2/fence_sanbox2.py | 109 ++++++++++++++ 3 files changed, 132 insertions(+), 253 deletions(-) diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index 2d0205d..96f25e0 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -78,6 +78,14 @@ 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", + "order" : 1 }, "ipaddr" : { "getopt" : "a:", "longopt" : "ip", @@ -504,6 +512,8 @@ 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" ## ###### @@ -554,9 +564,13 @@ def check_input(device_opt, opt): else: options["log"] = LOG_MODE_QUIET - if 0 == ["on", "off", "reboot", "status", "list", "monitor"].count(options["-o"].lower()): - fail_usage("Failed: Unrecognised action '" + options["-o"] + "'") - + 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"] + "'") + else: + if 0 == ["enable", "disable", "status", "list", "monitor"].count(options["-o"].lower()): + fail_usage("Failed: Unrecognised action '" + options["-o"] + "'") + 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") @@ -663,6 +677,12 @@ 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": print "Success: Already ON" diff --git a/fence/agents/sanbox2/fence_sanbox2.pl b/fence/agents/sanbox2/fence_sanbox2.pl deleted file mode 100644 index c8c37a5..0000000 --- a/fence/agents/sanbox2/fence_sanbox2.pl +++ /dev/null @@ -1,250 +0,0 @@ -#!/usr/bin/perl - -use Getopt::Std; -use Net::Telnet (); - -my $ME = $0; - -END { - defined fileno STDOUT or return; - close STDOUT and return; - warn "$ME: failed to close standard output: $!\n"; - $? ||= 1; -} - -# Get the program name from $0 and strip directory names -$_=$0; -s/.*\///; -my $pname = $_; - -$opt_o = 'disable'; # Default fence action - -# WARNING!! Do not add code bewteen "#BEGIN_VERSION_GENERATION" and -# "#END_VERSION_GENERATION" It is generated by the Makefile - -#BEGIN_VERSION_GENERATION -$RELEASE_VERSION=""; -$REDHAT_COPYRIGHT=""; -$BUILD_DATE=""; -#END_VERSION_GENERATION - - -sub usage -{ - print "Usage:\n"; - print "\n"; - print "$pname [options]\n"; - print "\n"; - print "Options:\n"; - print " -a <ip> IP address or hostname of switch\n"; - print " -h usage\n"; - print " -l <name> Login name\n"; - print " -n <num> Port number to disable\n"; - print " -o <string> Action: disable (default) or enable\n"; - print " -p <string> Password for login\n"; - print " -S <path> Script to run to retrieve login password\n"; - print " -q quiet mode\n"; - print " -V version\n"; - - exit 0; -} - -sub fail -{ - ($msg) = @_; - print $msg."\n" unless defined $opt_q; - $t->close if defined $t; - exit 1; -} - -sub fail_usage -{ - ($msg)=@_; - print STDERR $msg."\n" if $msg; - print STDERR "Please use '-h' for usage.\n"; - exit 1; -} - -sub version -{ - print "$pname $RELEASE_VERSION $BUILD_DATE\n"; - print "$REDHAT_COPYRIGHT\n" if ( $REDHAT_COPYRIGHT ); - - exit 0; -} - - -if (@ARGV > 0) { - getopts("a:hl:n:o:p:S:qV") || fail_usage ; - - usage if defined $opt_h; - version if defined $opt_V; - - fail_usage "Unknown parameter." if (@ARGV > 0); - - fail_usage "No '-a' flag specified." unless defined $opt_a; - fail_usage "No '-n' flag specified." unless defined $opt_n; - fail_usage "No '-l' flag specified." unless defined $opt_l; - - if (defined $opt_S) { - $pwd_script_out = `$opt_S`; - chomp($pwd_script_out); - if ($pwd_script_out) { - $opt_p = $pwd_script_out; - } - } - - fail_usage "No '-p' or '-S' flag specified." unless defined $opt_p; - fail_usage "Unrecognised action '$opt_o' for '-o' flag" - unless $opt_o =~ /^(disable|enable)$/i; - -} else { - get_options_stdin(); - - 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; - - if (defined $opt_S) { - $pwd_script_out = `$opt_S`; - chomp($pwd_script_out); - if ($pwd_script_out) { - $opt_p = $pwd_script_out; - } - } - - fail "failed: no password" unless defined $opt_p; - fail "failed: unrecognised action: $opt_o" - unless $opt_o =~ /^(disable|enable)$/i; -} - - if ( $opt_o =~ /^disable$/i ) -{ - $command = "set port $opt_n state offline"; -} -elsif ( $opt_o =~ /^enable$/i ) -{ - $command = "set port $opt_n state online"; -} - -# -# Set up and log in -# - -$t = new Net::Telnet; - -$t->open($opt_a); - -$t->waitfor('/login:/'); - -$t->print($opt_l); - -$t->waitfor('/assword:/'); - -$t->print($opt_p); - -$t->waitfor('/\>/'); - -# -# Go to admin mode and check if we're really in it -# -$t->print ("admin start"); -($text, $match) = $t->waitfor('/\>/'); -if ($text =~ /Switch is already in Admin Mode/i) { - fail "failed: parallel telnet session\n"; -}; - -# -# Do the command -# -$t->print($command); -print "$command \n"; - -# -# Assume here that the word "error" will appear after errors (bad assumption! see next check) -# - -($text, $match) = $t->waitfor('/\>/'); - -# -# Do a portshow on the port and look for the DISABLED string to verify success -# - -$t->print("show port $opt_n"); -($text, $match) = $t->waitfor('/\>/'); - -if (!((($opt_o =~ /disable/i) && ($text =~ /AdminState\ *Offline/i)) || - (($opt_o =~ /enable/i) && ($text =~ /AdminState\ *Online/i)))) -{ - # Get out of admin mode before failing - $t->print("admin end"); - $t->waitfor('/\>/'); - fail "failed: could not change state to $opt_o\n"; -} - - -print "success: $opt_o $opt_n\n" unless defined $opt_q; -$t->print("admin end"); -$t->waitfor('/\>/'); -$t->print("quit"); - -exit 0; - -sub get_options_stdin -{ - my $opt; - my $line = 0; - while( defined($in = <>) ) - { - $_ = $in; - chomp; - - # strip leading and trailing whitespace - s/^\s*//; - s/\s*$//; - - # skip comments - next if /^#/; - - $line+=1; - $opt=$_; - next unless $opt; - - ($name,$val)=split /\s*=\s*/, $opt; - - if ( $name eq "" ) - { - print STDERR "parse error: illegal name in option $line\n"; - exit 2; - } - - # DO NOTHING -- this field is used by fenced - elsif ($name eq "agent" ) { } - - elsif ($name eq "ipaddr" ) - { - $opt_a = $val; - } - elsif ($name eq "login" ) - { - $opt_l = $val; - } - - elsif ($name eq "option" ) - { - $opt_o = $val; - } - elsif ($name eq "passwd" ) - { - $opt_p = $val; - } - elsif ($name eq "passwd_script" ) - { - $opt_S = $val; - } - elsif ($name eq "port" ) - { - $opt_n = $val; - } - } -} diff --git a/fence/agents/sanbox2/fence_sanbox2.py b/fence/agents/sanbox2/fence_sanbox2.py new file mode 100644 index 0000000..79d1f02 --- /dev/null +++ b/fence/agents/sanbox2/fence_sanbox2.py @@ -0,0 +1,109 @@ +#!/usr/bin/python + +##### +## +## The Following Agent Has Been Tested On: +## +## Version Firmware +## +-----------------+---------------------------+ +##### + +import sys, re, pexpect +sys.path.append("@FENCEAGENTSLIBDIR@") +from fencing import * + +#BEGIN_VERSION_GENERATION +RELEASE_VERSION="New Sanbox2 Agent - test release on steroids" +REDHAT_COPYRIGHT="" +BUILD_DATE="March, 2008" +#END_VERSION_GENERATION + +def get_power_status(conn, options): + status_trans = { + 'online' : "on", + 'offline' : "off" + } + try: + conn.send("show port " + options["-n"] + "\n") + conn.log_expect(options, options["-c"], SHELL_TIMEOUT) + except pexpect.EOF: + fail(EC_CONNECTION_LOST) + except pexpect.TIMEOUT: + fail(EC_TIMED_OUT) + + status = re.compile(".*AdminState\s+(online|offline)\s+", re.IGNORECASE | re.MULTILINE).search(conn.before).group(1) + + try: + return status_trans[status.lower().strip()] + except KeyError: + return "PROBLEM" + +def set_power_status(conn, options): + action = { + 'on' : "online", + 'off' : "offline" + }[options["-o"]] + + try: + conn.send("set port " + options["-n"] + " state " + action + "\n") + conn.log_expect(options, options["-c"], POWER_TIMEOUT) + except pexpect.EOF: + fail(EC_CONNECTION_LOST) + except pexpect.TIMEOUT: + fail(EC_TIMED_OUT) + + try: + conn.send("set port " + options["-n"] + " state " + action + "\n") + conn.log_expect(options, options["-c"], POWER_TIMEOUT) + except pexpect.EOF: + fail(EC_CONNECTION_LOST) + except pexpect.TIMEOUT: + fail(EC_TIMED_OUT) + +def main(): + device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", + "io_fencing", "ipaddr", "login", "passwd", "passwd_script", + "cmd_prompt", "port", "ipport", "login_eol_lf" ] + + atexit.register(atexit_handler) + + options = check_input(device_opt, process_input(device_opt)) + + ## + ## Fence agent specific defaults + ##### + if 0 == options.has_key("-c"): + options["-c"] = [ " #> " ] + + show_docs(options) + + ## + ## Operate the fencing device + ## + conn = fence_login(options) + + conn.send("admin start\n") + conn.log_expect(options, options["-c"], SHELL_TIMEOUT) + + if (re.search("$admin$", conn.before, re.MULTILINE) == None): + ## Someone else is in admin section, we can't enable/disable + ## ports so we will rather exit + sys.stderr.write("Failed: Unable to switch to admin section\n") + sys.exit(EC_GENERIC_ERROR) + + fence_action(conn, options, set_power_status, get_power_status) + + ## + ## Logout from system + ###### + try: + conn.send("admin end\n") + conn.send("exit\n") + conn.close() + except exceptions.OSError: + pass + except pexpect.ExceptionPexpect: + pass + +if __name__ == "__main__": + main()

1 0

fence-agents: master - fence_vmware: VIX API fix, ESX 4.0.0, helper more verbose
by Jan Friesse 07 Oct '09

07 Oct '09

Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commi… Commit: a2f8c2a64bfe9909de3d96def9729963e2516412 Parent: cc95f40eeb1e987ae7d6e3a348f2f3c0f5b98c0d Author: Jan Friesse <jfriesse(a)redhat.com> AuthorDate: Wed Oct 7 17:03:09 2009 +0200 Committer: Jan Friesse <jfriesse(a)redhat.com> CommitterDate: Wed Oct 7 17:04:04 2009 +0200 fence_vmware: VIX API fix, ESX 4.0.0, helper more verbose - patch fixes exception in case user use VIX API - fence agent is now tested against ESX 4.0.0 and vCenter 4.0.0 - fence_vmware_helper is more verbose in case some Perl module is missing (prints Perl error message) --- fence/agents/vmware/fence_vmware.py | 16 ++++++++++++---- fence/agents/vmware/fence_vmware_helper.pl | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/fence/agents/vmware/fence_vmware.py b/fence/agents/vmware/fence_vmware.py index c3a6cf0..070c2c4 100644 --- a/fence/agents/vmware/fence_vmware.py +++ b/fence/agents/vmware/fence_vmware.py @@ -3,16 +3,24 @@ # # The Following agent has been tested on: # vmrun 2.0.0 build-116503 (from VMware Server 2.0) against: -# VMware ESX 3.5 (works correctly) -# VMware Server 2.0.0 (works correctly) -# VMware ESXi 3.5 update 2 (works correctly) +# VMware ESX 4.0.0 +# VMware vCenter 4.0.0 +# VMware ESX 3.5 +# VMware Server 2.0.0 +# VMware ESXi 3.5 update 2 # VMware Server 1.0.7 (works but list/status show only running VMs) # # VI Perl API 1.6 against: +# VMware ESX 4.0.0 +# VMware vCenter 4.0.0 # VMware ESX 3.5 # VMware ESXi 3.5 update 2 # VMware Virtual Center 2.5 # +# VMware vSphere SDK for Perl 4.0.0 against: +# VMware ESX 4.0.0 +# VMware vCenter 4.0.0 +# import sys, re, pexpect, exceptions sys.path.append("@FENCEAGENTSLIBDIR@") @@ -211,7 +219,7 @@ def get_power_status(conn,options): if (vmware_internal_type==VMWARE_TYPE_ESX): outlets=vmware_get_outlets_vi(conn,options,True) else: - outlets=get_outlets_status(conn,options,False) + outlets=get_outlets_status(conn,options) if ((vmware_internal_type==VMWARE_TYPE_SERVER2) or (vmware_internal_type==VMWARE_TYPE_ESX)): if (not (options["-n"] in outlets)): diff --git a/fence/agents/vmware/fence_vmware_helper.pl b/fence/agents/vmware/fence_vmware_helper.pl index 815728d..a0b5cea 100644 --- a/fence/agents/vmware/fence_vmware_helper.pl +++ b/fence/agents/vmware/fence_vmware_helper.pl @@ -74,7 +74,7 @@ my %opts = ( eval "use VMware::VIRuntime;"; if ($@) { - show_error "Please install VI Perl API package to use this tool!\n"; + show_error "Please install VI Perl API package to use this tool!\nPerl error: $@"; exit 1; }

1 0

cluster: STABLE3 - rgmanager: Fix multiple event processing w/ EVENT_USER
by Lon Hohberger 06 Oct '09

06 Oct '09

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=4b… Commit: 4be8562fc103f2496ab5ed60caeddda5db2980d3 Parent: 156544eef7f19e934a0dbb2d6271c831151c82ff Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Tue Oct 6 16:00:47 2009 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Oct 6 16:02:20 2009 -0400 rgmanager: Fix multiple event processing w/ EVENT_USER We were trying to send responses to each event, which could cause a crash. Resolves: bz527239 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/daemons/slang_event.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/rgmanager/src/daemons/slang_event.c b/rgmanager/src/daemons/slang_event.c index 70a1a6e..de8aa61 100644 --- a/rgmanager/src/daemons/slang_event.c +++ b/rgmanager/src/daemons/slang_event.c @@ -1135,7 +1135,7 @@ S_service_event(const char *file, const char *script, char *name, static int S_user_event(const char *file, const char *script, char *name, - int request, int arg1, int arg2, int target, msgctx_t *ctx) + int request, int arg1, int arg2, int target, msgctx_t **ctx) { int ret = RG_SUCCESS; @@ -1159,20 +1159,21 @@ S_user_event(const char *file, const char *script, char *name, /* XXX Send response code to caller - that 0 should be the new service owner, if there is one */ - if (ctx) { + if (*ctx) { if (_user_return > 0) { /* sl_start_service() squashes return code and node ID into one value. <0 = error, >0 = success, return-value == node id running service */ - send_ret(ctx, name, 0, request, _user_return); + send_ret(*ctx, name, 0, request, _user_return); } else { /* return value < 0 ... pass directly back; don't transpose */ - send_ret(ctx, name, _user_return, request, 0); + send_ret(*ctx, name, _user_return, request, 0); } - msg_close(ctx); - msg_free_ctx(ctx); + msg_close(*ctx); + msg_free_ctx(*ctx); + *ctx = NULL; } _user_return = 0; return ret; @@ -1213,7 +1214,7 @@ slang_do_script(event_t *pattern, event_t *ev) ev->ev.user.u_arg1, ev->ev.user.u_arg2, ev->ev.user.u_target, - ev->ev.user.u_ctx); + &ev->ev.user.u_ctx); break; default: break;

1 0

cluster: RHEL55 - rgmanager: Fix service_property return type
by Lon Hohberger 06 Oct '09

06 Oct '09

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=cf… Commit: cf17511802fceb706729b0cdddeb0e960300d3aa Parent: d3557114c74a96710e0612fb1aed77513835ee90 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Tue Oct 6 15:46:09 2009 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Oct 6 15:46:09 2009 -0400 rgmanager: Fix service_property return type Resolves: bz507431 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/daemons/slang_event.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rgmanager/src/daemons/slang_event.c b/rgmanager/src/daemons/slang_event.c index 0ef2014..d410a40 100644 --- a/rgmanager/src/daemons/slang_event.c +++ b/rgmanager/src/daemons/slang_event.c @@ -996,7 +996,7 @@ SLang_Intrin_Fun_Type rgmanager_slang[] = MAKE_INTRINSIC_0("service_list", sl_service_list, SLANG_VOID_TYPE), MAKE_INTRINSIC_SS("service_property", sl_service_property, - SLANG_STRING_TYPE), + SLANG_VOID_TYPE), MAKE_INTRINSIC_S("service_domain_info", sl_domain_info, SLANG_VOID_TYPE), MAKE_INTRINSIC_0("service_stop", sl_stop_service, SLANG_INT_TYPE), MAKE_INTRINSIC_0("service_start", sl_start_service, SLANG_INT_TYPE),

1 0

cluster: RHEL55 - fence: Allow IP addresses as node names
by Christine Caulfield 06 Oct '09

06 Oct '09

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=d3… Commit: d3557114c74a96710e0612fb1aed77513835ee90 Parent: 1c038cf24c960ffb1d2d9ec40ddbe1a688ed5e07 Author: Christine Caulfield <ccaulfie(a)redhat.com> AuthorDate: Thu Jun 4 16:55:39 2009 +0100 Committer: Christine Caulfield <ccaulfie(a)redhat.com> CommitterDate: Tue Oct 6 08:57:13 2009 +0100 fence: Allow IP addresses as node names When checking if a node is a member of the cluster, fenced does a full-string check of the name. If that doesn't match it then assumes that one of the names is a FQDN and one is truncated so it starts checking the bit before the first dot. If the node names are IP addresses then this will match all of the time for most clusters. eg: 192.168.2.1 will match 192.168.2.2 because it just matches the 192. This makes fenced think that the node has rejoined the cluster because it sees the name in the list of active nodes, and won't fence it. This patch abandons the match check afer the full-string one if the node name is found to be an IP address. bz#504158 Signed-off-by: Christine Caulfield <ccaulfie(a)redhat.com> --- fence/fenced/member_cman.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/fence/fenced/member_cman.c b/fence/fenced/member_cman.c index 3994283..9e22ece 100644 --- a/fence/fenced/member_cman.c +++ b/fence/fenced/member_cman.c @@ -1,7 +1,7 @@ /****************************************************************************** ******************************************************************************* ** -** Copyright (C) 2005 Red Hat, Inc. All rights reserved. +** Copyright (C) 2005-2009 Red Hat, Inc. All rights reserved. ** ** This copyrighted material is made available to anyone wishing to use, ** modify, copy, or redistribute it subject to the terms and conditions @@ -11,6 +11,7 @@ ******************************************************************************/ #include <libcman.h> +#include <arpa/inet.h> #include "fd.h" #define BUFLEN 128 @@ -30,6 +31,7 @@ int our_nodeid; static int name_equal(char *name1, char *name2) { char name3[BUFLEN], name4[BUFLEN]; + char addr1[INET6_ADDRSTRLEN]; int i, len1, len2; len1 = strlen(name1); @@ -38,6 +40,16 @@ static int name_equal(char *name1, char *name2) if (len1 == len2 && !strncmp(name1, name2, len1)) return TRUE; + /* + * If the names are IP addresses then don't compare + * what is in front of the dots. + */ + if (inet_pton(AF_INET, name1, addr1) == 0) + return FALSE; + + if (inet_pton(AF_INET6, name1, addr1) == 0) + return FALSE; + memset(name3, 0, BUFLEN); memset(name4, 0, BUFLEN);

1 0

cluster: STABLE3 - gfs: Update uevents to match gfs2
by Steven Whitehouse 05 Oct '09

05 Oct '09

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=15… Commit: 156544eef7f19e934a0dbb2d6271c831151c82ff Parent: 1d4e80d85ac546bb2e33c531d68164bb2a41b953 Author: Steven Whitehouse <swhiteho(a)redhat.com> AuthorDate: Mon Oct 5 17:28:30 2009 +0100 Committer: Steven Whitehouse <swhiteho(a)redhat.com> CommitterDate: Mon Oct 5 17:28:30 2009 +0100 gfs: Update uevents to match gfs2 bz: #527251 This updates gfs so that it produces the same info as gfs2 where that makes sense. Signed-off-by: Steven Whitehouse <swhiteho(a)redhat.com> --- gfs-kernel/src/gfs/ops_fstype.c | 12 ++++++++++++ gfs-kernel/src/gfs/ops_super.c | 2 ++ gfs-kernel/src/gfs/super.h | 1 + gfs-kernel/src/gfs/sys.c | 23 ++++++++++++++++++++--- 4 files changed, 35 insertions(+), 3 deletions(-) diff --git a/gfs-kernel/src/gfs/ops_fstype.c b/gfs-kernel/src/gfs/ops_fstype.c index d72b74a..2e74d04 100644 --- a/gfs-kernel/src/gfs/ops_fstype.c +++ b/gfs-kernel/src/gfs/ops_fstype.c @@ -585,6 +585,17 @@ fail: return error; } +void gfs_online_uevent(struct gfs_sbd *sdp) +{ + struct super_block *sb = sdp->sd_vfs; + char ro[20]; + char spectator[20]; + char *envp[] = { ro, spectator, NULL }; + sprintf(ro, "RDONLY=%d", (sb->s_flags & MS_RDONLY) ? 1 : 0); + sprintf(spectator, "SPECTATOR=%d", sdp->sd_args.ar_spectator ? 1 : 0); + kobject_uevent_env(&sdp->sd_kobj, KOBJ_ONLINE, envp); +} + /** * fill_super - Read in superblock * @sb: The VFS superblock @@ -715,6 +726,7 @@ static int fill_super(struct super_block *sb, void *data, int silent) gfs_proc_fs_add(sdp); gfs_glock_dq_uninit(&mount_gh); + gfs_online_uevent(sdp); return 0; diff --git a/gfs-kernel/src/gfs/ops_super.c b/gfs-kernel/src/gfs/ops_super.c index 51134d2..0a27b14 100644 --- a/gfs-kernel/src/gfs/ops_super.c +++ b/gfs-kernel/src/gfs/ops_super.c @@ -356,6 +356,8 @@ gfs_remount_fs(struct super_block *sb, int *flags, char *data) /* Don't let the VFS update atimes. GFS handles this itself. */ *flags |= MS_NOATIME | MS_NODIRATIME; + if (error == 0) + gfs_online_uevent(sdp); out: kfree(args); return error; diff --git a/gfs-kernel/src/gfs/super.h b/gfs-kernel/src/gfs/super.h index 4156f33..2ffbb9f 100644 --- a/gfs-kernel/src/gfs/super.h +++ b/gfs-kernel/src/gfs/super.h @@ -49,5 +49,6 @@ int gfs_lock_fs_check_clean(struct gfs_sbd *sdp, unsigned int state, struct gfs_holder *t_gh); int gfs_freeze_fs(struct gfs_sbd *sdp); void gfs_unfreeze_fs(struct gfs_sbd *sdp); +void gfs_online_uevent(struct gfs_sbd *sdp); #endif /* __SUPER_DOT_H__ */ diff --git a/gfs-kernel/src/gfs/sys.c b/gfs-kernel/src/gfs/sys.c index d0d4b07..f20d302 100644 --- a/gfs-kernel/src/gfs/sys.c +++ b/gfs-kernel/src/gfs/sys.c @@ -8,6 +8,7 @@ #include <linux/proc_fs.h> #include <linux/module.h> #include <asm/uaccess.h> +#include <linux/genhd.h> #include "gfs.h" #include "glock.h" @@ -76,20 +77,34 @@ static struct kset *gfs_kset; int gfs_sys_fs_add(struct gfs_sbd *sdp) { + struct super_block *sb = sdp->sd_vfs; int error; + char ro[20]; + char spectator[20]; + char *envp[] = { ro, spectator, NULL }; - sdp->sd_kobj.kset = gfs_kset; + sprintf(ro, "RDONLY=%d", (sb->s_flags & MS_RDONLY) ? 1 : 0); + sprintf(spectator, "SPECTATOR=%d", sdp->sd_args.ar_spectator ? 1 : 0); + sdp->sd_kobj.kset = gfs_kset; error = kobject_init_and_add(&sdp->sd_kobj, &gfs_ktype, NULL, "%s", sdp->sd_table_name); if (error) goto fail; - kobject_uevent(&sdp->sd_kobj, KOBJ_ADD); + error = sysfs_create_link(&sdp->sd_kobj, + &disk_to_dev(sb->s_bdev->bd_disk)->kobj, + "device"); + if (error) + goto fail_put; + + kobject_uevent_env(&sdp->sd_kobj, KOBJ_ADD, envp); return 0; - fail: +fail_put: + kobject_put(&sdp->sd_kobj); +fail: return error; } @@ -104,6 +119,8 @@ static int gfs_uevent(struct kset *kset, struct kobject *kobj, struct gfs_sbd *sdp = container_of(kobj, struct gfs_sbd, sd_kobj); add_uevent_var(env, "LOCKTABLE=%s", sdp->sd_table_name); add_uevent_var(env, "LOCKPROTO=%s", sdp->sd_proto_name); + if (!sdp->sd_args.ar_spectator) + add_uevent_var(env, "JOURNALID=%u", sdp->sd_lockstruct.ls_jid); return 0; }

1 0

cluster: STABLE3 - gfs: Use GFP_NOFS in a few places to be safe
by Steven Whitehouse 05 Oct '09

05 Oct '09

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=1d… Commit: 1d4e80d85ac546bb2e33c531d68164bb2a41b953 Parent: 69408051c88e056ebe8b224c00a5a17fe4a5a924 Author: Steven Whitehouse <swhiteho(a)redhat.com> AuthorDate: Wed Jul 29 17:02:14 2009 +0100 Committer: Steven Whitehouse <swhiteho(a)redhat.com> CommitterDate: Mon Oct 5 16:31:26 2009 +0100 gfs: Use GFP_NOFS in a few places to be safe Just a few updates to avoid any problems resulting from memory allocation during transactions. Signed-off-by: Steven Whitehouse <swhiteho(a)redhat.com> --- gfs-kernel/src/gfs/acl.c | 8 ++++---- gfs-kernel/src/gfs/eattr.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gfs-kernel/src/gfs/acl.c b/gfs-kernel/src/gfs/acl.c index 3936baa..3e9d358 100644 --- a/gfs-kernel/src/gfs/acl.c +++ b/gfs-kernel/src/gfs/acl.c @@ -127,7 +127,7 @@ gfs_acl_get(struct gfs_inode *ip, int access, struct posix_acl **acl) if (!GFS_EA_DATA_LEN(el.el_ea)) goto out; - er.er_data = kmalloc(GFS_EA_DATA_LEN(el.el_ea), GFP_KERNEL); + er.er_data = kmalloc(GFS_EA_DATA_LEN(el.el_ea), GFP_NOFS); error = -ENOMEM; if (!er.er_data) goto out; @@ -214,7 +214,7 @@ gfs_acl_new_prep(struct gfs_inode *dip, } { - struct posix_acl *clone = posix_acl_clone(acl, GFP_KERNEL); + struct posix_acl *clone = posix_acl_clone(acl, GFP_NOFS); error = -ENOMEM; if (!clone) goto out; @@ -250,7 +250,7 @@ gfs_acl_new_prep(struct gfs_inode *dip, b *= 2; b++; - d = kmalloc(s, GFP_KERNEL); + d = kmalloc(s, GFP_NOFS); error = -ENOMEM; if (!d) goto out; @@ -355,7 +355,7 @@ gfs_acl_chmod(struct gfs_inode *ip, struct iattr *attr) if (!GFS_EA_DATA_LEN(el.el_ea)) goto simple; - er.er_data = kmalloc(GFS_EA_DATA_LEN(el.el_ea), GFP_KERNEL); + er.er_data = kmalloc(GFS_EA_DATA_LEN(el.el_ea), GFP_NOFS); error = -ENOMEM; if (!er.er_data) goto out; diff --git a/gfs-kernel/src/gfs/eattr.c b/gfs-kernel/src/gfs/eattr.c index 062b682..0558300 100644 --- a/gfs-kernel/src/gfs/eattr.c +++ b/gfs-kernel/src/gfs/eattr.c @@ -596,7 +596,7 @@ ea_get_unstuffed(struct gfs_inode *ip, struct gfs_ea_header *ea, unsigned int x; int error = 0; - bh = kmalloc(nptrs * sizeof(struct buffer_head *), GFP_KERNEL); + bh = kmalloc(nptrs * sizeof(struct buffer_head *), GFP_NOFS); if (!bh) return -ENOMEM; @@ -1621,7 +1621,7 @@ ea_acl_chmod_unstuffed(struct gfs_inode *ip, unsigned int x; int error; - bh = kmalloc(nptrs * sizeof(struct buffer_head *), GFP_KERNEL); + bh = kmalloc(nptrs * sizeof(struct buffer_head *), GFP_NOFS); if (!bh) return -ENOMEM;

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

cluster-commits October 2009