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 721d375531
No known key found for this signature in database
GPG Key ID: 569C4EEC436F5232
2 changed files with 59 additions and 25 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.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 (
this.options.zfs.hasOwnProperty("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.sudo = _.get(this.options, "zfs.cli.sudoEnabled", false);
if (typeof this.setZetabyteCustomOptions === "function") {
await this.setZetabyteCustomOptions(options);
}
return new Zetabyte(options);
});
}

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

@ -71,20 +71,26 @@ class FreeNASSshDriver extends ControllerZfsBaseDriver {
options.executor = new ZfsSshProcessManager(sshClient);
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 (
this.options.zfs.hasOwnProperty("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.sudo = _.get(this.options, "zfs.cli.sudoEnabled", false);
if (typeof this.setZetabyteCustomOptions === "function") {
await this.setZetabyteCustomOptions(options);
}
return new Zetabyte(options);
});
}
@ -112,22 +118,33 @@ class FreeNASSshDriver extends ControllerZfsBaseDriver {
if (!options.hasOwnProperty("paths")) {
const majorMinor = await this.getSystemVersionMajorMinor();
const isScale = await this.getIsScale();
if (!isScale && Number(majorMinor) >= 12) {
// TrueNAS CORE/Enterprise version 12+
options.paths = {
zfs: "/usr/local/sbin/zfs",
zpool: "/usr/local/sbin/zpool",
sudo: "/usr/local/bin/sudo",
chroot: "/usr/sbin/chroot",
};
}
if (isScale && Number(majorMinor) >= 25) {
options.paths = {
zfs: "/usr/sbin/zfs",
zpool: "/usr/sbin/zpool",
sudo: "/usr/bin/sudo",
chroot: "/usr/sbin/chroot",
};
} else if (isScale) {
if (Number(majorMinor) >= 25) {
// TrueNAS SCALE version 25+ (paths changed to /usr/sbin in 25.04)
options.paths = {
zfs: "/usr/sbin/zfs",
zpool: "/usr/sbin/zpool",
sudo: "/usr/bin/sudo",
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",
};
}
}
}
}
@ -2179,8 +2196,19 @@ class FreeNASSshDriver extends ControllerZfsBaseDriver {
async getIsScale() {
const systemVersion = await this.getSystemVersion();
if (systemVersion.v2 && systemVersion.v2.toLowerCase().includes("scale")) {
return true;
if (systemVersion.v2) {
const versionLower = systemVersion.v2.toLowerCase();
// Check for explicit "scale" in version string
if (versionLower.includes("scale")) {
return true;
}
// TrueNAS 25+ doesn't include "SCALE" in version string, but versions 25+ are SCALE-only
if (versionLower.includes("truenas")) {
const majorVersion = await this.getSystemVersionMajor();
if (Number(majorVersion) >= 25) {
return true;
}
}
}
return false;