public_git/democratic-csi
1
0
Fork 0
mirror of https://github.com/democratic-csi/democratic-csi.git synced 2026-10-19 10:02:06 +02:00
Code Issues Projects Releases Wiki Activity

ensure SCALE for freenas-api-* Probes, better sudo usage, prep v1.7.0

Browse Source 
Signed-off-by: Travis Glenn Hansen <travisghansen@yahoo.com>
This commit is contained in:
Travis Glenn Hansen
2022-06-05 20:45:05 -06:00
parent 7041b7fe45
commit bd08538a87
6 changed files with 326 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/utils/zfs.js
+21 -5
View File
@@ -1147,14 +1147,23 @@ class Zetabyte {
if (arguments.length < 4) throw Error("Invalid arguments");
return new Promise((resolve, reject) => {
// specially handle sudo here to avoid the need for using sudo on the whole script
// but rather limit sudo access to only the zfs command
let use_sudo = zb.options.sudo;
let args = ["-c"];
let command = [];
if (use_sudo) {
command = command.concat(zb.options.paths.sudo);
}
command = command.concat(["zfs", "send"]);
command = command.concat(send_options);
command.push(source);
command.push("|");
if (use_sudo) {
command = command.concat(zb.options.paths.sudo);
}
command = command.concat(["zfs", "receive"]);
command = command.concat(receive_options);
command.push(target);
@@ -1164,7 +1173,7 @@ class Zetabyte {
zb.exec(
"/bin/sh",
args,
{ timeout: zb.options.timeout },
{ timeout: zb.options.timeout, sudo: false },
function (error, stdout, stderr) {
if (error) return reject(zb.helpers.zfsError(error, stderr));
return resolve(stdout);
@@ -1550,7 +1559,12 @@ class Zetabyte {
command = zb.options.paths.chroot;
}
if (zb.options.sudo) {
let use_sudo = zb.options.sudo;
if (options && options.hasOwnProperty("sudo")) {
use_sudo = options.sudo;
}
if (use_sudo) {
args = args || [];
args.unshift(command);
command = zb.options.paths.sudo;
@@ -1558,11 +1572,13 @@ class Zetabyte {
if (zb.options.log_commands) {
if (typeof zb.options.logger.verbose != "function") {
zb.options.logger.verbose = function() {
zb.options.logger.verbose = function () {
console.debug(...arguments);
}
};
}
zb.options.logger.verbose(`executing zfs command: ${command} ${args.join(" ")}`);
zb.options.logger.verbose(
`executing zfs command: ${command} ${args.join(" ")}`
);
}
const child = zb.options.executor.spawn(command, args, options);