Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
526a4e7
fix(lblk): uniform-only device growth, smallest factor across all LUNs
michixs Oct 30, 2026
b4afb76
fix(lblk): grow-devices lists shrunk devices separately
michixs Oct 30, 2026
c96c162
feat(floors): enforce the erasure-coding resource floors
michixs Nov 9, 2026
0622103
feat(migration): relax at exactly n+k nodes, plumb the affinity floor
michixs Nov 9, 2026
6062e22
fix(lblk): default AIO bdev block size to 4096, keep recorded size on…
michixs Nov 12, 2026
9783742
feat(lblk): serve device-mapper nodes through bdev_uring
michixs Nov 13, 2026
800f763
feat(multi-attach): array LUN mode, phase 2 (options, device identity…
michixs Nov 13, 2026
94574e6
feat(multi-attach): array LUN mode, phase 3 (LUN takeover by a standby)
michixs Nov 13, 2026
12cb067
feat(multi-attach): array LUN mode, phase 4 (array plugins, KMS crede…
michixs Nov 13, 2026
7993055
fix(multi-attach): mypy findings in phases 2-4
michixs Nov 13, 2026
d0de91b
test(floors): integration fixtures satisfy the resource floors
michixs Nov 13, 2026
f70a92a
Merge remote-tracking branch 'origin/main' into feat/ec-floors
michixs Nov 13, 2026
e85600f
Merge #1572 (fix/lblk-growth-uniform-only) into feat/ec-floors
michixs Nov 13, 2026
f72652c
feat(multi-attach): sn configure --lblk-journal-only
michixs Nov 13, 2026
6b83da7
fix(multi-attach): node agent accepts a journal-only lblk node config
michixs Nov 13, 2026
5e0197e
fix(multi-attach): find the EC2 instance of a node by its private IP
michixs Nov 13, 2026
8cbc274
fix(multi-attach): export LUN namespaces with an explicit NGUID
michixs Nov 13, 2026
ad4b0c6
fix(multi-attach): a lost node degrades a multi-attach cluster, not s…
michixs Nov 13, 2026
cfa9eac
Merge origin/main into feat/ec-floors
michixs Nov 13, 2026
02caa0b
fix(multi-attach): take a LUN over once its node is unreachable, not …
michixs Nov 13, 2026
97a5389
Merge remote-tracking branch 'origin/main' into feat/ec-floors
michixs Nov 19, 2026
c91eefc
fix(multi-attach): a fenced node that is back online becomes a standb…
michixs Nov 19, 2026
fa04876
fix(multi-attach): the owner never sweeps or repairs a LUN it does no…
michixs Nov 19, 2026
13be681
fix(multi-attach): grow a taken-over LUN on its serving node
michixs Nov 19, 2026
cb415d9
fix(multi-attach): read a taken-over LUN's stats on its serving node
michixs Nov 19, 2026
251c38f
feat(multi-attach): take a lost node's LUNs over within seconds
michixs Nov 20, 2026
8d40d8a
fix(multi-attach): count a node's silence from its first unanswered p…
michixs Nov 20, 2026
9277841
fix(multi-attach): restart nodes up to the cluster's FTT, not its npcs
michixs Nov 20, 2026
e8f8d76
fix(multi-attach): never resolve an absent array LUN by its old kerne…
michixs Nov 20, 2026
22cff86
feat(multi-attach): fence by persistent reservation; 3 s client keep-…
michixs Nov 20, 2026
826149c
feat(credentials): KMS-backed credential store for external systems
michixs Nov 20, 2026
00b4715
feat(storage_arrays): adapter framework, fake-array test harness, Pur…
michixs Nov 20, 2026
e90d205
feat(storage_arrays): adapters for all supported array families
michixs Nov 20, 2026
144ca37
feat(array): SAN arrays as multi-attach plugins; credential references
michixs Nov 20, 2026
cc8d21c
fix(storage_arrays): adapters checked against vendor source
michixs Nov 20, 2026
fdeaafe
fix(array): registration refusal answers 400, not 422
michixs Nov 20, 2026
7a4a765
multi-attach: stale home-node error and fence/reintegrate races
michixs Nov 20, 2026
17a8b91
fix(array): netapp-ontap derives protocol_family from the protocol
michixs Nov 20, 2026
f9b9795
fix(storage_arrays): read string options as the type of their default
michixs Nov 20, 2026
183aa3d
test(storage_arrays): mock arrays with a real iSCSI data path (LIO)
michixs Nov 20, 2026
44b4cd7
multi-attach takeover: a dead standby is left for the next one
michixs Nov 20, 2026
3e921e0
multi-attach: port fences are not node failures; watchdog; SPDK crash…
michixs Nov 20, 2026
0cff315
feat(array): SCSI LUNs over FC/iSCSI multipath (dm-multipath maps)
michixs Nov 20, 2026
94656c1
multi-attach: warm standby alcemls for fast LUN takeover (opt-in)
michixs Nov 20, 2026
1012523
feat(array): journal placement — a LUN of its own, or a local disk or…
michixs Nov 20, 2026
f2a518c
feat(array): grow every LUN to a size (lun_size), repeatable after a …
michixs Nov 20, 2026
811da71
feat(array): the local key-store opt-in travels with the array regist…
michixs Nov 20, 2026
fb70786
multi-attach takeover: a dead standby costs ~1 s; warm standbys sized…
michixs Nov 20, 2026
44d4dfc
multi-attach: refuse warm standby until its stale-data bug is fixed
michixs Nov 20, 2026
7406ebd
multi-attach: full node writes keep the LUN ownership fields
michixs Nov 20, 2026
f478e20
fix(multi-attach): lun_watchdog is not a service; clear two CodeQL al…
michixs Nov 20, 2026
f1d109f
multi-attach takeover: probe standby candidates at once, bounded
michixs Nov 20, 2026
76b9e7e
multi-attach: a dead NVMe controller does not hold a LUN fence
michixs Nov 21, 2026
fa6d699
multi-attach: remote-path I/O errors are the takeover's, not per-node…
michixs Nov 21, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,22 @@ sbcli-dev = "simplyblock_cli.cli:main"
simplyblock-service = "simplyblock_core.services.__main__:main"
simplyblock-task-runner = "simplyblock_core.services.task_runners:main"

# Storage-array plugins of the multi-attach array LUN mode
# (simplyblock_core.array); the name is the value of Cluster.array_plugin.
[project.entry-points."simplyblock.array_plugins"]
aws-ebs = "simplyblock_core.array.aws_ebs:AwsEbsPlugin"
pure-flasharray = "simplyblock_core.array.san:PureFlashArrayPlugin"
netapp-ontap = "simplyblock_core.array.san:NetAppOntapPlugin"
dell-powerstore = "simplyblock_core.array.san:DellPowerStorePlugin"
dell-powermax = "simplyblock_core.array.san:DellPowerMaxPlugin"
dell-powerflex = "simplyblock_core.array.san:DellPowerFlexPlugin"
hpe-wsapi = "simplyblock_core.array.san:HpeWsapiPlugin"
hpe-nimble = "simplyblock_core.array.san:HpeNimblePlugin"
ibm-flashsystem = "simplyblock_core.array.san:IbmFlashSystemPlugin"
hitachi-vsp = "simplyblock_core.array.san:HitachiVspPlugin"
huawei-dorado = "simplyblock_core.array.san:HuaweiDoradoPlugin"
infinidat-infinibox = "simplyblock_core.array.san:InfinidatInfiniBoxPlugin"

[dependency-groups]
test = [
"mock",
Expand Down
226 changes: 199 additions & 27 deletions simplyblock_cli/cli-reference.yaml

Large diffs are not rendered by default.

58 changes: 47 additions & 11 deletions simplyblock_cli/cli.py

Large diffs are not rendered by default.

156 changes: 123 additions & 33 deletions simplyblock_cli/clibase.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,14 @@
from pathlib import Path
from typing import Any

from pydantic import SecretStr

from simplyblock_cli.alerting_config_parser import parse_alerting_config
from simplyblock_core import cluster_ops, constants, db_controller, utils
from simplyblock_core import mgmt_node_ops as mgmt_ops
from simplyblock_core import storage_node_ops as storage_ops
from simplyblock_core.controllers import (
array_controller,
device_controller,
fdb_backup_controller,
health_controller,
Expand Down Expand Up @@ -269,6 +272,23 @@ def storage_node__configure(self, sub_command, args):
lblk_journal_device = getattr(args, 'lblk_journal_device', False)
if lblk_journal_device and not lblk:
self.parser.error("--lblk-journal-device requires --lblk")
lblk_journal_only = getattr(args, 'lblk_journal_only', False)
if lblk_journal_only:
if not lblk:
self.parser.error("--lblk-journal-only requires --lblk")
if lblk_journal_device:
self.parser.error("--lblk-journal-only and --lblk-journal-device exclude each other")
if not (blk_names or blk_serials):
self.parser.error("--lblk-journal-only needs the journal disk or partition named with "
"--blk-names or --blk-serials")
lblk_array_only = getattr(args, 'lblk_array_only', False)
if lblk_array_only:
if not lblk:
self.parser.error("--lblk-array-only requires --lblk")
if lblk_journal_only or lblk_journal_device or blk_names or blk_names_exclude or blk_serials:
self.parser.error("--lblk-array-only selects no local device: not with --blk-names, "
"--blk-names-exclude, --blk-serials, --lblk-journal-only or "
"--lblk-journal-device")
lblk_selection = None
if use_lblk:
if not lblk:
Expand All @@ -282,6 +302,8 @@ def storage_node__configure(self, sub_command, args):
"names_exclude": [str(x) for x in blk_names_exclude.split(',')] if blk_names_exclude else None,
"serials": [str(x) for x in blk_serials.split(',')] if blk_serials else None,
"journal_device": bool(lblk_journal_device),
"journal_only": bool(lblk_journal_only),
"array_only": bool(lblk_array_only),
}
# The core split is decided by the cluster's vcpu-count when the node
# is added or restarted; here the default heuristic lays out a usable
Expand Down Expand Up @@ -505,20 +527,6 @@ def storage_node__reset_device(self, sub_command, args):
def storage_node__restart_device(self, sub_command, args):
return device_controller.restart_device(args.device_id, args.force)

def storage_node__resize_device(self, sub_command, args):
try:
result = device_controller.resize_device(args.device_id)
except ValueError as e:
print(e)
return False
if not result["resized"]:
return f"Device size unchanged: {utils.humanbytes(result['new_size'])}"
out = (f"Device grown from {utils.humanbytes(result['old_size'])} "
f"to {utils.humanbytes(result['new_size'])}")
if result["warning"]:
out += f"\nWarning: {result['warning']}"
return out

def storage_node__add_device(self, sub_command, args):
return device_controller.add_device(args.device_id)

Expand Down Expand Up @@ -832,25 +840,93 @@ def cluster__change_name(self, sub_command, args):
return True

def cluster__grow_devices(self, sub_command, args):
result = device_controller.grow_cluster_devices(
args.cluster_id, rebalance=not getattr(args, 'no_rebalance', False))
lines = [f"{r['device_id']}: {utils.humanbytes(r['old_size'])} -> {utils.humanbytes(r['new_size'])}"
for r in result["devices"] if r["resized"]]
lines += [f"{dev_id}: failed: {err}" for dev_id, err in result["errors"].items()]
rebalance = result.get("rebalance")
if rebalance and rebalance["started"]:
lines.append("The devices have grown unevenly: device weights set to the new sizes, "
"cluster rebalancing started.")
elif rebalance and rebalance["weights_updated"]:
lines.append(f"The devices have grown unevenly: device weights set to the new sizes. "
f"{rebalance['reason']}")
elif rebalance:
lines.append(f"Warning: the devices have grown unevenly. {rebalance['reason']}")
elif not result["uniform"]:
lines.append("Warning: the data devices of the cluster have grown unevenly; the added capacity is "
"only fully usable once all of them have grown by the same factor, or after "
"grow-devices without --no-rebalance has updated the weights.")
return "\n".join(lines) or "No device has grown"
lun_factor = getattr(args, 'lun_factor', None)
if lun_factor is not None:
try:
lun_factor = float(lun_factor)
except ValueError:
print(f"--lun-factor must be a number, not {lun_factor!r}")
return False
extra: dict = {"lun_factor": lun_factor} if lun_factor is not None else {}
lun_size = int(getattr(args, 'lun_size', 0) or 0)
if lun_size:
if lun_factor is not None:
print("Give --lun-factor or --lun-size, not both")
return False
extra = {"lun_size": lun_size}
try:
result = device_controller.grow_cluster_devices(args.cluster_id, **extra)
except ValueError as e:
print(e)
return False
lines = [f"LUN {r['lun_id']} of {dev_id}: {utils.humanbytes(r['old_size'])} -> "
f"{utils.humanbytes(r['new_size'])} at the array"
for dev_id, r in (result.get("luns") or {}).items()]
lines += [f"{dev_id}: {err}" for dev_id, err in result["errors"].items()]
if not result["grown"]:
lines.append(result["reason"])
return "\n".join(lines)
lines.append(f"All data devices grown by factor {result['factor']:.4f}:")
for r in result["devices"]:
line = f"{r['device_id']}: {utils.humanbytes(r['old_size'])} -> {utils.humanbytes(r['new_size'])}"
if r["unused_size"]:
line += f" ({utils.humanbytes(r['unused_size'])} of the block device unused)"
lines.append(line)
return "\n".join(lines)

def cluster__set_array(self, sub_command, args):
options = {}
if args.options:
try:
options = json.loads(args.options)
except json.JSONDecodeError as e:
raise ValueError(f"--options is not valid JSON: {e}")
if not isinstance(options, dict):
raise ValueError("--options must be a JSON object")
credentials = {}
if args.credentials_file:
try:
raw = json.loads(Path(args.credentials_file).read_text())
except (OSError, json.JSONDecodeError) as e:
# Never the file content: it is the secret.
raise ValueError(f"--credentials-file could not be read as JSON: {type(e).__name__}")
if not isinstance(raw, dict) or not all(isinstance(v, str) for v in raw.values()):
raise ValueError("--credentials-file must hold a JSON object of strings")
# Wrapped at the boundary; unwrapped only by the KMS and the plugin.
credentials = {str(k): SecretStr(v) for k, v in raw.items()}
credential_ref = None
if getattr(args, "credential_ref", None):
try:
credential_ref = json.loads(args.credential_ref)
except json.JSONDecodeError as e:
raise ValueError(f"--credential-ref is not valid JSON: {e}")
if not isinstance(credential_ref, dict):
raise ValueError("--credential-ref must be a JSON object")
journal_options = None
if getattr(args, "journal_options", None):
try:
journal_options = json.loads(args.journal_options)
except json.JSONDecodeError as e:
raise ValueError(f"--journal-options is not valid JSON: {e}")
if not isinstance(journal_options, dict):
raise ValueError("--journal-options must be a JSON object")
view = array_controller.register_array(
args.cluster_id, args.plugin, args.endpoint or "", options, credentials,
int(args.lun_size or 0), credential_ref=credential_ref,
journal=getattr(args, "journal", None) or "local",
journal_lun_size=int(getattr(args, "journal_lun_size", 0) or 0),
journal_options=journal_options)
return _format_result([view], json=getattr(args, "json", False))

def cluster__get_array(self, sub_command, args):
arrays = array_controller.get_arrays(args.cluster_id)
if not arrays:
return "No array registered"
return _format_result(arrays, json=getattr(args, "json", False))

def cluster__remove_array(self, sub_command, args):
array_controller.delete_array(args.cluster_id, args.array_id, force=args.force)
return True

def cluster__complete_expand(self, sub_command, args):
cluster_ops.cluster_expand(args.cluster_id)
Expand Down Expand Up @@ -1968,6 +2044,9 @@ def cluster_add(self, args):
max_queue_size = args.max_queue_size
inflight_io_threshold = args.inflight_io_threshold
strict_node_anti_affinity = args.strict_node_anti_affinity
raid_devices = getattr(args, 'raid_devices', False)
multi_attach = getattr(args, 'multi_attach', False)
ftt = getattr(args, 'ftt', None)
is_single_node = args.is_single_node
client_data_nic = args.client_data_nic
enable_failure_domain = getattr(args, 'enable_failure_domain', False)
Expand Down Expand Up @@ -1999,6 +2078,10 @@ def cluster_add(self, args):
sync_replication=getattr(args, 'sync_replication', False),
page_copy=getattr(args, 'page_copy', False),
md_journal=md_journal,
raid_devices=raid_devices,
multi_attach=multi_attach,
ftt=ftt,
multi_attach_warm_standby=getattr(args, 'multi_attach_warm_standby', False),
container_image_prefix=args.container_image_prefix,
)

Expand Down Expand Up @@ -2029,6 +2112,9 @@ def cluster_create(self, args):
inflight_io_threshold = args.inflight_io_threshold
disable_monitoring = args.disable_monitoring
strict_node_anti_affinity = args.strict_node_anti_affinity
raid_devices = getattr(args, 'raid_devices', False)
multi_attach = getattr(args, 'multi_attach', False)
ftt = getattr(args, 'ftt', None)
name = args.name
tls_secret = args.tls_secret
ingress_host_source = args.ingress_host_source
Expand Down Expand Up @@ -2079,6 +2165,10 @@ def cluster_create(self, args):
sync_replication=getattr(args, 'sync_replication', False),
page_copy=getattr(args, 'page_copy', False),
md_journal=md_journal,
raid_devices=raid_devices,
multi_attach=multi_attach,
ftt=ftt,
multi_attach_warm_standby=getattr(args, 'multi_attach_warm_standby', False),
container_image_prefix=args.container_image_prefix,
)

Expand Down
Loading
Loading