fly: rmv machines-heartbeat specific code

donjo · Jun 13, 2023 · 964abc1 · 964abc1
1 parent 09d9a02
commit 964abc1
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 73 deletions.
diff --git a/fly.tls.toml b/fly.tls.toml
@@ -13,11 +13,6 @@ kill_timeout = "15s"
   NODE_ENV = "production"
   CLOUD_PLATFORM = "fly"
   LOG_LEVEL = "info"
-  # fly can't start vms that scale down super quickly
-  # community.fly.io/t/6091/12
-  # node proc shuts itself after this threshold
-  # MACHINES_TIMEOUT_SEC = "100"
-  # for now, using auto_start_machines / auto_stop_machines
 
 [experimental]
 auto_rollback = true

diff --git a/fly.toml b/fly.toml
@@ -13,11 +13,6 @@ kill_timeout = "15s"
   DENO_ENV = "production"
   LOG_LEVEL = "info"
   NODE_ENV = "production"
-  # fly can't start vms that scale down super quickly
-  # community.fly.io/t/6091/12
-  # node proc shuts itself after this threshold
-  # MACHINES_TIMEOUT_SEC = "100"
-  # for now, using auto_start_machines / auto_stop_machines
 
 # DNS over HTTPS
 [[services]]

diff --git a/src/commons/envutil.js b/src/commons/envutil.js
@@ -14,20 +14,6 @@ export function onFly() {
   return envManager.get("CLOUD_PLATFORM") === "fly";
 }
 
-export function machinesTimeoutMillis() {
-  if (!envManager) return -1;
-
-  return envManager.get("MACHINES_TIMEOUT_SEC") * 1000;
-}
-
-// only valid on Fly Machines
-export function httpCheck() {
-  if (!envManager) return false;
-  if (!onFly()) return false;
-
-  return envManager.get("MACHINES_TIMEOUT_SEC") > 0;
-}
-
 export function onDenoDeploy() {
   if (!envManager) return false;
 

diff --git a/src/core/env.js b/src/core/env.js
@@ -52,11 +52,6 @@ const defaults = new Map(
       // also ref: EnvManager.mostLikelyCloudPlatform()
       default: "local",
     },
-    // timeout for proc running on fly machines
-    MACHINES_TIMEOUT_SEC: {
-      type: "number",
-      default: -1,
-    },
     // download blocklist files to disk, if any, and quit
     BLOCKLIST_DOWNLOAD_ONLY: {
       type: "boolean",

diff --git a/src/core/svc.js b/src/core/svc.js
@@ -23,8 +23,6 @@ import * as util from "../commons/util.js";
 // proc up since
 let readytime = 0;
 let endtimer = null;
-// unix timestamp of the latest recorded heartbeat
-let latestHeartbeat = 0;
 
 export const services = {
   /** @type {Boolean} ready */
@@ -97,28 +95,6 @@ export function stopAfter(ms = 0) {
   } else {
     log.d("stopAfter", ms);
   }
-  const now = Date.now();
-  // 30% of the upcoming wait-time
-  const p30 = (ms * 0.3) | 0;
-  const when = now - latestHeartbeat;
-  // was the previous heartbeat recent enough?
-  const recent = when <= p30;
-  // is the incoming wait (ms) 2x the pending wait?
-  const pending = when - ms;
-  const nearer = pending > 2 * ms;
-  // if pending wait not too high and the prev heartbeat too recent
-  if (!nearer && recent) {
-    log.d("skip heartbeat; prev heartbeat was", when, "ms ago; lt", p30);
-    return;
-  }
-  clearEndTimer();
+  if (!util.emptyObj(endtimer)) clearTimeout(endtimer);
   endtimer = util.timeout(ms, stopProc);
-  log.d("n?", nearer, "r?", recent, "pending", pending, "extend ttl", ms);
-  latestHeartbeat = now;
-}
-
-function clearEndTimer() {
-  if (util.emptyObj(endtimer)) return false;
-  clearTimeout(endtimer);
-  return true;
 }
diff --git a/src/server-node.js b/src/server-node.js
@@ -333,16 +333,14 @@ function systemUp() {
       });
   }
 
-  if (envutil.httpCheck()) {
-    const portcheck = envutil.httpCheckPort();
-    const hcheck = h2c.createServer(serve200).listen(portcheck, () => {
-      up("http-check", hcheck.address());
-      trapServerEvents(hcheck);
-    });
-  }
+  const portcheck = envutil.httpCheckPort();
+  const hcheck = h2c.createServer(serve200).listen(portcheck, () => {
+    up("http-check", hcheck.address());
+    trapServerEvents(hcheck);
+  });
 
   // if (envutil.measureHeap()) heapdiff = new memwatch.HeapDiff();
-  machinesHeartbeat();
+  heartbeat();
 }
 
 /**
@@ -829,7 +827,7 @@ function handleTCPData(socket, chunk, sb, host, flag) {
  * @param {String} flag
  */
 async function handleTCPQuery(q, socket, host, flag) {
-  machinesHeartbeat();
+  heartbeat();
 
   let ok = true;
   if (bufutil.emptyBuf(q) || !tcpOkay(socket)) return;
@@ -967,7 +965,7 @@ async function serveHTTPS(req, res) {
  * @param {Http2ServerResponse} res
  */
 async function handleHTTPRequest(b, req, res) {
-  machinesHeartbeat();
+  heartbeat();
 
   const rxid = util.xid();
   const t = log.startTime("handle-http-req-" + rxid);
@@ -1050,7 +1048,7 @@ function trapRequestResponseEvents(req, res) {
   });
 }
 
-function machinesHeartbeat() {
+function heartbeat() {
   const maxc = envutil.maxconns();
   const minc = envutil.minconns();
   const measureHeap = envutil.measureHeap();
@@ -1070,14 +1068,6 @@ function machinesHeartbeat() {
   if (stats.noreqs % (minc * 2) === 0) {
     log.i(stats.str(), "in", (uptime() / 60000) | 0, "mins");
   }
-
-  // nothing to do, if not on fly
-  if (!envutil.onFly()) return;
-  // if a fly machine app, figure out ttl
-  const t = envutil.machinesTimeoutMillis();
-  log.d("mach: extend-machines-ttl by", t);
-  if (t >= 0) stopAfter(t);
-  // else: not on machines
 }
 
 function adjustMaxConns(n) {