querysub 0.292.0 → 0.294.0

package/package.json

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

package/src/4-deploy/edgeNodes.ts

@@ -10,7 +10,6 @@ import { delay, runInSerial, runInfinitePoll, runInfinitePollCallAtStart } from
 import { compare, compareArray, isNodeTrue, sort, timeInMinute } from "socket-function/src/misc";
 import { cacheLimited, lazy } from "socket-function/src/caching";
 import { canHaveChildren } from "socket-function/src/types";
-import { registerShutdownHandler, shutdown } from "../diagnostics/periodic";
 import { hostArchives } from "../-b-authorities/cdnAuthority";
 import { getModuleFromConfig } from "../3-path-functions/pathFunctionLoader";
 import path from "path";
@@ -26,7 +25,6 @@ import { onEdgeNodesChanged } from "./edgeBootstrap";
 import { startEdgeNotifier } from "./edgeClientWatcher";
 import { getGitRefLive, getGitURLLive } from "./git";
 import { DeployProgress } from "./deployFunctions";
-import { watchOnRollingUpdate } from "../deployManager/machineController";
 
 const UPDATE_POLL_INTERVAL = timeInMinute * 15;
 const DEAD_NODE_COUNT_THRESHOLD = 15;
@@ -89,8 +87,9 @@ export async function registerEdgeNode(config: {
     }
     registeredEdgeNode = true;
     let host = config.host;
+    await delay(0);
 
-
+    const { registerShutdownHandler } = await import("../diagnostics/periodic");
     registerShutdownHandler(async () => {
         edgeShutdown = true;
         console.log(magenta(`Removing node from edge node list due to shutdown`));
@@ -99,6 +98,7 @@ export async function registerEdgeNode(config: {
         }));
         await updateEdgeNodesFile();
     });
+    const { watchOnRollingUpdate } = await import("../deployManager/machineController");
     watchOnRollingUpdate({
         callback: async (time) => {
             let duration = time - Date.now();
@@ -290,6 +290,7 @@ async function updateEdgeNodesFile() {
         newEdgeNodeIndex.edgeNodes.push(edgeNodeConfig);
     }
 
+    console.log(magenta(`Updating ${edgeNodeIndexFile} with ${JSON.stringify(newEdgeNodeIndex)}`));
     await edgeNodeStorage.set(edgeNodeIndexFile, Buffer.from(JSON.stringify(newEdgeNodeIndex)));
 }
 

package/src/deployManager/components/MachineDetailPage.tsx

@@ -26,6 +26,7 @@ export class MachineDetailPage extends qreact.Component {
         let relevantServiceConfigs = new Map<string, ServiceConfig>();
         for (let serviceId of serviceList) {
             let serviceConfig = controller.getServiceConfig(serviceId);
+            if (!serviceConfig?.parameters.deploy) continue;
             if (serviceConfig && serviceConfig.machineIds.includes(selectedMachineId)) {
                 relevantServiceConfigs.set(serviceId, serviceConfig);
             }

package/src/deployManager/machineApplyMainCode.ts

@@ -361,7 +361,7 @@ const runScreenCommand = measureWrap(async function runScreenCommand(config: {
             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, {
+            rollingKeepScreenAlive.set(screenName, {
                 rollingScreenName,
                 originalScreenName: screenName,
                 pinnedDuration: config.rollingWindow,
@@ -448,7 +448,16 @@ done`);
 const killScreen = measureWrap(async function killScreen(config: {
     screenName: string;
 }) {
+    console.log(red(`Killing screen ${config.screenName}`));
     let prefix = getTmuxPrefix();
+    // Try ctrl+c a few times first
+    for (let i = 0; i < 5; i++) {
+        if (!await isScreenRunningProcess(config.screenName)) {
+            break;
+        }
+        await runPromise(`${prefix}tmux send-keys -t ${config.screenName} 'C-c' Enter`);
+        await delay(5000);
+    }
     await runPromise(`${prefix}tmux kill-session -t ${config.screenName}`);
     await removeOldNodeId(config.screenName);
 });
@@ -629,7 +638,10 @@ const resyncServicesBase = runInSerial(measureWrap(async function resyncServices
                 rollingKeepScreenAlive.delete(rollingScreenRemainder);
                 rollingInfo = undefined;
             }
-            if (rollingInfo) continue;
+            if (rollingInfo) {
+                console.log(green(`Skipping killing rolling screen ${screenName} because it's still alive at ${new Date().toLocaleString()}. Keeping it alive until ${new Date(rollingInfo.pinnedTime + rollingInfo.pinnedDuration).toLocaleString()}`));
+                continue;
+            }
         }
         await killScreen({
             screenName,

package/src/deployManager/spec.txt

@@ -1,26 +1,8 @@
 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)
-        - PathValueServer - 10 minutes
-        - FunctionRunner - CANNOT use rolling
-        - HTTP - 4 hours
-        - Boostrapper - NO rolling
-        - gc/join - NO rolling
-    - Show the rolling time in the update buttons (both list and the save button on the details page), so we know it will be a rolling update
-    - Keep the oldest service alive when we update
-        - Tracked per serviceId
-        - Update the rolling time, so if we remove the rolling window we kill the old service immediately
-    - Notify when servers are outdated
-        - After min(5 minute, 10% of rolling window size)
-        - Use the node registration to know the nodeId to talk to, and allow servers to register to get told when they are outdated (and how long before they are shutdown).
-        - In HTTP server, notify users, in the same way we notify for hash updates, that they will need to switch servers
-        - Verify this update works with a relatively low rolling update window, ensuring it force refreshes before the server actually restarts.
-
-10) Verify we can using a rolling update with CYOA, and that it'll notify users, then refresh (eventually)
-    - I guess set the rollingWindow to 10 minutes for testing.
-
+1) Verify clientside notifications work when we rolling update cyoa
+2) Verify edge nodes are removed when we rolling update cyoa
+3) Update cyoa rolling time back to 4 hours
 
 10) Add RAM total, ram % used, cpu count, CPU %, disk size, disk % used to machine info
     - Show this all in the list page, with nice bars?