update cleanup logic

howardchung · Jan 27, 2025 · 5a46aad · 5a46aad
1 parent 3c911db
commit 5a46aad
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/server/server.ts b/server/server.ts
@@ -885,6 +885,7 @@ async function getStats() {
   const vBrowserFails = await getRedisCountDay('vBrowserFails');
   const vBrowserStagingFails = await getRedisCountDay('vBrowserStagingFails');
   const vBrowserReimages = await getRedisCountDay('vBrowserReimage');
+  const vBrowserCleanups = await getRedisCountDay('vBrowserCleanup');
   const vBrowserStopTimeout = await getRedisCountDay(
     'vBrowserTerminateTimeout',
   );
@@ -1009,6 +1010,7 @@ async function getStats() {
     vBrowserFails,
     vBrowserStagingFails,
     vBrowserReimages,
+    vBrowserCleanups,
     vBrowserStopManual,
     vBrowserStopEmpty,
     vBrowserStopTimeout,

diff --git a/server/vm/base.ts b/server/vm/base.ts
@@ -384,7 +384,7 @@ export abstract class VMManager {
       for (let i = 0; i < allVMs.length; i++) {
         const server = allVMs[i];
         if (!inUse.has(server.id)) {
-          // TODO log how many cleanups we do
+          redisCount('vBrowserCleanup');
           console.log('[CLEANUP]', this.getPoolName(), server.id);
           try {
             await this.resetVM(server.id);
@@ -476,7 +476,9 @@ export abstract class VMManager {
           // VM didn't come up. Try reimaging
           await this.reimageVM(vmid);
           redisCount('vBrowserReimage');
-          await this.resetVM(vmid);
+          // Don't reset here since reboot will fail while VM is reimaging
+          // Cleanup will process it eventually
+          // await this.resetVM(vmid);
         }
         if (retryCount >= 180) {
           throw new Error('too many attempts on vm ' + vmid);