btrfs: cleanup util

Author: williamstein

src/packages/file-server/btrfs/filesystem.ts

@@ -65,7 +65,6 @@ export class Filesystem {
     await mkdirp([this.opts.mount]);
     await this.initDevice();
     await this.mountFilesystem();
-    await sudo({ command: "chmod", args: ["a+rx", this.opts.mount] });
     await btrfs({
       args: ["quota", "enable", "--simple", this.opts.mount],
     });

src/packages/file-server/btrfs/subvolume.ts

@@ -4,12 +4,14 @@ A subvolume
 
 import { type Filesystem, DEFAULT_SUBVOLUME_SIZE } from "./filesystem";
 import refCache from "@cocalc/util/refcache";
-import { exists, sudo } from "./util";
+import { sudo } from "./util";
 import { join, normalize } from "path";
 import { SubvolumeFilesystem } from "./subvolume-fs";
 import { SubvolumeBup } from "./subvolume-bup";
 import { SubvolumeSnapshots } from "./subvolume-snapshots";
 import { SubvolumeQuota } from "./subvolume-quota";
+import { exists } from "@cocalc/backend/misc/async-utils-node";
+
 import getLogger from "@cocalc/backend/logger";
 
 const logger = getLogger("file-server:btrfs:subvolume");

src/packages/file-server/btrfs/subvolumes.ts

@@ -4,8 +4,8 @@ import getLogger from "@cocalc/backend/logger";
 import { SNAPSHOTS } from "./subvolume-snapshots";
 import { exists } from "@cocalc/backend/misc/async-utils-node";
 import { join, normalize } from "path";
-import { btrfs } from "./util";
-import { chmod, rename, readdir, rm, stat } from "fs/promises";
+import { btrfs, isdir } from "./util";
+import { chmod, rename, rm } from "node:fs/promises";
 import { executeCode } from "@cocalc/backend/execute-code";
 
 const RESERVED = new Set(["bup", SNAPSHOTS]);
@@ -113,7 +113,3 @@ export class Subvolumes {
     });
   };
 }
-
-async function isdir(path: string) {
-  return (await stat(path)).isDirectory();
-}

src/packages/file-server/btrfs/test/filesystem-stress.test.ts

@@ -2,8 +2,8 @@ import { before, after, fs } from "./setup";
 
 beforeAll(before);
 
-//const log = console.log;
-const log = (..._args) => {};
+const DEBUG = false;
+const log = DEBUG ? console.log : (..._args) => {};
 
 describe("stress operations with subvolumes", () => {
   const count1 = 10;

src/packages/file-server/btrfs/util.ts

@@ -4,29 +4,17 @@ import {
 } from "@cocalc/util/types/execute-code";
 import { executeCode } from "@cocalc/backend/execute-code";
 import getLogger from "@cocalc/backend/logger";
+import { stat } from "node:fs/promises";
 
 const logger = getLogger("file-server:storage:util");
 
 const DEFAULT_EXEC_TIMEOUT_MS = 60 * 1000;
 
-export async function exists(path: string) {
-  try {
-    await sudo({ command: "ls", args: [path], verbose: false });
-    return true;
-  } catch {
-    return false;
-  }
-}
-
 export async function mkdirp(paths: string[]) {
   if (paths.length == 0) return;
   await sudo({ command: "mkdir", args: ["-p", ...paths] });
 }
 
-export async function chmod(args: string[]) {
-  await sudo({ command: "chmod", args: args });
-}
-
 export async function sudo(
   opts: ExecuteCodeOptions & { desc?: string },
 ): Promise<ExecuteCodeOutput> {
@@ -56,24 +44,8 @@ export async function btrfs(
   return await sudo({ ...opts, command: "btrfs" });
 }
 
-export async function rm(paths: string[]) {
-  if (paths.length == 0) return;
-  await sudo({ command: "rm", args: paths });
-}
-
-export async function rmdir(paths: string[]) {
-  if (paths.length == 0) return;
-  await sudo({ command: "rmdir", args: paths });
-}
-
-export async function listdir(path: string) {
-  const { stdout } = await sudo({ command: "ls", args: ["-1", path] });
-  return stdout.split("\n").filter((x) => x);
-}
-
 export async function isdir(path: string) {
-  const { stdout } = await sudo({ command: "stat", args: ["-c", "%F", path] });
-  return stdout.trim() == "directory";
+  return (await stat(path)).isDirectory();
 }
 
 export function parseBupTime(s: string): Date {