public_git
/
democratic-csi
mirror of https://github.com/democratic-csi/democratic-csi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat(ssh/zfs): update path resolution logic for scale

This commit is contained in:
perf3ct 2025-08-20 20:13:29 +00:00
parent 55c36d62ff
commit 9ab346e6e7
No known key found for this signature in database
GPG Key ID: 569C4EEC436F5232
2 changed files with 46 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/driver/controller-zfs-generic/index.js
View File

@ -39,20 +39,26 @@ class ControllerZfsGenericDriver extends ControllerZfsBaseDriver {
} }
options.idempotent = true; options.idempotent = true;
options.sudo = _.get(this.options, "zfs.cli.sudoEnabled", false);
// Run automatic detection first
if (typeof this.setZetabyteCustomOptions === "function") {
await this.setZetabyteCustomOptions(options);
}
// Manual override comes after automatic detection
// Only apply if user explicitly provided non-empty paths
if ( if (
this.options.zfs.hasOwnProperty("cli") && this.options.zfs.hasOwnProperty("cli") &&
this.options.zfs.cli && this.options.zfs.cli &&
this.options.zfs.cli.hasOwnProperty("paths") this.options.zfs.cli.hasOwnProperty("paths") &&
this.options.zfs.cli.paths &&
Object.keys(this.options.zfs.cli.paths).length > 0
) { ) {
// User explicitly configured paths - use them
options.paths = this.options.zfs.cli.paths; options.paths = this.options.zfs.cli.paths;
} }
options.sudo = _.get(this.options, "zfs.cli.sudoEnabled", false);
if (typeof this.setZetabyteCustomOptions === "function") {
await this.setZetabyteCustomOptions(options);
}
return new Zetabyte(options); return new Zetabyte(options);
}); });
} }

37
src/driver/freenas/ssh.js
View File

@ -71,20 +71,26 @@ class FreeNASSshDriver extends ControllerZfsBaseDriver {
options.executor = new ZfsSshProcessManager(sshClient); options.executor = new ZfsSshProcessManager(sshClient);
options.idempotent = true; options.idempotent = true;
options.sudo = _.get(this.options, "zfs.cli.sudoEnabled", false);
// Run automatic detection first
if (typeof this.setZetabyteCustomOptions === "function") {
await this.setZetabyteCustomOptions(options);
}
// Manual override comes after automatic detection
// Only apply if user explicitly provided non-empty paths
if ( if (
this.options.zfs.hasOwnProperty("cli") && this.options.zfs.hasOwnProperty("cli") &&
this.options.zfs.cli && this.options.zfs.cli &&
this.options.zfs.cli.hasOwnProperty("paths") this.options.zfs.cli.hasOwnProperty("paths") &&
this.options.zfs.cli.paths &&
Object.keys(this.options.zfs.cli.paths).length > 0
) { ) {
// User explicitly configured paths - use them
options.paths = this.options.zfs.cli.paths; options.paths = this.options.zfs.cli.paths;
} }
options.sudo = _.get(this.options, "zfs.cli.sudoEnabled", false);
if (typeof this.setZetabyteCustomOptions === "function") {
await this.setZetabyteCustomOptions(options);
}
return new Zetabyte(options); return new Zetabyte(options);
}); });
} }
@ -112,22 +118,33 @@ class FreeNASSshDriver extends ControllerZfsBaseDriver {
if (!options.hasOwnProperty("paths")) { if (!options.hasOwnProperty("paths")) {
const majorMinor = await this.getSystemVersionMajorMinor(); const majorMinor = await this.getSystemVersionMajorMinor();
const isScale = await this.getIsScale(); const isScale = await this.getIsScale();
if (!isScale && Number(majorMinor) >= 12) { if (!isScale && Number(majorMinor) >= 12) {
// TrueNAS CORE/Enterprise version 12+
options.paths = { options.paths = {
zfs: "/usr/local/sbin/zfs", zfs: "/usr/local/sbin/zfs",
zpool: "/usr/local/sbin/zpool", zpool: "/usr/local/sbin/zpool",
sudo: "/usr/local/bin/sudo", sudo: "/usr/local/bin/sudo",
chroot: "/usr/sbin/chroot", chroot: "/usr/sbin/chroot",
}; };
} } else if (isScale) {
if (Number(majorMinor) >= 25) {
if (isScale && Number(majorMinor) >= 25) { // TrueNAS SCALE version 25+ (paths changed to /usr/sbin in 25.04)
options.paths = { options.paths = {
zfs: "/usr/sbin/zfs", zfs: "/usr/sbin/zfs",
zpool: "/usr/sbin/zpool", zpool: "/usr/sbin/zpool",
sudo: "/usr/bin/sudo", sudo: "/usr/bin/sudo",
chroot: "/usr/sbin/chroot", chroot: "/usr/sbin/chroot",
}; };
} else {
// TrueNAS SCALE versions before 25
options.paths = {
zfs: "/usr/local/sbin/zfs",
zpool: "/usr/local/sbin/zpool",
sudo: "/usr/bin/sudo",
chroot: "/usr/sbin/chroot",
};
}
} }
} }
} }