X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=cmd_device.c;h=d4282f75290c40517818203c4a45af60db300f99;hb=bc1680d488a7694369dc219f92a8f4bb1331841c;hp=92d3125b133dd4a8e34bc97a6a98dc3890124e11;hpb=9b08492bc733f3b1b1eefc87a4c52d9673432e42;p=bcachefs-tools-debian diff --git a/cmd_device.c b/cmd_device.c index 92d3125..d4282f7 100644 --- a/cmd_device.c +++ b/cmd_device.c @@ -12,13 +12,36 @@ #include #include +#include "libbcachefs/bcachefs.h" #include "libbcachefs/bcachefs_ioctl.h" +#include "libbcachefs/errcode.h" +#include "libbcachefs/journal.h" +#include "libbcachefs/sb-members.h" #include "libbcachefs/super-io.h" #include "cmds.h" #include "libbcachefs.h" #include "libbcachefs/opts.h" #include "tools-util.h" +int device_usage(void) +{ + puts("bcachefs device - manage devices within a running filesystem\n" + "Usage: bcachefs device [OPTION]\n" + "\n" + "Commands:\n" + " add add a new device to an existing filesystem\n" + " remove remove a device from an existing filesystem\n" + " online re-add an existing member to a filesystem\n" + " offline take a device offline, without removing it\n" + " evacuate migrate data off a specific device\n" + " set-state mark a device as failed\n" + " resize resize filesystem on a device\n" + " resize-journal resize journal on a device\n" + "\n" + "Report bugs to "); + return 0; +} + static void device_add_usage(void) { puts("bcachefs device add - add a device to an existing filesystem\n" @@ -28,11 +51,11 @@ static void device_add_usage(void) " -S, --fs_size=size Size of filesystem on device\n" " -B, --bucket=size Bucket size\n" " -D, --discard Enable discards\n" - " -g, --group=group Disk group\n" + " -l, --label=label Disk label\n" " -f, --force Use device even if it appears to already be formatted\n" " -h, --help Display this help and exit\n" "\n" - "Report bugs to "); + "Report bugs to "); } int cmd_device_add(int argc, char *argv[]) @@ -41,7 +64,7 @@ int cmd_device_add(int argc, char *argv[]) { "fs_size", required_argument, NULL, 'S' }, { "bucket", required_argument, NULL, 'B' }, { "discard", no_argument, NULL, 'D' }, - { "group", required_argument, NULL, 'g' }, + { "label", required_argument, NULL, 'l' }, { "force", no_argument, NULL, 'f' }, { "help", no_argument, NULL, 'h' }, { NULL } @@ -57,18 +80,16 @@ int cmd_device_add(int argc, char *argv[]) case 'S': if (bch2_strtoull_h(optarg, &dev_opts.size)) die("invalid filesystem size"); - - dev_opts.size >>= 9; break; case 'B': - dev_opts.bucket_size = - hatoi_validate(optarg, "bucket size"); + if (bch2_strtoull_h(optarg, &dev_opts.bucket_size)) + die("bad bucket_size %s", optarg); break; case 'D': dev_opts.discard = true; break; - case 'g': - dev_opts.group = strdup(optarg); + case 'l': + dev_opts.label = strdup(optarg); break; case 'f': force = true; @@ -83,8 +104,8 @@ int cmd_device_add(int argc, char *argv[]) if (!fs_path) die("Please supply a filesystem"); - char *dev_path = arg_pop(); - if (!dev_path) + dev_opts.path = arg_pop(); + if (!dev_opts.path) die("Please supply a device"); if (argc) @@ -92,8 +113,9 @@ int cmd_device_add(int argc, char *argv[]) struct bchfs_handle fs = bcache_fs_open(fs_path); - dev_opts.path = dev_path; - dev_opts.fd = open_for_format(dev_opts.path, force); + int ret = open_for_format(&dev_opts, force); + if (ret) + die("Error opening %s: %s", dev_opts.path, strerror(-ret)); struct bch_opt_strs fs_opt_strs; memset(&fs_opt_strs, 0, sizeof(fs_opt_strs)); @@ -101,17 +123,17 @@ int cmd_device_add(int argc, char *argv[]) struct bch_opts fs_opts = bch2_parse_opts(fs_opt_strs); opt_set(fs_opts, block_size, - read_file_u64(fs.sysfs_fd, "block_size") >> 9); + read_file_u64(fs.sysfs_fd, "options/block_size")); opt_set(fs_opts, btree_node_size, - read_file_u64(fs.sysfs_fd, "btree_node_size") >> 9); + read_file_u64(fs.sysfs_fd, "options/btree_node_size")); struct bch_sb *sb = bch2_format(fs_opt_strs, fs_opts, format_opts, &dev_opts, 1); free(sb); - fsync(dev_opts.fd); - close(dev_opts.fd); + fsync(dev_opts.bdev->bd_buffered_fd); + close(dev_opts.bdev->bd_buffered_fd); bchu_disk_add(fs, dev_opts.path); return 0; @@ -120,7 +142,8 @@ int cmd_device_add(int argc, char *argv[]) static void device_remove_usage(void) { puts("bcachefs device_remove - remove a device from a filesystem\n" - "Usage: bcachefs device remove device\n" + "Usage:\n" + " bcachefs device remove | \n" "\n" "Options:\n" " -f, --force Force removal, even if some data\n" @@ -128,19 +151,22 @@ static void device_remove_usage(void) " -F, --force-metadata Force removal, even if some metadata\n" " couldn't be migrated\n" " -h, --help display this help and exit\n" - "Report bugs to "); + "Report bugs to "); exit(EXIT_SUCCESS); } int cmd_device_remove(int argc, char *argv[]) { static const struct option longopts[] = { + { "by-id", 0, NULL, 'i' }, { "force", 0, NULL, 'f' }, { "force-metadata", 0, NULL, 'F' }, { "help", 0, NULL, 'h' }, { NULL } }; - int opt, flags = BCH_FORCE_IF_DEGRADED; + struct bchfs_handle fs; + bool by_id = false; + int opt, flags = BCH_FORCE_IF_DEGRADED, dev_idx; while ((opt = getopt_long(argc, argv, "fh", longopts, NULL)) != -1) switch (opt) { @@ -155,15 +181,31 @@ int cmd_device_remove(int argc, char *argv[]) } args_shift(optind); - char *dev = arg_pop(); - if (!dev) - die("Please supply a device to remove"); + char *dev_str = arg_pop(); + if (!dev_str) + die("Please supply a device"); - if (argc) - die("too many arguments"); + char *end; + dev_idx = strtoul(dev_str, &end, 10); + if (*dev_str && !*end) + by_id = true; + + char *fs_path = arg_pop(); + if (fs_path) { + fs = bcache_fs_open(fs_path); + + if (!by_id) { + dev_idx = bchu_dev_path_to_idx(fs, dev_str); + if (dev_idx < 0) + die("%s does not seem to be a member of %s", + dev_str, fs_path); + } + } else if (!by_id) { + fs = bchu_fs_open_by_dev(dev_str, &dev_idx); + } else { + die("Filesystem path required when specifying device by id"); + } - unsigned dev_idx; - struct bchfs_handle fs = bchu_fs_open_by_dev(dev, &dev_idx); bchu_disk_remove(fs, dev_idx, flags); return 0; } @@ -176,7 +218,7 @@ static void device_online_usage(void) "Options:\n" " -h, --help Display this help and exit\n" "\n" - "Report bugs to "); + "Report bugs to "); } int cmd_device_online(int argc, char *argv[]) @@ -198,7 +240,7 @@ int cmd_device_online(int argc, char *argv[]) if (argc) die("too many arguments"); - unsigned dev_idx; + int dev_idx; struct bchfs_handle fs = bchu_fs_open_by_dev(dev, &dev_idx); bchu_disk_online(fs, dev); return 0; @@ -213,7 +255,7 @@ static void device_offline_usage(void) " -f, --force Force, if data redundancy will be degraded\n" " -h, --help Display this help and exit\n" "\n" - "Report bugs to "); + "Report bugs to "); } int cmd_device_offline(int argc, char *argv[]) @@ -243,7 +285,7 @@ int cmd_device_offline(int argc, char *argv[]) if (argc) die("too many arguments"); - unsigned dev_idx; + int dev_idx; struct bchfs_handle fs = bchu_fs_open_by_dev(dev, &dev_idx); bchu_disk_offline(fs, dev_idx, flags); return 0; @@ -257,7 +299,7 @@ static void device_evacuate_usage(void) "Options:\n" " -h, --help Display this help and exit\n" "\n" - "Report bugs to "); + "Report bugs to "); } int cmd_device_evacuate(int argc, char *argv[]) @@ -279,13 +321,24 @@ int cmd_device_evacuate(int argc, char *argv[]) if (argc) die("too many arguments"); - unsigned dev_idx; + int dev_idx; struct bchfs_handle fs = bchu_fs_open_by_dev(dev_path, &dev_idx); + struct bch_ioctl_dev_usage_v2 *u = bchu_dev_usage(fs, dev_idx); + + if (u->state == BCH_MEMBER_STATE_rw) { + printf("Setting %s readonly\n", dev_path); + bchu_disk_set_state(fs, dev_idx, BCH_MEMBER_STATE_ro, 0); + } + + free(u); + return bchu_data(fs, (struct bch_ioctl_data) { - .op = BCH_DATA_OP_MIGRATE, - .start = POS_MIN, - .end = POS_MAX, + .op = BCH_DATA_OP_migrate, + .start_btree = 0, + .start_pos = POS_MIN, + .end_btree = BTREE_ID_NR, + .end_pos = POS_MAX, .migrate.dev = dev_idx, }); } @@ -293,12 +346,17 @@ int cmd_device_evacuate(int argc, char *argv[]) static void device_set_state_usage(void) { puts("bcachefs device set-state\n" - "Usage: bcachefs device set-state device new-state\n" + "Usage: bcachefs device set-state | \n" + "\n" + ": one of rw, ro, failed or spare\n" + ": path to mounted filesystem, optional unless specifying device by id\n" "\n" "Options:\n" " -f, --force Force, if data redundancy will be degraded\n" + " --force-if-data-lost Force, if data will be lost\n" + " -o, --offline Set state of an offline device\n" " -h, --help display this help and exit\n" - "Report bugs to "); + "Report bugs to "); exit(EXIT_SUCCESS); } @@ -306,36 +364,92 @@ int cmd_device_set_state(int argc, char *argv[]) { static const struct option longopts[] = { { "force", 0, NULL, 'f' }, + { "force-if-data-lost", 0, NULL, 'F' }, + { "offline", 0, NULL, 'o' }, { "help", 0, NULL, 'h' }, { NULL } }; - int opt, flags = 0; + struct bchfs_handle fs; + bool by_id = false; + int opt, flags = 0, dev_idx; + bool offline = false; - while ((opt = getopt_long(argc, argv, "fh", longopts, NULL)) != -1) + while ((opt = getopt_long(argc, argv, "foh", longopts, NULL)) != -1) switch (opt) { case 'f': flags |= BCH_FORCE_IF_DEGRADED; break; + case 'F': + flags |= BCH_FORCE_IF_DEGRADED; + flags |= BCH_FORCE_IF_LOST; + break; + case 'o': + offline = true; + break; case 'h': device_set_state_usage(); } args_shift(optind); - char *dev_path = arg_pop(); - if (!dev_path) - die("Please supply a device"); - char *new_state_str = arg_pop(); if (!new_state_str) die("Please supply a device state"); unsigned new_state = read_string_list_or_die(new_state_str, - bch2_dev_state, "device state"); + bch2_member_states, "device state"); - unsigned dev_idx; - struct bchfs_handle fs = bchu_fs_open_by_dev(dev_path, &dev_idx); + char *dev_str = arg_pop(); + if (!dev_str) + die("Please supply a device"); + + char *end; + dev_idx = strtoul(dev_str, &end, 10); + if (*dev_str && !*end) + by_id = true; + + if (offline) { + struct bch_opts opts = bch2_opts_empty(); + struct bch_sb_handle sb = { NULL }; + + if (by_id) + die("Cannot specify offline device by id"); + + int ret = bch2_read_super(dev_str, &opts, &sb); + if (ret) + die("error opening %s: %s", dev_str, bch2_err_str(ret)); + + struct bch_member *m = bch2_members_v2_get_mut(sb.sb, sb.sb->dev_idx); + + SET_BCH_MEMBER_STATE(m, new_state); + + le64_add_cpu(&sb.sb->seq, 1); + + bch2_super_write(sb.bdev->bd_buffered_fd, sb.sb); + ret = fsync(sb.bdev->bd_buffered_fd); + if (ret) + fprintf(stderr, "error writing superblock: fsync error (%m)"); + bch2_free_super(&sb); + return ret; + } + + char *fs_path = arg_pop(); + if (fs_path) { + fs = bcache_fs_open(fs_path); + + if (!by_id) { + dev_idx = bchu_dev_path_to_idx(fs, dev_str); + if (dev_idx < 0) + die("%s does not seem to be a member of %s", + dev_str, fs_path); + } + } else if (!by_id) { + fs = bchu_fs_open_by_dev(dev_str, &dev_idx); + } else { + die("Filesystem path required when specifying device by id"); + } bchu_disk_set_state(fs, dev_idx, new_state, flags); + return 0; } @@ -346,7 +460,7 @@ static void device_resize_usage(void) "\n" "Options:\n" " -h, --help display this help and exit\n" - "Report bugs to "); + "Report bugs to "); exit(EXIT_SUCCESS); } @@ -374,7 +488,7 @@ int cmd_device_resize(int argc, char *argv[]) char *size_arg = arg_pop(); if (!size_arg) - size = get_size(dev, dev_fd); + size = get_size(dev_fd); else if (bch2_strtoull_h(size_arg, &size)) die("invalid size"); @@ -400,14 +514,12 @@ int cmd_device_resize(int argc, char *argv[]) if (idx >= sb->nr_devices) die("error reading superblock: dev idx >= sb->nr_devices"); - struct bch_sb_field_members *mi = bch2_sb_get_members(sb); - if (!mi) - die("error reading superblock: no member info"); + struct bch_member m = bch2_sb_member_get(sb, idx); - /* could also just read this out of sysfs... meh */ - struct bch_member *m = mi->members + idx; + u64 nbuckets = size / le16_to_cpu(m.bucket_size); - u64 nbuckets = size / le16_to_cpu(m->bucket_size); + if (nbuckets < le64_to_cpu(m.nbuckets)) + die("Shrinking not supported yet"); printf("resizing %s to %llu buckets\n", dev, nbuckets); bchu_disk_resize(fs, idx, nbuckets); @@ -416,12 +528,11 @@ int cmd_device_resize(int argc, char *argv[]) struct bch_fs *c = bch2_fs_open(&dev, 1, bch2_opts_empty()); if (IS_ERR(c)) - die("error opening %s: %s", dev, strerror(-PTR_ERR(c))); + die("error opening %s: %s", dev, bch2_err_str(PTR_ERR(c))); - struct bch_dev *ca, *resize = NULL; - unsigned i; + struct bch_dev *resize = NULL; - for_each_online_member(ca, c, i) { + for_each_online_member(c, ca) { if (resize) die("confused: more than one online device?"); resize = ca; @@ -430,10 +541,107 @@ int cmd_device_resize(int argc, char *argv[]) u64 nbuckets = size / le16_to_cpu(resize->mi.bucket_size); + if (nbuckets < le64_to_cpu(resize->mi.nbuckets)) + die("Shrinking not supported yet"); + printf("resizing %s to %llu buckets\n", dev, nbuckets); int ret = bch2_dev_resize(c, resize, nbuckets); if (ret) - fprintf(stderr, "resize error: %s\n", strerror(-ret)); + fprintf(stderr, "resize error: %s\n", bch2_err_str(ret)); + + percpu_ref_put(&resize->io_ref); + bch2_fs_stop(c); + } + return 0; +} + +static void device_resize_journal_usage(void) +{ + puts("bcachefs device resize-journal \n" + "Usage: bcachefs device resize-journal device size\n" + "\n" + "Options:\n" + " -h, --help display this help and exit\n" + "Report bugs to "); + exit(EXIT_SUCCESS); +} + +int cmd_device_resize_journal(int argc, char *argv[]) +{ + static const struct option longopts[] = { + { "help", 0, NULL, 'h' }, + { NULL } + }; + u64 size; + int opt; + + while ((opt = getopt_long(argc, argv, "h", longopts, NULL)) != -1) + switch (opt) { + case 'h': + device_resize_journal_usage(); + } + args_shift(optind); + + char *dev = arg_pop(); + if (!dev) + die("Please supply a device"); + + int dev_fd = xopen(dev, O_RDONLY); + + char *size_arg = arg_pop(); + if (!size_arg) + die("Please supply a journal size"); + else if (bch2_strtoull_h(size_arg, &size)) + die("invalid size"); + + size >>= 9; + + if (argc) + die("Too many arguments"); + + struct stat dev_stat = xfstat(dev_fd); + + struct mntent *mount = dev_to_mount(dev); + if (mount) { + if (!S_ISBLK(dev_stat.st_mode)) + die("%s is mounted but isn't a block device?!", dev); + + struct bchfs_handle fs = bcache_fs_open(mount->mnt_dir); + + unsigned idx = bchu_disk_get_idx(fs, dev_stat.st_rdev); + + struct bch_sb *sb = bchu_read_super(fs, -1); + if (idx >= sb->nr_devices) + die("error reading superblock: dev idx >= sb->nr_devices"); + + struct bch_member m = bch2_sb_member_get(sb, idx); + + u64 nbuckets = size / le16_to_cpu(m.bucket_size); + + printf("resizing journal on %s to %llu buckets\n", dev, nbuckets); + bchu_disk_resize_journal(fs, idx, nbuckets); + } else { + printf("%s is offline - starting:\n", dev); + + struct bch_fs *c = bch2_fs_open(&dev, 1, bch2_opts_empty()); + if (IS_ERR(c)) + die("error opening %s: %s", dev, bch2_err_str(PTR_ERR(c))); + + struct bch_dev *resize = NULL; + + for_each_online_member(c, ca) { + if (resize) + die("confused: more than one online device?"); + resize = ca; + percpu_ref_get(&resize->io_ref); + } + + u64 nbuckets = size / le16_to_cpu(resize->mi.bucket_size); + + printf("resizing journal on %s to %llu buckets\n", dev, nbuckets); + int ret = bch2_set_nr_journal_buckets(c, resize, nbuckets); + if (ret) + fprintf(stderr, "resize error: %s\n", bch2_err_str(ret)); percpu_ref_put(&resize->io_ref); bch2_fs_stop(c);