v2.20.2: Allow running from inside of an existing TMUX session; allow multiple decommission DSNs

Author: dimikot

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "@clickup/pg-microsharding",
   "description": "Microshards support for PostgreSQL",
-  "version": "2.20.1",
+  "version": "2.20.2",
   "license": "MIT",
   "keywords": [
     "postgresql",

package.json

@@ -36,7 +36,9 @@ export async function actionRebalance(args: Args): Promise<boolean> {
   const weightSql = args["weight-sql"] || undefined;
 
   const [decommissionDsns] = chooseDsns({
-    patterns: compact([args["decommission"] || args["decomission"]]),
+    patterns: compact(
+      (args["decommission"] || args["decomission"] || "").split(/[,\s]+/s),
+    ),
     existingDsns: dsns,
     requireMatch: true,
   });

src/actions/actionRebalance.ts

@@ -132,18 +132,17 @@ test("synthetic", async () => {
     ["m1", "m2"],
   );
 
-  await expect(
-    (async () =>
-      runSnapshot(
-        "bad decommission of all",
-        {
-          m1: [1, 2],
-          m2: [3, 4],
-          m3: [5, 6],
-        },
-        ["m1", "m2", "m3"],
-      ))(),
-  ).rejects.toThrow(/all islands/);
+  expect(() =>
+    runSnapshot(
+      "bad decommission of all",
+      {
+        m1: [1, 2],
+        m2: [3, 4],
+        m3: [5, 6],
+      },
+      ["m1", "m2", "m3"],
+    ),
+  ).toThrow(/all islands/);
 
   runSnapshot("two zero weight and two equal weight", {
     m1: [0, 134, 134, 0],

src/api/__tests__/rebalance.test.ts

@@ -231,9 +231,7 @@ function decommissionIslands(
   }
 
   if (islands.size === 0) {
-    throw Error(
-      "Can't decommission all islands: we need at least one remaining to put all the shards on",
-    );
+    throw "Can't decommission all islands: we need at least one remaining to put all the shards on.";
   }
 
   injectShardsUniformly(islands, shards);

src/api/rebalance.ts

@@ -1,7 +1,7 @@
 import { execSync } from "child_process";
 import { writeFileSync } from "fs";
 import { fileSync, setGracefulCleanup } from "tmp";
-import { TMP_DIR } from "./logging";
+import { TMP_DIR, print } from "./logging";
 import { shellQuote } from "./quote";
 
 const TMUX_SESSION = "pg-microsharding-tmux";
@@ -45,12 +45,26 @@ export async function tryReattachToTmuxSession(): Promise<void> {
 }
 
 /**
- * Opens a M TMUX panes, in each run N commands sequentially (panes[M][N]). If a
+ * Opens M TMUX panes, in each run N commands sequentially (panes[M][N]). If a
  * single command fails, then fails the whole pane.
+ *
+ * In case we already run it from a TMUX session, just runs all the commands
+ * sequentially.
  */
 export async function runInTmux(
   panes: Array<Array<{ key: string; title: string; command: string[] }>>,
 ): Promise<void> {
+  if (isInTmuxSession()) {
+    for (const { title, command } of panes.flat()) {
+      print.section(`\n##\n## ${title}\n##\n`);
+      execSync(command.map((v) => shellQuote(v)).join(" "), {
+        stdio: "inherit",
+      });
+    }
+
+    return;
+  }
+
   setGracefulCleanup();
 
   const tmuxCommands: string[] = ["set -e"];
@@ -64,7 +78,7 @@ export async function runInTmux(
       const progress = `${i + 1} of ${sequence.length}`;
       commands.push(
         `printf '\\033]2;%s\\033\\' ' ${progress} | ${title} '`,
-        command.map((v) => shellQuote(v)).join(" "),
+        command.map(shellQuote).join(" "),
         "echo",
       );
     }