querysub 0.289.0 → 0.291.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.289.0",
+  "version": "0.291.0",
   "main": "index.js",
   "license": "MIT",
   "note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",

package/src/deployManager/machineApplyMainCode.ts

@@ -306,11 +306,11 @@ const getScreenState = measureWrap(async function getScreenState(populateIsProce
     return screenList;
 });
 async function removeOldNodeId(screenName: string) {
-    let screenNameFile = os.homedir() + "/" + SERVICE_FOLDER + screenName + "/" + SERVICE_NODE_FILE_NAME;
-    if (fs.existsSync(screenNameFile)) {
-        let nodeId = await fs.promises.readFile(screenNameFile, "utf8");
-        console.log(green(`Removing node if for dead service on ${screenNameFile}, node id ${nodeId}`));
-        await fs.promises.unlink(screenNameFile);
+    let nodeIdFile = os.homedir() + "/" + SERVICE_FOLDER + screenName + "/" + SERVICE_NODE_FILE_NAME;
+    if (fs.existsSync(nodeIdFile)) {
+        let nodeId = await fs.promises.readFile(nodeIdFile, "utf8");
+        console.log(green(`Removing node if for dead service on ${nodeIdFile}, node id ${nodeId}`));
+        await fs.promises.unlink(nodeIdFile);
         await forceRemoveNode(nodeId);
     }
 }
@@ -346,14 +346,20 @@ const runScreenCommand = measureWrap(async function runScreenCommand(config: {
             let rollingFinalTime = Date.now() + config.rollingWindow;
             if (fs.existsSync(nodeIdPath)) {
                 let nodeId = await fs.promises.readFile(nodeIdPath, "utf8");
-                await triggerRollingUpdate({
-                    nodeId,
-                    time: rollingFinalTime,
-                });
+                // REMOVE the nodeId file, so we the node isn't terminated!
+                await fs.promises.unlink(nodeIdPath);
+                try {
+                    await triggerRollingUpdate({
+                        nodeId,
+                        time: rollingFinalTime,
+                    });
+                } catch (e: any) {
+                    console.warn(`Error triggering rolling update notification to ${nodeId} for ${screenName}: ${e.stack}`);
+                }
             }
-            console.log(green(`Renaming screen ${screenName} to for rolling interval ${config.rollingWindow} at ${new Date().toLocaleString()}`));
             let rollingScreenName = screenName + "-rolling" + SCREEN_SUFFIX;
-            await runPromise(`${prefix}tmux rename-window -t ${screenName} ${rollingScreenName}`);
+            console.log(green(`Renaming screen ${screenName} to ${rollingScreenName} for rolling interval ${config.rollingWindow} at ${new Date().toLocaleString()}`));
+            await runPromise(`${prefix}tmux rename-session -t ${screenName} ${rollingScreenName}`);
             rollingScreens.set(rollingScreenName, screenName);
             rollingKeepScreenAlive.set(rollingScreenName, {
                 rollingScreenName,

package/src/deployManager/machineController.ts

@@ -44,6 +44,8 @@ export function watchOnRollingUpdate(config: {
 }) {
     rollingUpdateWatchers.add(config.callback);
 }
+// TODO: PathValueServer should use this to remove itself from the node pool, and then after 50% of the time until time tell it's clients to find a new server to get values from
+// TODO: FunctionRunner needs to reshard when it sees this (somehow?)
 export async function triggerRollingUpdate(config: {
     nodeId: string;
     time: number;

package/src/deployManager/spec.txt

@@ -1,3 +1,5 @@
+Hmm... our cyoa servers are dying very fast... why?
+
 9) Rolling service updates
     - Add rollingWindow to the definition
     - Set for public facing services (but not for scripts)