[Frontend] Add support for Memory Based Scheduling with Multiple Inst…

…ance Types in ParallelCluster 3.7.0+.
aws · Oct 13, 2023 · cb83175 · cb83175
1 parent 9244695
commit cb83175
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 9 deletions.
diff --git a/frontend/src/feature-flags/__tests__/FeatureFlagsProvider.test.ts b/frontend/src/feature-flags/__tests__/FeatureFlagsProvider.test.ts
@@ -143,6 +143,7 @@ describe('given a feature flags provider and a list of rules', () => {
         'login_nodes',
         'amazon_file_cache',
         'job_exclusive_allocation',
+        'memory_based_scheduling_with_multiple_instance_types',
       ])
     })
   })

diff --git a/frontend/src/feature-flags/featureFlagsProvider.ts b/frontend/src/feature-flags/featureFlagsProvider.ts
@@ -37,6 +37,7 @@ const versionToFeaturesMap: Record<string, AvailableFeature[]> = {
     'login_nodes',
     'amazon_file_cache',
     'job_exclusive_allocation',
+    'memory_based_scheduling_with_multiple_instance_types',
   ],
 }
 

diff --git a/frontend/src/feature-flags/types.ts b/frontend/src/feature-flags/types.ts
@@ -32,3 +32,4 @@ export type AvailableFeature =
   | 'login_nodes'
   | 'amazon_file_cache'
   | 'job_exclusive_allocation'
+  | 'memory_based_scheduling_with_multiple_instance_types'
diff --git a/frontend/src/old-pages/Configure/Queues/SlurmMemorySettings.tsx b/frontend/src/old-pages/Configure/Queues/SlurmMemorySettings.tsx
@@ -69,29 +69,34 @@ function SlurmMemorySettings() {
   const memoryBasedSchedulingEnabled = useState(
     memoryBasedSchedulingEnabledPath,
   )
+  const isMemoryBasedSchedulingWithMultipleInstanceTypesActive = useFeatureFlag(
+    'memory_based_scheduling_with_multiple_instance_types',
+  )
   const queues = useState(queuesPath)
   const multipleInstancesTypesSelected = useFeatureFlag(
     'queues_multiple_instance_types',
   )
     ? hasMultipleInstanceTypes(queues)
     : false
-
-  const clearSlurmSettingsState = React.useCallback(() => {
+  const cannotEnableMemoryBasedScheduling =
+    multipleInstancesTypesSelected &&
+    !isMemoryBasedSchedulingWithMultipleInstanceTypesActive
+  const clearMemoryBasedSettingsState = React.useCallback(() => {
     clearState(memoryBasedSchedulingEnabledPath)
     if (Object.keys(getState(slurmSettingsPath)).length === 0)
       clearState(slurmSettingsPath)
   }, [])
 
   React.useEffect(() => {
-    if (multipleInstancesTypesSelected) {
-      clearSlurmSettingsState()
+    if (cannotEnableMemoryBasedScheduling) {
+      clearMemoryBasedSettingsState()
     }
-  }, [clearSlurmSettingsState, multipleInstancesTypesSelected])
+  }, [clearMemoryBasedSettingsState, cannotEnableMemoryBasedScheduling])
 
   const toggleMemoryBasedSchedulingEnabled = () => {
     !memoryBasedSchedulingEnabled
       ? setState(memoryBasedSchedulingEnabledPath, true)
-      : clearSlurmSettingsState()
+      : clearMemoryBasedSettingsState()
   }
 
   const scaledownIdleTime = useState(scaledownIdleTimePath)
@@ -126,12 +131,12 @@ function SlurmMemorySettings() {
       <SpaceBetween size={'s'} direction={'vertical'}>
         <Checkbox
           checked={memoryBasedSchedulingEnabled}
-          disabled={multipleInstancesTypesSelected}
+          disabled={cannotEnableMemoryBasedScheduling}
           onChange={toggleMemoryBasedSchedulingEnabled}
         >
           <Trans i18nKey="wizard.queues.slurmMemorySettings.toggle.label" />
         </Checkbox>
-        {multipleInstancesTypesSelected ? (
+        {cannotEnableMemoryBasedScheduling ? (
           <Alert header={t('wizard.queues.slurmMemorySettings.info.header')}>
             {t('wizard.queues.slurmMemorySettings.info.body')}
           </Alert>

diff --git a/frontend/src/old-pages/Configure/Queues/__tests__/hasMultipleInstanceTypes.test.tsx b/frontend/src/old-pages/Configure/Queues/__tests__/hasMultipleInstanceTypes.test.tsx
@@ -13,7 +13,7 @@
 import {Queue} from '../queues.types'
 import {hasMultipleInstanceTypes} from '../SlurmMemorySettings'
 
-describe('Given a function to validate if mutiple instance types have been selected', () => {
+describe('Given a function to validate if multiple instance types have been selected', () => {
   describe('if at least a resource of a queue has multiple instance types selected', () => {
     const queues: Queue[] = [
       {