cluster-commits May 2013

cluster-commits@lists.stg.fedorahosted.org

6 participants
135 discussions

gfs2-utils: master - libgfs2: Clarify gfs2_compute_bitstructs's parameters
by Andrew Price 14 May '13

14 May '13

Gitweb: http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=dfa6d76b29… Commit: dfa6d76b29dcc48c20ebada3ad9f57598b72f490 Parent: f384741c961d1781a39e61e58d2de2d09b50551f Author: Andrew Price <anprice(a)redhat.com> AuthorDate: Mon May 13 12:28:53 2013 +0100 Committer: Andrew Price <anprice(a)redhat.com> CommitterDate: Tue May 14 14:05:12 2013 +0100 libgfs2: Clarify gfs2_compute_bitstructs's parameters gfs2_compute_bitstructs accepted an sdp and only used it to look up the block size. Replace the sdp parameter with a bsize parameter to make it easier to reason through code which uses this function. Signed-off-by: Andrew Price <anprice(a)redhat.com> --- gfs2/convert/gfs2_convert.c | 2 +- gfs2/fsck/rgrepair.c | 6 +++--- gfs2/libgfs2/fs_geometry.c | 2 +- gfs2/libgfs2/libgfs2.h | 2 +- gfs2/libgfs2/rgrp.c | 10 +++++----- gfs2/libgfs2/super.c | 2 +- gfs2/mkfs/main_mkfs.c | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/gfs2/convert/gfs2_convert.c b/gfs2/convert/gfs2_convert.c index d286512..d4bad1d 100644 --- a/gfs2/convert/gfs2_convert.c +++ b/gfs2/convert/gfs2_convert.c @@ -1898,7 +1898,7 @@ static int journ_space_to_rg(struct gfs2_sbd *sdp) rgd->bh[x] = bget(sdp, rgd->ri.ri_addr + x); memset(rgd->bh[x]->b_data, 0, sdp->bsize); } - if (gfs2_compute_bitstructs(sdp, rgd)) { + if (gfs2_compute_bitstructs(sdp->sd_sb.sb_bsize, rgd)) { log_crit(_("gfs2_convert: Error converting bitmaps.\n")); exit(-1); } diff --git a/gfs2/fsck/rgrepair.c b/gfs2/fsck/rgrepair.c index 27368a2..1ebdc70 100644 --- a/gfs2/fsck/rgrepair.c +++ b/gfs2/fsck/rgrepair.c @@ -503,7 +503,7 @@ static int gfs2_rindex_rebuild(struct gfs2_sbd *sdp, int *num_rgs, break; /* end of bitmap, so call it quits. */ } /* for subsequent bitmaps */ - gfs2_compute_bitstructs(sdp, calc_rgd); + gfs2_compute_bitstructs(sdp->sd_sb.sb_bsize, calc_rgd); calc_rgd->ri.ri_data0 = calc_rgd->ri.ri_addr + calc_rgd->ri.ri_length; if (prev_rgd) { @@ -732,7 +732,7 @@ static int expect_rindex_sanity(struct gfs2_sbd *sdp, int *num_rgs) memcpy(&exp->rg, &rgd->rg, sizeof(exp->rg)); exp->bits = NULL; exp->bh = NULL; - gfs2_compute_bitstructs(sdp, exp); + gfs2_compute_bitstructs(sdp->sd_sb.sb_bsize, exp); } sdp->rgrps = *num_rgs; return 0; @@ -948,7 +948,7 @@ int rg_repair(struct gfs2_sbd *sdp, int trust_lvl, int *rg_count, int *sane) } else log_err( _("rindex not fixed.\n")); - gfs2_compute_bitstructs(sdp, actual); + gfs2_compute_bitstructs(sdp->sd_sb.sb_bsize, actual); rindex_modified = FALSE; } e = enext; diff --git a/gfs2/libgfs2/fs_geometry.c b/gfs2/libgfs2/fs_geometry.c index e716127..932a2e6 100644 --- a/gfs2/libgfs2/fs_geometry.c +++ b/gfs2/libgfs2/fs_geometry.c @@ -207,7 +207,7 @@ void build_rgrps(struct gfs2_sbd *sdp, int do_write) rl->rg.rg_header.mh_format = GFS2_FORMAT_RG; rl->rg.rg_free = rgblocks; - if (gfs2_compute_bitstructs(sdp, rl)) { + if (gfs2_compute_bitstructs(sdp->sd_sb.sb_bsize, rl)) { fprintf(stderr, "%s: Unable to build resource groups " "with these characteristics.\n", __FUNCTION__); exit(-1); diff --git a/gfs2/libgfs2/libgfs2.h b/gfs2/libgfs2/libgfs2.h index e069e9d..997e23f 100644 --- a/gfs2/libgfs2/libgfs2.h +++ b/gfs2/libgfs2/libgfs2.h @@ -725,7 +725,7 @@ extern int gfs2_find_jhead(struct gfs2_inode *ip, struct gfs2_log_header *head); extern int clean_journal(struct gfs2_inode *ip, struct gfs2_log_header *head); /* rgrp.c */ -extern int gfs2_compute_bitstructs(struct gfs2_sbd *sdp, struct rgrp_tree *rgd); +extern int gfs2_compute_bitstructs(const uint32_t bsize, struct rgrp_tree *rgd); extern struct rgrp_tree *gfs2_blk2rgrpd(struct gfs2_sbd *sdp, uint64_t blk); extern uint64_t gfs2_rgrp_read(struct gfs2_sbd *sdp, struct rgrp_tree *rgd); extern void gfs2_rgrp_relse(struct rgrp_tree *rgd); diff --git a/gfs2/libgfs2/rgrp.c b/gfs2/libgfs2/rgrp.c index f7dc01e..f2b8304 100644 --- a/gfs2/libgfs2/rgrp.c +++ b/gfs2/libgfs2/rgrp.c @@ -12,11 +12,11 @@ /** * gfs2_compute_bitstructs - Compute the bitmap sizes - * @rgd: The resource group descriptor - * + * bsize: Block size + * rgd: The resource group descriptor * Returns: 0 on success, -1 on error */ -int gfs2_compute_bitstructs(struct gfs2_sbd *sdp, struct rgrp_tree *rgd) +int gfs2_compute_bitstructs(const uint32_t bsize, struct rgrp_tree *rgd) { struct gfs2_bitmap *bits; uint32_t length = rgd->ri.ri_length; @@ -49,7 +49,7 @@ int gfs2_compute_bitstructs(struct gfs2_sbd *sdp, struct rgrp_tree *rgd) bits->bi_len = bytes; } else if (x == 0){ - bytes = sdp->sd_sb.sb_bsize - sizeof(struct gfs2_rgrp); + bytes = bsize - sizeof(struct gfs2_rgrp); bits->bi_offset = sizeof(struct gfs2_rgrp); bits->bi_start = 0; bits->bi_len = bytes; @@ -61,7 +61,7 @@ int gfs2_compute_bitstructs(struct gfs2_sbd *sdp, struct rgrp_tree *rgd) bits->bi_len = bytes; } else{ - bytes = sdp->sd_sb.sb_bsize - sizeof(struct gfs2_meta_header); + bytes = bsize - sizeof(struct gfs2_meta_header); bits->bi_offset = sizeof(struct gfs2_meta_header); bits->bi_start = rgd->ri.ri_bitbytes - bytes_left; bits->bi_len = bytes; diff --git a/gfs2/libgfs2/super.c b/gfs2/libgfs2/super.c index 21c9f7b..eb97c40 100644 --- a/gfs2/libgfs2/super.c +++ b/gfs2/libgfs2/super.c @@ -188,7 +188,7 @@ int rindex_read(struct gfs2_sbd *sdp, int fd, int *count1, int *sane) prev_rgd->length = rgrp_size(prev_rgd); } - if(gfs2_compute_bitstructs(sdp, rgd)) + if(gfs2_compute_bitstructs(sdp->sd_sb.sb_bsize, rgd)) *sane = 0; (*count1)++; diff --git a/gfs2/mkfs/main_mkfs.c b/gfs2/mkfs/main_mkfs.c index 6265c58..80b2782 100644 --- a/gfs2/mkfs/main_mkfs.c +++ b/gfs2/mkfs/main_mkfs.c @@ -606,7 +606,7 @@ static int place_rgrps(struct gfs2_sbd *sdp, const struct mkfs_opts *opts) /* TODO: This call allocates buffer heads and bitmap pointers * in rgt. We really shouldn't need to do that. */ - err = gfs2_compute_bitstructs(sdp, rgt); + err = gfs2_compute_bitstructs(sdp->bsize, rgt); if (err != 0) { fprintf(stderr, _("Could not compute bitmaps. " "Check resource group and block size options.\n"));

1 0

gfs2-utils: master - mkfs.gfs2: Add a struct to store device info
by Andrew Price 14 May '13

14 May '13

Gitweb: http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=f384741c96… Commit: f384741c961d1781a39e61e58d2de2d09b50551f Parent: 531eead1d0ab1bff33e8edbffa2f36ee2e0eadd0 Author: Andrew Price <anprice(a)redhat.com> AuthorDate: Thu Mar 21 19:19:47 2013 +0000 Committer: Andrew Price <anprice(a)redhat.com> CommitterDate: Tue May 14 14:05:12 2013 +0100 mkfs.gfs2: Add a struct to store device info Adds a struct mkfs_dev to store the fd, topology and stat info for the target. Not using lgfs2_device_info as we now probe the topology with libblkid so that functionality should eventually disappear from libgfs2. Signed-off-by: Andrew Price <anprice(a)redhat.com> --- gfs2/mkfs/main_mkfs.c | 173 +++++++++++++++++++++++++++++++++---------------- 1 files changed, 118 insertions(+), 55 deletions(-) diff --git a/gfs2/mkfs/main_mkfs.c b/gfs2/mkfs/main_mkfs.c index 3d6f724..6265c58 100644 --- a/gfs2/mkfs/main_mkfs.c +++ b/gfs2/mkfs/main_mkfs.c @@ -113,6 +113,27 @@ struct mkfs_opts { unsigned confirm:1; }; +/** + * Values probed by libblkid: + * alignment_offset: offset, in bytes, of the start of the dev from its natural alignment + * logical_sector_size: smallest addressable unit + * minimum_io_size: device's preferred unit of I/O. RAID stripe unit. + * optimal_io_size: biggest I/O we can submit without incurring a penalty. RAID stripe width. + * physical_sector_size: the smallest unit we can write atomically + */ +struct mkfs_dev { + int fd; + struct stat stat; + uint64_t size; + unsigned long alignment_offset; + unsigned long logical_sector_size; + unsigned long minimum_io_size; + unsigned long optimal_io_size; + unsigned long physical_sector_size; + + unsigned int got_topol:1; +}; + static void opts_init(struct mkfs_opts *opts) { memset(opts, 0, sizeof(*opts)); @@ -401,25 +422,26 @@ static void are_you_sure(void) free(line); } -static unsigned choose_blocksize(struct mkfs_opts *opts, struct lgfs2_dev_info *dinfo) +static unsigned choose_blocksize(struct mkfs_opts *opts, const struct mkfs_dev *dev) { unsigned int x; unsigned int bsize = opts->bsize; - if (!opts->got_bsize) { - if (S_ISREG(dinfo->stat.st_mode)) - bsize = GFS2_DEFAULT_BSIZE; - /* See if optimal_io_size (the biggest I/O we can submit - without incurring a penalty) is a suitable block size. */ - else if (dinfo->io_optimal_size <= getpagesize() && dinfo->io_optimal_size >= dinfo->io_min_size) - bsize = dinfo->io_optimal_size; - /* See if physical_block_size (the smallest unit we can write - without incurring read-modify-write penalty) is suitable. */ - else if (dinfo->physical_block_size <= getpagesize() && dinfo->physical_block_size >= GFS2_DEFAULT_BSIZE) - bsize = dinfo->physical_block_size; - else - bsize = GFS2_DEFAULT_BSIZE; + if (dev->got_topol && opts->debug) { + printf("alignment_offset: %lu\n", dev->alignment_offset); + printf("logical_sector_size: %lu\n", dev->logical_sector_size); + printf("minimum_io_size: %lu\n", dev->minimum_io_size); + printf("optimal_io_size: %lu\n", dev->optimal_io_size); + printf("physical_sector_size: %lu\n", dev->physical_sector_size); + } + if (!opts->got_bsize && dev->got_topol) { + if (dev->optimal_io_size <= getpagesize() && + dev->optimal_io_size >= dev->minimum_io_size) + bsize = dev->optimal_io_size; + else if (dev->physical_sector_size <= getpagesize() && + dev->physical_sector_size >= GFS2_DEFAULT_BSIZE) + bsize = dev->physical_sector_size; } /* Block sizes must be a power of two from 512 to 65536 */ @@ -431,15 +453,15 @@ static unsigned choose_blocksize(struct mkfs_opts *opts, struct lgfs2_dev_info * die( _("Block size must be a power of two between 512 and %d\n"), getpagesize()); - if (bsize < dinfo->logical_block_size) { + if (bsize < dev->logical_sector_size) { die( _("Error: Block size %d is less than minimum logical " - "block size (%d).\n"), bsize, dinfo->logical_block_size); + "block size (%lu).\n"), bsize, dev->logical_sector_size); } - if (bsize < dinfo->physical_block_size) { + if (bsize < dev->physical_sector_size) { printf( _("Warning: Block size %d is inefficient because it " - "is less than the physical block size (%d).\n"), - bsize, dinfo->physical_block_size); + "is less than the physical block size (%lu).\n"), + bsize, dev->physical_sector_size); opts->confirm = 1; } return bsize; @@ -447,6 +469,11 @@ static unsigned choose_blocksize(struct mkfs_opts *opts, struct lgfs2_dev_info * static void opts_check(struct mkfs_opts *opts) { + if (!opts->got_device) { + fprintf(stderr, _("No device specified. Use -h for help\n")); + exit(1); + } + if (!opts->expert) test_locking(opts->lockproto, opts->locktable); if (opts->expert) { @@ -600,7 +627,7 @@ static int place_rgrps(struct gfs2_sbd *sdp, const struct mkfs_opts *opts) return 0; } -static void sbd_init(struct gfs2_sbd *sdp, struct mkfs_opts *opts, struct lgfs2_dev_info *dinfo, int fd) +static void sbd_init(struct gfs2_sbd *sdp, struct mkfs_opts *opts, struct mkfs_dev *dev) { memset(sdp, 0, sizeof(struct gfs2_sbd)); sdp->time = time(NULL); @@ -609,20 +636,20 @@ static void sbd_init(struct gfs2_sbd *sdp, struct mkfs_opts *opts, struct lgfs2_ sdp->qcsize = opts->qcsize; sdp->jsize = opts->jsize; sdp->md.journals = opts->journals; - sdp->device_fd = fd; - sdp->bsize = choose_blocksize(opts, dinfo); + sdp->device_fd = dev->fd; + sdp->bsize = choose_blocksize(opts, dev); if (compute_constants(sdp)) { perror(_("Failed to compute file system constants")); exit(1); } - sdp->device.length = dinfo->size / sdp->bsize; + sdp->device.length = dev->size / sdp->bsize; if (opts->got_fssize) { if (opts->fssize > sdp->device.length) { fprintf(stderr, _("Specified size is bigger than the device.")); - die("%s %.2f %s (%llu %s)\n", _("Device size:"), - dinfo->size / ((float)(1 << 30)), _("GB"), - (unsigned long long)dinfo->size / sdp->bsize, _("blocks")); + die("%s %.2f %s (%"PRIu64" %s)\n", _("Device size:"), + dev->size / ((float)(1 << 30)), _("GB"), + dev->size / sdp->bsize, _("blocks")); } /* TODO: Check if the fssize is too small, somehow */ sdp->device.length = opts->fssize; @@ -644,18 +671,23 @@ static void sbd_init(struct gfs2_sbd *sdp, struct mkfs_opts *opts, struct lgfs2_ } } -static int probe_contents(int fd) +static int probe_contents(struct mkfs_dev *dev) { int ret; const char *contents; blkid_probe pr = blkid_new_probe(); - if (pr == NULL || blkid_probe_set_device(pr, fd, 0, 0) != 0 + if (pr == NULL || blkid_probe_set_device(pr, dev->fd, 0, 0) != 0 || blkid_probe_enable_superblocks(pr, TRUE) != 0 || blkid_probe_enable_partitions(pr, TRUE) != 0) { fprintf(stderr, _("Failed to create probe\n")); return -1; } + if (!S_ISREG(dev->stat.st_mode) && blkid_probe_enable_topology(pr, TRUE) != 0) { + fprintf(stderr, _("Failed to create probe\n")); + return -1; + } + ret = blkid_do_fullprobe(pr); if (ret == -1) { fprintf(stderr, _("Failed to probe device\n")); @@ -671,53 +703,84 @@ static int probe_contents(int fd) printf(_("It appears to contain a partition table (%s).\n"), contents); } - blkid_free_probe(pr); + if (!S_ISREG(dev->stat.st_mode)) { + blkid_topology tp = blkid_probe_get_topology(pr); + if (tp != NULL) { + dev->alignment_offset = blkid_topology_get_alignment_offset(tp); + dev->logical_sector_size = blkid_topology_get_logical_sector_size(tp); + dev->minimum_io_size = blkid_topology_get_minimum_io_size(tp); + dev->optimal_io_size = blkid_topology_get_optimal_io_size(tp); + dev->physical_sector_size = blkid_topology_get_physical_sector_size(tp); + dev->got_topol = 1; + } + } + blkid_free_probe(pr); return 0; } +static void open_dev(const char *path, struct mkfs_dev *dev) +{ + int error; + + memset(dev, 0, sizeof(*dev)); + dev->fd = open(path, O_RDWR | O_CLOEXEC); + if (dev->fd < 0) { + perror(path); + exit(1); + } + + error = fstat(dev->fd, &dev->stat); + if (error < 0) { + perror(path); + exit(1); + } + + if (S_ISREG(dev->stat.st_mode)) { + dev->size = dev->stat.st_size; + } else if (S_ISBLK(dev->stat.st_mode)) { + dev->size = lseek(dev->fd, 0, SEEK_END); + if (dev->size < 1) { + fprintf(stderr, _("Device '%s' is too small\n"), path); + exit(1); + } + } else { + fprintf(stderr, _("'%s' is not a block device or regular file\n"), path); + exit(1); + } + + error = probe_contents(dev); + if (error) + exit(1); +} + void main_mkfs(int argc, char *argv[]) { struct gfs2_sbd sbd; struct mkfs_opts opts; - struct lgfs2_dev_info dinfo; + struct mkfs_dev dev; int error; unsigned char uuid[16]; - int fd; opts_init(&opts); opts_get(argc, argv, &opts); + opts_check(&opts); - if (!opts.got_device) { - fprintf(stderr, _("No device specified. Use -h for help\n")); - exit(1); - } - - fd = open(opts.device, O_RDWR | O_CLOEXEC); - if (fd < 0){ - perror(opts.device); - exit(EXIT_FAILURE); - } + open_dev(opts.device, &dev); - if (lgfs2_get_dev_info(fd, &dinfo) < 0) { - perror(opts.device); - exit(EXIT_FAILURE); + if (S_ISREG(dev.stat.st_mode)) { + opts.got_bsize = 1; /* Use default block size for regular files */ } - opts_check(&opts); warn_of_destruction(opts.device); - error = probe_contents(fd); - if (error) - exit(EXIT_FAILURE); - - sbd_init(&sbd, &opts, &dinfo, fd); + sbd_init(&sbd, &opts, &dev); if (opts.confirm && !opts.override) are_you_sure(); - if (!S_ISREG(dinfo.stat.st_mode) && opts.discard) - discard_blocks(fd, sbd.bsize * sbd.device.length, opts.debug); + if (!S_ISREG(dev.stat.st_mode) && opts.discard) + discard_blocks(dev.fd, sbd.bsize * sbd.device.length, opts.debug); error = place_rgrps(&sbd, &opts); if (error) { @@ -770,18 +833,18 @@ void main_mkfs(int argc, char *argv[]) inode_put(&sbd.md.statfs); gfs2_rgrp_free(&sbd.rgtree); - error = fsync(fd); + error = fsync(dev.fd); if (error){ perror(opts.device); exit(EXIT_FAILURE); } - error = close(fd); + error = close(dev.fd); if (error){ perror(opts.device); exit(EXIT_FAILURE); } if (!opts.quiet) - print_results(&sbd, dinfo.size, &opts, uuid); + print_results(&sbd, dev.size, &opts, uuid); }

1 0

gfs2-utils: master - mkfs.gfs2: Use libblkid for checking contents
by Andrew Price 14 May '13

14 May '13

Gitweb: http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=531eead1d0… Commit: 531eead1d0ab1bff33e8edbffa2f36ee2e0eadd0 Parent: 227a11136a36ec3c758275a247e9cc1fb401ce44 Author: Andrew Price <anprice(a)redhat.com> AuthorDate: Thu Mar 7 12:09:45 2013 +0000 Committer: Andrew Price <anprice(a)redhat.com> CommitterDate: Tue May 14 14:05:12 2013 +0100 mkfs.gfs2: Use libblkid for checking contents Use libblkid to probe the contents of the target device instead of execing 'file'. Signed-off-by: Andrew Price <anprice(a)redhat.com> --- gfs2/mkfs/main_mkfs.c | 181 ++++++++++++++----------------------------------- 1 files changed, 51 insertions(+), 130 deletions(-) diff --git a/gfs2/mkfs/main_mkfs.c b/gfs2/mkfs/main_mkfs.c index 864ff98..3d6f724 100644 --- a/gfs2/mkfs/main_mkfs.c +++ b/gfs2/mkfs/main_mkfs.c @@ -20,6 +20,7 @@ #include <libintl.h> #include <sys/ioctl.h> #include <limits.h> +#include <blkid.h> #define _(String) gettext(String) @@ -123,6 +124,7 @@ static void opts_init(struct mkfs_opts *opts) opts->rgsize = GFS2_DEFAULT_RGSIZE; opts->lockproto = "lock_dlm"; opts->locktable = ""; + opts->confirm = 1; } #ifndef BLKDISCARD @@ -468,105 +470,6 @@ static void opts_check(struct mkfs_opts *opts) } -static int get_file_output(int fd, char *buffer, size_t buflen) -{ - struct pollfd pf = { .fd = fd, .events = POLLIN|POLLRDHUP }; - int flags; - int pos = 0; - int rv; - - flags = fcntl(fd, F_GETFL, 0); - if (flags < 0) - return flags; - - flags |= O_NONBLOCK; - rv = fcntl(fd, F_SETFL, flags); - if (rv < 0) - return rv; - - while (1) { - rv = poll(&pf, 1, 10 * 1000); - if (rv == 0) - break; - if (rv < 0) - return rv; - if (pf.revents & POLLIN) { - rv = read(fd, buffer + pos, - buflen - pos); - if (rv < 0) { - if (errno == EAGAIN) - continue; - return rv; - } - if (rv == 0) - break; - pos += rv; - if (pos >= buflen) - return -1; - buffer[pos] = 0; - continue; - } - if (pf.revents & (POLLRDHUP | POLLHUP | POLLERR)) - break; - } - return 0; -} - -static void check_dev_content(const char *devname) -{ - struct sigaction sa; - char content[1024] = { 0, }; - char * args[] = { - (char *)"/usr/bin/file", - (char *)"-bsL", - (char *)devname, - NULL }; - int p[2] = {-1, -1}; - int ret; - int pid; - - ret = sigaction(SIGCHLD, NULL, &sa); - if (ret) - return; - sa.sa_handler = SIG_IGN; - sa.sa_flags |= (SA_NOCLDSTOP | SA_NOCLDWAIT); - ret = sigaction(SIGCHLD, &sa, NULL); - if (ret) - goto fail; - - ret = pipe(p); - if (ret) - goto fail; - - pid = fork(); - - if (pid < 0) { - close(p[1]); - goto fail; - } - - if (pid) { - close(p[1]); - ret = get_file_output(p[0], content, sizeof(content)); - if (ret) { -fail: - printf( _("Content of file or device unknown (do you have GNU fileutils installed?)\n")); - } else { - if (*content == 0) - goto fail; - printf( _("It appears to contain: %s"), content); - } - if (p[0] >= 0) - close(p[0]); - return; - } - - close(p[0]); - dup2(p[1], STDOUT_FILENO); - close(STDIN_FILENO); - exit(execv(args[0], args)); -} - static void print_results(struct gfs2_sbd *sdp, uint64_t real_device_size, struct mkfs_opts *opts, unsigned char uuid[16]) { @@ -587,30 +490,27 @@ static void print_results(struct gfs2_sbd *sdp, uint64_t real_device_size, printf("%-27s%s\n", _("UUID:"), str_uuid(uuid)); } -/** - * If path is a symlink, return 1 with *abspath pointing to the absolute path, - * otherwise return 0. Exit on errors. The caller must free the memory pointed - * to by *abspath. - */ -static int is_symlink(const char *path, char **abspath) +static void warn_of_destruction(const char *path) { struct stat lnkstat; + char *abspath = NULL; if (lstat(path, &lnkstat) == -1) { perror(_("Failed to lstat the device")); exit(EXIT_FAILURE); } - if (!S_ISLNK(lnkstat.st_mode)) { - return 0; - } - *abspath = canonicalize_file_name(path); - if (*abspath == NULL) { - perror(_("Could not find the absolute path of the device")); - exit(EXIT_FAILURE); + if (S_ISLNK(lnkstat.st_mode)) { + abspath = canonicalize_file_name(path); + if (abspath == NULL) { + perror(_("Could not find the absolute path of the device")); + exit(EXIT_FAILURE); + } + /* Translators: Example: "/dev/vg/lv is a symbolic link to /dev/dm-2" */ + printf( _("%s is a symbolic link to %s\n"), path, abspath); + path = abspath; } - /* Translators: Example: "/dev/vg/lv is a symbolic link to /dev/dm-2" */ - printf( _("%s is a symbolic link to %s\n"), path, *abspath); - return 1; + printf(_("This will destroy any data on %s\n"), path); + free(abspath); } static int writerg(int fd, const struct rgrp_tree *rgt, const unsigned bsize) @@ -744,6 +644,38 @@ static void sbd_init(struct gfs2_sbd *sdp, struct mkfs_opts *opts, struct lgfs2_ } } +static int probe_contents(int fd) +{ + int ret; + const char *contents; + blkid_probe pr = blkid_new_probe(); + if (pr == NULL || blkid_probe_set_device(pr, fd, 0, 0) != 0 + || blkid_probe_enable_superblocks(pr, TRUE) != 0 + || blkid_probe_enable_partitions(pr, TRUE) != 0) { + fprintf(stderr, _("Failed to create probe\n")); + return -1; + } + + ret = blkid_do_fullprobe(pr); + if (ret == -1) { + fprintf(stderr, _("Failed to probe device\n")); + return -1; + } + + if (ret == 1) + return 0; + + if (!blkid_probe_lookup_value(pr, "TYPE", &contents, NULL)) { + printf(_("It appears to contain an existing filesystem (%s)\n"), contents); + } else if (!blkid_probe_lookup_value(pr, "PTTYPE", &contents, NULL)) { + printf(_("It appears to contain a partition table (%s).\n"), contents); + } + + blkid_free_probe(pr); + + return 0; +} + void main_mkfs(int argc, char *argv[]) { struct gfs2_sbd sbd; @@ -751,9 +683,6 @@ void main_mkfs(int argc, char *argv[]) struct lgfs2_dev_info dinfo; int error; unsigned char uuid[16]; - char *absname = NULL; - char *fdpath = NULL; - int islnk = 0; int fd; opts_init(&opts); @@ -776,21 +705,13 @@ void main_mkfs(int argc, char *argv[]) } opts_check(&opts); - sbd_init(&sbd, &opts, &dinfo, fd); + warn_of_destruction(opts.device); - if (asprintf(&fdpath, "/proc/%d/fd/%d", getpid(), fd) < 0) { - perror(_("Failed to build string")); + error = probe_contents(fd); + if (error) exit(EXIT_FAILURE); - } - if (!opts.override) { - islnk = is_symlink(opts.device, &absname); - printf(_("This will destroy any data on %s.\n"), islnk ? absname : opts.device); - free(absname); - check_dev_content(fdpath); - opts.confirm = 1; - } - free(fdpath); + sbd_init(&sbd, &opts, &dinfo, fd); if (opts.confirm && !opts.override) are_you_sure();

1 0

gfs2-utils: master - mkfs.gfs2: Link to libblkid
by Andrew Price 14 May '13

14 May '13

Gitweb: http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=227a11136a… Commit: 227a11136a36ec3c758275a247e9cc1fb401ce44 Parent: 1cebece3e922bfffa52f58ac6594700764868771 Author: Andrew Price <anprice(a)redhat.com> AuthorDate: Wed Mar 6 16:38:18 2013 +0000 Committer: Andrew Price <anprice(a)redhat.com> CommitterDate: Tue May 14 14:05:12 2013 +0100 mkfs.gfs2: Link to libblkid Add the build system bits to check for, and link mkfs.gfs2 to libblkid. Signed-off-by: Andrew Price <anprice(a)redhat.com> --- configure.ac | 1 + gfs2/mkfs/Makefile.am | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index 45b38eb..6940d79 100644 --- a/configure.ac +++ b/configure.ac @@ -126,6 +126,7 @@ PKG_CHECK_MODULES([check], [check >= 0.9.8], AM_CONDITIONAL([BUILD_TESTS], [test "x$have_check" = "xyes"]) PKG_CHECK_MODULES([zlib],[zlib]) +PKG_CHECK_MODULES([blkid],[blkid]) # old versions of ncurses don't ship pkg-config files PKG_CHECK_MODULES([ncurses],[ncurses],, diff --git a/gfs2/mkfs/Makefile.am b/gfs2/mkfs/Makefile.am index 3e72026..6ed89fa 100644 --- a/gfs2/mkfs/Makefile.am +++ b/gfs2/mkfs/Makefile.am @@ -20,6 +20,9 @@ mkfs_gfs2_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \ -I$(top_srcdir)/gfs2/include \ -I$(top_srcdir)/gfs2/libgfs2 +mkfs_gfs2_CFLAGS = $(blkid_CFLAGS) +mkfs_gfs2_LDFLAGS = $(blkid_LIBS) + mkfs_gfs2_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la relative_sbin = $(shell perl -MFile::Spec -le 'print File::Spec->abs2rel("/sbin", "$(sbindir)")')

1 0

gfs2-utils: master - libgfs2: Remove 'writes' field from gfs2_sbd
by Andrew Price 14 May '13

14 May '13

Gitweb: http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=1cebece3e9… Commit: 1cebece3e922bfffa52f58ac6594700764868771 Parent: a3ab08213c87313ec899c114c23650d05268eef5 Author: Andrew Price <anprice(a)redhat.com> AuthorDate: Fri Mar 1 16:03:52 2013 +0000 Committer: Andrew Price <anprice(a)redhat.com> CommitterDate: Tue May 14 14:05:11 2013 +0100 libgfs2: Remove 'writes' field from gfs2_sbd This was only used to print out how many writes mkfs.gfs2 had made during its run in debug mode, which doesn't really make sense any more as we don't use bwrite for much of the mkfs process now. Signed-off-by: Andrew Price <anprice(a)redhat.com> --- gfs2/libgfs2/buf.c | 1 - gfs2/libgfs2/libgfs2.h | 1 - gfs2/mkfs/main_mkfs.c | 5 ----- 3 files changed, 0 insertions(+), 7 deletions(-) diff --git a/gfs2/libgfs2/buf.c b/gfs2/libgfs2/buf.c index 68f0731..6fcdd17 100644 --- a/gfs2/libgfs2/buf.c +++ b/gfs2/libgfs2/buf.c @@ -80,7 +80,6 @@ int bwrite(struct gfs2_buffer_head *bh) if (pwritev(sdp->device_fd, &bh->iov, 1, bh->b_blocknr * sdp->bsize) != bh->iov.iov_len) return -1; - sdp->writes++; bh->b_modified = 0; return 0; } diff --git a/gfs2/libgfs2/libgfs2.h b/gfs2/libgfs2/libgfs2.h index 7d2d9ff..e069e9d 100644 --- a/gfs2/libgfs2/libgfs2.h +++ b/gfs2/libgfs2/libgfs2.h @@ -311,7 +311,6 @@ struct gfs2_sbd { struct gfs2_inode *master_dir; struct master_dir md; - unsigned int writes; int metafs_fd; char metafs_path[PATH_MAX]; /* where metafs is mounted */ struct special_blocks eattr_blocks; diff --git a/gfs2/mkfs/main_mkfs.c b/gfs2/mkfs/main_mkfs.c index 6471600..864ff98 100644 --- a/gfs2/mkfs/main_mkfs.c +++ b/gfs2/mkfs/main_mkfs.c @@ -583,15 +583,10 @@ static void print_results(struct gfs2_sbd *sdp, uint64_t real_device_size, printf("%-27s%llu\n", _("Resource groups:"), (unsigned long long)sdp->rgrps); printf("%-27s\"%s\"\n", _("Locking protocol:"), sdp->lockproto); printf("%-27s\"%s\"\n", _("Lock table:"), sdp->locktable); - - if (opts->debug) { - printf("%-27s%u\n", _("Writes:"), sdp->writes); - } /* Translators: "UUID" = universally unique identifier. */ printf("%-27s%s\n", _("UUID:"), str_uuid(uuid)); } - /** * If path is a symlink, return 1 with *abspath pointing to the absolute path, * otherwise return 0. Exit on errors. The caller must free the memory pointed

1 0

gfs2-utils: master - mkfs.gfs2: Add options for stripe size and width
by Andrew Price 14 May '13

14 May '13

Gitweb: http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=a3ab08213c… Commit: a3ab08213c87313ec899c114c23650d05268eef5 Parent: 457c8b6139c5c277db5a8b1a4a8d81aefeded05a Author: Andrew Price <anprice(a)redhat.com> AuthorDate: Fri Mar 1 15:56:58 2013 +0000 Committer: Andrew Price <anprice(a)redhat.com> CommitterDate: Tue May 14 13:48:46 2013 +0100 mkfs.gfs2: Add options for stripe size and width Add generic parsing of options passed in with -o and use it to accept sunit and swidth options (names chosen to be the same as mkfs.xfs). We don't do anything with these options yet. Signed-off-by: Andrew Price <anprice(a)redhat.com> --- gfs2/mkfs/main_mkfs.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 98 insertions(+), 2 deletions(-) diff --git a/gfs2/mkfs/main_mkfs.c b/gfs2/mkfs/main_mkfs.c index 610a641..6471600 100644 --- a/gfs2/mkfs/main_mkfs.c +++ b/gfs2/mkfs/main_mkfs.c @@ -19,6 +19,7 @@ #include <sys/time.h> #include <libintl.h> #include <sys/ioctl.h> +#include <limits.h> #define _(String) gettext(String) @@ -55,6 +56,7 @@ static void print_usage(const char *prog_name) "-j", _("<number>"), _("Number of journals"), "-K", NULL, _("Don't try to discard unused blocks"), "-O", NULL, _("Don't ask for confirmation"), + "-o", _("<key>[=<value>][,...]"), _("Specify extended options"), "-p", _("<name>"), _("Name of the locking protocol"), "-q", NULL, _("Don't print anything"), "-r", _("<size>"), _("Size of resource groups, in megabytes"), @@ -73,7 +75,7 @@ static void print_usage(const char *prog_name) option = options[i]; param = options[i+1]; desc = options[i+2]; - printf("%3s %-15s %s\n", option, param ? param : "", desc); + printf("%3s %-22s %s\n", option, param ? param : "", desc); } } @@ -82,6 +84,8 @@ struct mkfs_opts { unsigned qcsize; unsigned jsize; unsigned rgsize; + unsigned sunit; + unsigned swidth; uint64_t fssize; uint32_t journals; const char *lockproto; @@ -93,6 +97,8 @@ struct mkfs_opts { unsigned got_qcsize:1; unsigned got_jsize:1; unsigned got_rgsize:1; + unsigned got_sunit:1; + unsigned got_swidth:1; unsigned got_fssize:1; unsigned got_journals:1; unsigned got_lockproto:1; @@ -145,11 +151,91 @@ static int discard_blocks(int fd, uint64_t len, int debug) return 0; } +/** + * Convert a human-readable size string to a long long. + * Copied and adapted from xfs_mkfs.c. + */ +static long long cvtnum(unsigned int blocksize, unsigned int sectorsize, const char *s) +{ + long long i; + char *sp; + + i = strtoll(s, &sp, 0); + if (i == 0 && sp == s) + return -1LL; + if (*sp == '\0') + return i; + + *sp = tolower(*sp); + if (*sp == 'b' && sp[1] == '\0') { + if (blocksize) + return i * blocksize; + fprintf(stderr, _("Block size not available yet.\n")); + exit(1); + } + if (*sp == 's' && sp[1] == '\0') { + if (sectorsize) + return i * sectorsize; + return i * GFS2_BASIC_BLOCK; + } + if (*sp == 'k' && sp[1] == '\0') + return 1024LL * i; + if (*sp == 'm' && sp[1] == '\0') + return 1024LL * 1024LL * i; + if (*sp == 'g' && sp[1] == '\0') + return 1024LL * 1024LL * 1024LL * i; + if (*sp == 't' && sp[1] == '\0') + return 1024LL * 1024LL * 1024LL * 1024LL * i; + if (*sp == 'p' && sp[1] == '\0') + return 1024LL * 1024LL * 1024LL * 1024LL * 1024LL * i; + if (*sp == 'e' && sp[1] == '\0') + return 1024LL * 1024LL * 1024LL * 1024LL * 1024LL * 1024LL * i; + return -1LL; +} + +static void parse_unsigned(struct mkfs_opts *opts, const char *key, const char *val, unsigned *n) +{ + long long l; + if (val == NULL || *val == '\0') { + fprintf(stderr, _("Missing argument to '%s'\n"), key); + exit(-1); + } + l = cvtnum(opts->bsize, 0, val); + if (l > UINT_MAX || l < 0) { + fprintf(stderr, _("Value of '%s' is invalid\n"), key); + exit(-1); + } + *n = (unsigned)l; +} + +static void opt_parse_extended(char *str, struct mkfs_opts *opts) +{ + char *opt; + while ((opt = strsep(&str, ",")) != NULL) { + char *key = strsep(&opt, "="); + char *val = strsep(&opt, "="); + if (key == NULL || *key == '\0') { + fprintf(stderr, _("Missing argument to '-o' option\n")); + exit(-1); + } + if (strcmp("sunit", key) == 0) { + parse_unsigned(opts, "sunit", val, &opts->sunit); + opts->got_sunit = 1; + } else if (strcmp("swidth", key) == 0) { + parse_unsigned(opts, "swidth", val, &opts->swidth); + opts->got_swidth = 1; + } else { + fprintf(stderr, _("Invalid option '%s'\n"), key); + exit(-1); + } + } +} + static void opts_get(int argc, char *argv[], struct mkfs_opts *opts) { int c; while (1) { - c = getopt(argc, argv, "-b:c:DhJ:j:KOp:qr:t:VX"); + c = getopt(argc, argv, "-b:c:DhJ:j:KOo:p:qr:t:VX"); if (c == -1) break; @@ -197,6 +283,9 @@ static void opts_get(int argc, char *argv[], struct mkfs_opts *opts) opts->rgsize = atoi(optarg); opts->got_rgsize = 1; break; + case 'o': + opt_parse_extended(optarg, opts); + break; case 'V': printf("mkfs.gfs2 %s (built %s %s)\n", VERSION, __DATE__, __TIME__); @@ -655,6 +744,8 @@ static void sbd_init(struct gfs2_sbd *sdp, struct mkfs_opts *opts, struct lgfs2_ printf(" rgsize = %u\n", sdp->rgsize); printf(" table = %s\n", sdp->locktable); printf(" fssize = %"PRIu64"\n", opts->fssize); + printf(" sunit = %u\n", opts->sunit); + printf(" swidth = %u\n", opts->swidth); } } @@ -673,6 +764,11 @@ void main_mkfs(int argc, char *argv[]) opts_init(&opts); opts_get(argc, argv, &opts); + if (!opts.got_device) { + fprintf(stderr, _("No device specified. Use -h for help\n")); + exit(1); + } + fd = open(opts.device, O_RDWR | O_CLOEXEC); if (fd < 0){ perror(opts.device);

1 0

cluster: RHEL510 - fencing: Fix regression on fence_drac5
by Marek Grác 13 May '13

13 May '13

Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=eaf31c53c822f… Commit: eaf31c53c822f73d31c4b4f2f586b27277ba9b10 Parent: be4ffa1bed23328a36b182b69c1c355abb7e16af Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Mon May 13 14:44:54 2013 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Mon May 13 14:46:40 2013 +0200 fencing: Fix regression on fence_drac5 Autodetect of EOL was not working properly if --ssh/-x was used. Resolves: rhbz#904195 --- configure | 8 ++++---- fence/agents/Makefile | 6 +++--- fence/agents/drac/fence_drac5.py | 8 ++++++++ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 05fc58e..0bcbcc2 100755 --- a/configure +++ b/configure @@ -33,8 +33,8 @@ echo "configure gnbd" echo "configure rgmanager" (cd rgmanager; ./configure $@) -echo "configure cmirror" -(cd cmirror; ./configure $@) +#echo "configure cmirror" +#(cd cmirror; ./configure $@) -echo "configure cmirror-kernel" -(cd cmirror-kernel; ./configure $@) +#echo "configure cmirror-kernel" +#(cd cmirror-kernel; ./configure $@) diff --git a/fence/agents/Makefile b/fence/agents/Makefile index 669e291..e1d7eb4 100644 --- a/fence/agents/Makefile +++ b/fence/agents/Makefile @@ -33,7 +33,7 @@ all: ${MAKE} -C ipdu all ${MAKE} -C ipmilan all ${MAKE} -C lpar all - ${MAKE} -C manual all +# ${MAKE} -C manual all ${MAKE} -C mcdata all # ${MAKE} -C rackswitch all ${MAKE} -C rhevm all @@ -69,7 +69,7 @@ install: all ${MAKE} -C ipdu install ${MAKE} -C ipmilan install ${MAKE} -C lpar install - ${MAKE} -C manual install +# ${MAKE} -C manual install ${MAKE} -C mcdata install # ${MAKE} -C rackswitch install ${MAKE} -C rhevm install @@ -105,7 +105,7 @@ clean: ${MAKE} -C ipdu clean ${MAKE} -C ipmilan clean ${MAKE} -C lpar clean - ${MAKE} -C manual clean +# ${MAKE} -C manual clean ${MAKE} -C mcdata clean # ${MAKE} -C rackswitch clean ${MAKE} -C rhevm clean diff --git a/fence/agents/drac/fence_drac5.py b/fence/agents/drac/fence_drac5.py index 298339f..7cc099a 100755 --- a/fence/agents/drac/fence_drac5.py +++ b/fence/agents/drac/fence_drac5.py @@ -52,7 +52,15 @@ def set_power_status(conn, options): conn.send_eol("racadm serveraction " + action + " -m " + options["-m"]) elif options["model"] == "DRAC 5": conn.send_eol("racadm serveraction " + action) + + ## Fix issue with double-enter [CR/LF] + ## We need to read two additional command prompts (one from get + one from set command) conn.log_expect(options, options["-c"], int(options["-g"])) + if len(conn.before.strip()) == 0: + options["eol"] = options["eol"][:-1] + conn.log_expect(options, options["-c"], int(options["-g"])) + conn.log_expect(options, options["-c"], int(options["-g"])) + except pexpect.EOF: fail(EC_CONNECTION_LOST) except pexpect.TIMEOUT:

1 0

cluster: RHEL510 - fencing: Add support for APC with firmware 5.x
by Marek Grác 13 May '13

13 May '13

Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=be4ffa1bed233… Commit: be4ffa1bed23328a36b182b69c1c355abb7e16af Parent: d45ceaa6e243733f801ce6aa8519d741a1801e34 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Mon May 13 14:35:30 2013 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Mon May 13 14:35:30 2013 +0200 fencing: Add support for APC with firmware 5.x Patch is based on a commit https://git.fedorahosted.org/cgit/fence-agents.git/commit/?id=dfff684d59a6c… Resolves: rhbz#886612 --- fence/agents/apc/fence_apc.py | 53 +++++++++++++++++++++++++++++++++++++--- fence/agents/lib/fencing.py.py | 15 ++++++++++- 2 files changed, 62 insertions(+), 6 deletions(-) diff --git a/fence/agents/apc/fence_apc.py b/fence/agents/apc/fence_apc.py index 4125d39..a3a8f01 100755 --- a/fence/agents/apc/fence_apc.py +++ b/fence/agents/apc/fence_apc.py @@ -69,7 +69,7 @@ def get_power_status(conn, options): conn.send_eol(options["-s"]) while True: - exp_result = conn.log_expect(options, [ options["-c"], "Press <ENTER>" ], int(options["-Y"])) + exp_result = conn.log_expect(options, options["-c"] + ["Press <ENTER>" ], int(options["-Y"])) lines = conn.before.split("\n"); show_re = re.compile('(^|\x0D)\s*(\d+)- (.*?)\s+(ON|OFF)\s*') for x in lines: @@ -152,7 +152,7 @@ def set_power_status(conn, options): else: conn.send_eol(options["-s"]) - while 1 == conn.log_expect(options, [ options["-c"], "Press <ENTER>" ], int(options["-Y"])): + while 1 == conn.log_expect(options, options["-c"] + [ "Press <ENTER>" ], int(options["-Y"])): conn.send_eol("") conn.send_eol(options["-n"]+"") conn.log_expect(options, options["-c"], int(options["-Y"])) @@ -182,6 +182,40 @@ def set_power_status(conn, options): except pexpect.TIMEOUT: fail(EC_TIMED_OUT) +def get_power_status5(conn, options): + exp_result = 0 + outlets = {} + + conn.send_eol("olStatus all") + + exp_result = conn.log_expect(options, options["-c"], int(options["-Y"])) + lines = conn.before.split("\n") + + show_re = re.compile('^\s*(\d+): (.*): (On|Off)\s*$', re.IGNORECASE) + + for x in lines: + res = show_re.search(x) + if (res != None): + outlets[res.group(1)] = (res.group(2), res.group(3)) + + if ["list", "monitor"].count(options["-o"]) == 1: + return outlets + else: + try: + (_, status) = outlets[options["-n"]] + return status.lower().strip() + except KeyError: + fail(EC_STATUS) + +def set_power_status5(conn, options): + action = { + 'on' : "olOn", + 'off': "olOff" + }[options["--action"]] + + conn.send_eol(action + " " + options["-n"]) + conn.log_expect(options, options["-c"], int(options["-g"])) + def main(): device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", "action", "ipaddr", "login", "passwd", "passwd_script", @@ -199,7 +233,9 @@ def main(): options["ssh_options"] = "-1 -c blowfish" if 0 == options.has_key("-c"): - options["-c"] = "\n>" + options["-c"] = [ "\n>", "\napc" ] + else: + options["-c"] = [ options["-c"] ] docs = { } docs["shortdesc"] = "Fence agent for APC over telnet/ssh" @@ -221,7 +257,16 @@ will block any necessary fencing actions." ## Operate the fencing device #### conn = fence_login(options) - result = fence_action(conn, options, set_power_status, get_power_status, get_power_status) + + ## Detect firmware version (ASCII menu vs command-line interface) + ## and continue with proper action + #### + result = -1 + firmware_version = re.compile('\s*v(\d)*\.').search(conn.before) + if (firmware_version != None) and (firmware_version.group(1) == "5"): + result = fence_action(conn, options, set_power_status5, get_power_status5, get_power_status5) + else: + result = fence_action(conn, options, set_power_status, get_power_status, get_power_status) ## ## Logout from system diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index 25a0f7e..d1e43da 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -870,7 +870,8 @@ def fence_login(options): time.sleep(int(options["-f"])) try: - re_login = re.compile("(login\s*: )|(Login Name: )|(username: )|(User Name :)", re.IGNORECASE) + re_login_string = "(login\s*: )|(Login Name: )|(username: )|(User Name :)" + re_login = re.compile(re_login_string, re.IGNORECASE) re_pass = re.compile("password", re.IGNORECASE) if options.has_key("-z"): @@ -957,7 +958,17 @@ def fence_login(options): try: conn.send_eol(options["-p"]) - conn.log_expect(options, options["-c"], int(options["-Y"])) + + valid_password = conn.log_expect(options, [ re_login_string ] + options["-c"], int(options["-Y"])) + if valid_password == 0: + ## password is invalid or we have to change EOL separator + options["eol"] = "\r" + conn.send_eol("") + conn.send_eol("") + conn.send_eol(options["-l"]) + conn.log_expect(options, re_pass, int(options["-y"])) + conn.send_eol(options["-p"]) + conn.log_expect(options, options["-c"], int(options["-y"])) except KeyError: fail(EC_PASSWORD_MISSING) except pexpect.EOF:

1 0

cluster: RHEL6 - fenced/dlm_controld/gfs_controld: use cluster_dead for corosync connections
by David Teigland 10 May '13

10 May '13

Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=62a5ab048683b… Commit: 62a5ab048683b4ce77f0eeaba81d3330da574d41 Parent: 8b67fbb6e5e95510fcecbdd5cd5a91aa88f97750 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Fri Jan 4 11:44:13 2013 -0600 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Fri May 10 09:41:41 2013 -0500 fenced/dlm_controld/gfs_controld: use cluster_dead for corosync connections corosync connections are supposed to use the cluster_dead() function, not the client_dead() function. The client_dead() function closes the fd directly, which in the case of corosync connections, fouls up the ipc, because the ipc is still expecting to use that fd, which the daemon has reused for something else. The next time the daemon calls into corosync ipc, it gets stuck in a poll/futex loop as the lib attempts to use the fd that fenced has wrongly closed. bz 888857 Signed-off-by: David Teigland <teigland(a)redhat.com> --- fence/fenced/cpg.c | 2 +- group/dlm_controld/cpg.c | 2 +- group/gfs_controld/cpg-new.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fence/fenced/cpg.c b/fence/fenced/cpg.c index 6634f8c..a5a4208 100644 --- a/fence/fenced/cpg.c +++ b/fence/fenced/cpg.c @@ -1748,7 +1748,7 @@ int fd_join(struct fd *fd) cpg_fd_get(cpg_handle_domain, &cpg_fd_domain); - ci = client_add(cpg_fd_domain, process_cpg_domain, NULL); + ci = client_add(cpg_fd_domain, process_cpg_domain, cluster_dead); list_add(&fd->list, &domains); fd->cpg_handle = cpg_handle_domain; diff --git a/group/dlm_controld/cpg.c b/group/dlm_controld/cpg.c index 4463f4d..6a4023b 100644 --- a/group/dlm_controld/cpg.c +++ b/group/dlm_controld/cpg.c @@ -1822,7 +1822,7 @@ int dlm_join_lockspace(struct lockspace *ls) cpg_fd_get(h, &fd); - ci = client_add(fd, process_cpg_lockspace, NULL); + ci = client_add(fd, process_cpg_lockspace, cluster_dead); list_add(&ls->list, &lockspaces); diff --git a/group/gfs_controld/cpg-new.c b/group/gfs_controld/cpg-new.c index 0cdfaae..537624d 100644 --- a/group/gfs_controld/cpg-new.c +++ b/group/gfs_controld/cpg-new.c @@ -2773,7 +2773,7 @@ int gfs_join_mountgroup(struct mountgroup *mg) cpg_fd_get(h, &fd); - ci = client_add(fd, process_cpg_mountgroup, NULL); + ci = client_add(fd, process_cpg_mountgroup, cluster_dead); mg->cpg_handle = h; mg->cpg_client = ci;

1 0

cluster: RHEL6 - gfs_controld: avoid mismatching messages with old cgs
by David Teigland 09 May '13

09 May '13

Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=8b67fbb6e5e95… Commit: 8b67fbb6e5e95510fcecbdd5cd5a91aa88f97750 Parent: f50e499e44e5c7f1920e93c9b26b61c8c8468d48 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Thu Jan 3 13:35:54 2013 -0600 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Thu May 9 10:13:16 2013 -0500 gfs_controld: avoid mismatching messages with old cgs Only match start messages with cg's that are newer than previously matched cg's for the node. bz 889564 Signed-off-by: David Teigland <teigland(a)redhat.com> --- group/gfs_controld/cpg-new.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/group/gfs_controld/cpg-new.c b/group/gfs_controld/cpg-new.c index fd20250..0cdfaae 100644 --- a/group/gfs_controld/cpg-new.c +++ b/group/gfs_controld/cpg-new.c @@ -121,6 +121,7 @@ struct node { int failed_reason; uint32_t added_seq; uint32_t removed_seq; + uint32_t last_match_seq; uint64_t add_time; int withdraw; @@ -1001,6 +1002,15 @@ static int match_change(struct mountgroup *mg, struct change *cg, return 0; } + /* if we matched the last start message from this node against our + cg N, then don't match this stsart message against an earlier cg */ + + if (node->last_match_seq > cg->seq) { + log_debug("match_change %d:%u skip cg %u last matched cg %u", + hd->nodeid, seq, cg->seq, node->last_match_seq); + return 0; + } + /* verify this is the right change by matching the counts and the nodeids of the current members */ @@ -1035,6 +1045,8 @@ static int match_change(struct mountgroup *mg, struct change *cg, if (members_mismatch) return 0; + node->last_match_seq = cg->seq; + log_group(mg, "match_change %d:%u matches cg %u", hd->nodeid, seq, cg->seq); return 1;

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

cluster-commits May 2013