instanceAutoRestartingSoon helper

Author: david-crespo

app/api/util.ts

@@ -151,6 +151,24 @@ export function instanceTransitioning({ runState }: Instance) {
   )
 }
 
+/**
+ * True if instance is failed, auto restart enabled, and either we've never
+ * restarted or we just expired and we're waiting to get restarted.
+ *
+ * There can be a short window (up to a minute) after expiration where the
+ * instance hasn't been picked up for auto-restart yet.
+ *
+ * https://github.com/oxidecomputer/omicron/blob/b6ada022a/nexus/src/app/background/init.rs#L726-L745
+ * https://github.com/oxidecomputer/omicron/blob/b6ada022a/smf/nexus/multi-sled/config-partial.toml#L70-L71
+ */
+export function instanceAutoRestartingSoon(i: Instance) {
+  return (
+    i.runState === 'failed' &&
+    i.autoRestartEnabled &&
+    (!i.autoRestartCooldownExpiration || i.autoRestartCooldownExpiration < new Date())
+  )
+}
+
 const diskActions = {
   // this is a weird one because the list of states is dynamic and it includes
   // 'creating' in the unwind of the disk create saga, but does not include

app/components/InstanceAutoRestartPopover.tsx

@@ -18,6 +18,7 @@ import {
 } from '@oxide/design-system/icons/react'
 
 import type { Instance } from '~/api'
+import { instanceAutoRestartingSoon } from '~/api/util'
 import { useInstanceSelector } from '~/hooks/use-params'
 import { Badge } from '~/ui/lib/Badge'
 import { Spinner } from '~/ui/lib/Spinner'
@@ -28,6 +29,7 @@ import { pb } from '~/util/path-builder'
  * Appears if and only if the instance is failed.
  */
 export const InstanceAutoRestartPopover = ({ instance }: { instance: Instance }) => {
+  const instanceSelector = useInstanceSelector()
   if (instance.runState !== 'failed') return null // important!
 
   const {
@@ -36,12 +38,7 @@ export const InstanceAutoRestartPopover = ({ instance }: { instance: Instance })
     autoRestartEnabled: enabled,
   } = instance
 
-  const instanceSelector = useInstanceSelector()
-
-  // true if either we've never restarted or we just expired and we're waiting
-  // to get restarted (should always be under a minute because that's how often
-  // the cleanup job runs)
-  const restartingSoon = enabled && (!cooldownExpiration || cooldownExpiration < new Date())
+  const restartingSoon = instanceAutoRestartingSoon(instance)
 
   return (
     <Popover>

app/pages/project/instances/instance/InstancePage.tsx

@@ -23,6 +23,7 @@ import { Instances24Icon } from '@oxide/design-system/icons/react'
 import {
   INSTANCE_MAX_CPU,
   INSTANCE_MAX_RAM_GiB,
+  instanceAutoRestartingSoon,
   instanceCan,
   instanceTransitioning,
 } from '~/api/util'
@@ -152,15 +153,9 @@ export function InstancePage() {
         if (instanceTransitioning(instance)) return POLL_INTERVAL_FAST
 
         if (instance.runState === 'failed' && instance.autoRestartEnabled) {
-          // There can be a short window (up to a minute, based on the links
-          // below) after expiration where the instance hasn't been picked up
-          // for auto-restart yet, during which time we still want to poll.
-          // https://github.com/oxidecomputer/omicron/blob/b6ada022a/nexus/src/app/background/init.rs#L726-L745
-          // https://github.com/oxidecomputer/omicron/blob/b6ada022a/smf/nexus/multi-sled/config-partial.toml#L70-L71
-          const restartingSoon =
-            !instance.autoRestartCooldownExpiration ||
-            instance.autoRestartCooldownExpiration < new Date()
-          return restartingSoon ? POLL_INTERVAL_FAST : POLL_INTERVAL_SLOW
+          return instanceAutoRestartingSoon(instance)
+            ? POLL_INTERVAL_FAST
+            : POLL_INTERVAL_SLOW
         }
       },
     }

app/pages/project/instances/instance/tabs/SettingsTab.tsx

@@ -11,7 +11,12 @@ import { type ReactNode } from 'react'
 import { useForm } from 'react-hook-form'
 import { match } from 'ts-pattern'
 
-import { apiQueryClient, useApiMutation, usePrefetchedApiQuery } from '~/api'
+import {
+  apiQueryClient,
+  instanceAutoRestartingSoon,
+  useApiMutation,
+  usePrefetchedApiQuery,
+} from '~/api'
 import { ListboxField } from '~/components/form/fields/ListboxField'
 import { useInstanceSelector } from '~/hooks/use-params'
 import { addToast } from '~/stores/toast'
@@ -111,7 +116,7 @@ export function Component() {
                 {instance.runState === 'failed' && instance.autoRestartEnabled && (
                   <span className="text-tertiary">
                     (
-                    {instance.autoRestartCooldownExpiration < new Date()
+                    {instanceAutoRestartingSoon(instance)
                       ? 'restarting soon'
                       : formatDistanceToNow(instance.autoRestartCooldownExpiration)}
                     )