delay readiness on status route during boot

ArweaveTeam · Oct 21, 2021 · e65b274 · e65b274
1 parent 30892ae
commit e65b274
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 21 deletions.
diff --git a/src/gateway.ts b/src/gateway.ts
@@ -103,26 +103,25 @@ export function start(): void {
       });
     });
 
-    new Promise<void>((resolve) => setTimeout(resolve, 1000)).then(() => {
-      initializeStatusSession(cassandraClient, session.uuid).then(
-        (sessionUuid: CassandraTypes.TimeUuid) => {
-          session.uuid = sessionUuid;
-
-          startSync({ session, isTesting: process.env.NODE_ENV === "test" });
-
-          if (isGatewayNodeModeEnabled) {
-            // recheck every minute if session changes
-            setInterval(() => {
-              initializeStatusSession(cassandraClient, session.uuid).then(
-                (newSessionUuid: CassandraTypes.TimeUuid) => {
-                  session.uuid = newSessionUuid;
-                }
-              );
-            }, 60 * 1000);
-          }
+    initializeStatusSession(cassandraClient, session.uuid).then(
+      (sessionUuid: CassandraTypes.TimeUuid) => {
+        session.uuid = sessionUuid;
+        // just flush
+        console.log("...");
+        startSync({ session, isTesting: process.env.NODE_ENV === "test" });
+
+        if (isGatewayNodeModeEnabled) {
+          // recheck every minute if session changes
+          setInterval(() => {
+            initializeStatusSession(cassandraClient, session.uuid).then(
+              (newSessionUuid: CassandraTypes.TimeUuid) => {
+                session.uuid = newSessionUuid;
+              }
+            );
+          }, 60 * 1000);
         }
-      );
-    });
+      }
+    );
   });
   app.get(
     "/graphql",

diff --git a/src/route/status.ts b/src/route/status.ts
@@ -14,6 +14,8 @@ try {
   gitRevision = gitRev.long([process.cwd()]);
 } catch {}
 
+let ready = false;
+
 let lastKnownSessionUuid: CassandraTypes.TimeUuid;
 
 interface StatusSchema {
@@ -26,6 +28,14 @@ interface StatusSchema {
   current_migrations: Record<string, string>;
 }
 
+function signalReady(): void {
+  setTimeout(() => {
+    if (!ready) {
+      ready = true;
+    }
+  }, 2000);
+}
+
 export const initializeStatusSession = async (
   cassandraClient: CassandraClient,
   sessionUuid: CassandraTypes.TimeUuid
@@ -35,10 +45,12 @@ export const initializeStatusSession = async (
   );
 
   if (isGatewayNodeModeEnabled && !R.isEmpty(maybeLastSession.rows)) {
+    signalReady();
     lastKnownSessionUuid = maybeLastSession.rows[0].session;
     return maybeLastSession.rows[0].session;
   } else if (isGatewayNodeModeEnabled) {
     lastKnownSessionUuid = sessionUuid;
+    signalReady();
     return sessionUuid;
   }
 
@@ -63,6 +75,7 @@ export const initializeStatusSession = async (
   await statusMapper.insert(
     R.mergeAll([lastSession, { session: sessionUuid, status: "BOOTING" }])
   );
+  signalReady();
   lastKnownSessionUuid = sessionUuid;
   return sessionUuid;
 };
@@ -72,8 +85,8 @@ export async function statusRoute(
   response: Response,
   next: (error?: string) => void
 ): Promise<void> {
-  if (!lastKnownSessionUuid) {
-    return next("not ready");
+  if (!ready) {
+    return next("booting - not ready");
   }
   try {
     const currentStatus = await statusMapper.get({