cmd_device_set_state: Scan for all member devices
Some checks failed
build / bcachefs-tools-msrv (push) Has been cancelled
.deb build orchestrator / source-only (push) Has been cancelled
.deb build orchestrator / obs (push) Has been cancelled
.deb build orchestrator / buildd (map[name:debian version:forky], map[build-arch:amd64 host-arch:amd64 machine-arch:amd64 runs-on:ubuntu-24.04]) (push) Has been cancelled
.deb build orchestrator / buildd (map[name:debian version:forky], map[build-arch:amd64 host-arch:ppc64el machine-arch:amd64 runs-on:ubuntu-24.04]) (push) Has been cancelled
.deb build orchestrator / buildd (map[name:debian version:forky], map[build-arch:arm64 host-arch:arm64 machine-arch:arm64 runs-on:ubuntu-24.04-arm]) (push) Has been cancelled
.deb build orchestrator / buildd (map[name:debian version:trixie], map[build-arch:amd64 host-arch:amd64 machine-arch:amd64 runs-on:ubuntu-24.04]) (push) Has been cancelled
.deb build orchestrator / buildd (map[name:debian version:trixie], map[build-arch:amd64 host-arch:ppc64el machine-arch:amd64 runs-on:ubuntu-24.04]) (push) Has been cancelled
.deb build orchestrator / buildd (map[name:debian version:trixie], map[build-arch:arm64 host-arch:arm64 machine-arch:arm64 runs-on:ubuntu-24.04-arm]) (push) Has been cancelled
.deb build orchestrator / buildd (map[name:debian version:unstable], map[build-arch:amd64 host-arch:amd64 machine-arch:amd64 runs-on:ubuntu-24.04]) (push) Has been cancelled
.deb build orchestrator / buildd (map[name:debian version:unstable], map[build-arch:amd64 host-arch:ppc64el machine-arch:amd64 runs-on:ubuntu-24.04]) (push) Has been cancelled
.deb build orchestrator / buildd (map[name:debian version:unstable], map[build-arch:arm64 host-arch:arm64 machine-arch:arm64 runs-on:ubuntu-24.04-arm]) (push) Has been cancelled
.deb build orchestrator / buildd (map[name:ubuntu version:plucky], map[build-arch:amd64 host-arch:amd64 machine-arch:amd64 runs-on:ubuntu-24.04]) (push) Has been cancelled
.deb build orchestrator / buildd (map[name:ubuntu version:plucky], map[build-arch:arm64 host-arch:arm64 machine-arch:arm64 runs-on:ubuntu-24.04-arm]) (push) Has been cancelled
.deb build orchestrator / buildd (map[name:ubuntu version:questing], map[build-arch:amd64 host-arch:amd64 machine-arch:amd64 runs-on:ubuntu-24.04]) (push) Has been cancelled
.deb build orchestrator / buildd (map[name:ubuntu version:questing], map[build-arch:arm64 host-arch:arm64 machine-arch:arm64 runs-on:ubuntu-24.04-arm]) (push) Has been cancelled
.deb build orchestrator / reprotest (push) Has been cancelled
.deb build orchestrator / publish (push) Has been cancelled
Nix Flake actions / nix-matrix (push) Has been cancelled
Nix Flake actions / ${{ matrix.name }} (${{ matrix.system }}) (push) Has been cancelled

When we write the superblock we need to update the superblock on all
member devices - updating them separately can cause a split brain.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2025-10-15 16:34:25 -04:00
parent 682b57db35
commit b1d0902d12
2 changed files with 39 additions and 20 deletions

View File

@ -2,6 +2,7 @@
#include "cmds.h"
#include "libbcachefs.h"
#include "init/fs.h"
#include "sb/io.h"
static void reset_counters_usage(void)
@ -40,15 +41,23 @@ int cmd_reset_counters(int argc, char *argv[])
if (argc)
die("too many arguments");
/* scan for devices, open full fs */
struct bch_opts opts = bch2_opts_empty();
struct bch_sb_handle sb;
int ret = bch2_read_super(dev, &opts, &sb);
opt_set(opts, nostart, true);
opt_set(opts, degraded, BCH_DEGRADED_very);
darray_const_str devs = get_or_split_cmdline_devs(1, &dev);
struct bch_fs *c = bch2_fs_open(&devs, &opts);
int ret = PTR_ERR_OR_ZERO(c);
if (ret)
die("Error opening %s: %s", dev, bch2_err_str(ret));
die("Error opening filesystem: %s", bch2_err_str(ret));
bch2_sb_field_resize(&sb, counters, 0);
bch2_super_write(sb.bdev->bd_fd, sb.sb);
bch2_free_super(&sb);
scoped_guard(mutex, &c->sb_lock) {
bch2_sb_field_resize(&c->disk_sb, counters, 0);
bch2_write_super(c);
}
bch2_fs_stop(c);
return 0;
}

View File

@ -416,27 +416,37 @@ static int cmd_device_set_state(int argc, char *argv[])
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");
struct bch_opts opts = bch2_opts_empty();
opt_set(opts, nostart, true);
opt_set(opts, degraded, BCH_DEGRADED_very);
struct bch_sb_handle sb = { NULL };
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_fd, sb.sb);
ret = fsync(sb.bdev->bd_fd);
if (ret)
fprintf(stderr, "error writing superblock: fsync error (%m)");
unsigned dev_idx = sb.sb->dev_idx;
bch2_free_super(&sb);
/* scan for all devices in fs */
darray_const_str devs = get_or_split_cmdline_devs(1, &dev_str);
struct bch_fs *c = bch2_fs_open(&devs, &opts);
ret = PTR_ERR_OR_ZERO(c);
if (ret)
die("Error opening filesystem: %s", bch2_err_str(ret));
scoped_guard(mutex, &c->sb_lock) {
struct bch_member *m = bch2_members_v2_get_mut(c->disk_sb.sb, dev_idx);
SET_BCH_MEMBER_STATE(m, new_state);
bch2_write_super(c);
}
bch2_fs_stop(c);
return ret;
}