NAS-00000: Fix Tiering config form descriptions and add missing reserve field

Author: william-gr

src/app/pages/storage/components/tier-config-form/tier-config-form.component.html

@@ -30,6 +30,12 @@
           [label]="'Max Used Percentage' | translate"
           [hint]="helptext.maxUsedPercentage | translate"
         ></ix-input>
+        <ix-input
+          formControlName="special_class_metadata_reserve_pct"
+          type="number"
+          [label]="'Performance Tier Reserve' | translate"
+          [hint]="helptext.performanceTierReserve | translate"
+        ></ix-input>
       </ix-fieldset>
 
       <ix-form-actions>

src/app/pages/storage/components/tier-config-form/tier-config-form.component.spec.ts

@@ -24,6 +24,7 @@ describe('TierConfigFormComponent', () => {
     enabled: true,
     max_concurrent_jobs: 3,
     max_used_percentage: 80,
+    special_class_metadata_reserve_pct: 25,
   } as ZfsTierConfig;
 
   const slideInRef: SlideInRef<void, boolean> = {
@@ -64,6 +65,7 @@ describe('TierConfigFormComponent', () => {
       Enabled: true,
       'Max Concurrent Jobs': '3',
       'Max Used Percentage': '80',
+      'Performance Tier Reserve': '25',
     });
   });
 
@@ -73,6 +75,7 @@ describe('TierConfigFormComponent', () => {
       Enabled: false,
       'Max Concurrent Jobs': 5,
       'Max Used Percentage': 90,
+      'Performance Tier Reserve': 20,
     });
 
     const saveButton = await loader.getHarness(MatButtonHarness.with({ text: 'Save' }));
@@ -82,12 +85,18 @@ describe('TierConfigFormComponent', () => {
       enabled: false,
       max_concurrent_jobs: 5,
       max_used_percentage: 90,
+      special_class_metadata_reserve_pct: 20,
     }]);
     expect(slideInRef.close).toHaveBeenCalledWith({ response: true });
   });
 
   it('shows warning when enabling tiering for the first time', async () => {
-    const disabledConfig = { enabled: false, max_concurrent_jobs: 1, max_used_percentage: 80 } as ZfsTierConfig;
+    const disabledConfig = {
+      enabled: false,
+      max_concurrent_jobs: 1,
+      max_used_percentage: 80,
+      special_class_metadata_reserve_pct: 25,
+    } as ZfsTierConfig;
     jest.spyOn(api, 'call').mockReturnValueOnce(of(disabledConfig));
 
     spectator = createComponent();
@@ -105,18 +114,21 @@ describe('TierConfigFormComponent', () => {
     expect(spectator.query('tn-banner')).not.toExist();
   });
 
-  it('shows validation errors and disables Save when max_used_percentage > 100 or max_concurrent_jobs < 1', async () => {
+  it('shows validation errors and disables Save when values are out of range', async () => {
     const form = await loader.getHarness(IxFormHarness);
     await form.fillForm({
-      'Max Used Percentage': 150,
+      'Max Used Percentage': 96,
       'Max Concurrent Jobs': 0,
+      'Performance Tier Reserve': 31,
     });
 
     const percentInput = await loader.getHarness(IxInputHarness.with({ label: 'Max Used Percentage' }));
     const jobsInput = await loader.getHarness(IxInputHarness.with({ label: 'Max Concurrent Jobs' }));
+    const reserveInput = await loader.getHarness(IxInputHarness.with({ label: 'Performance Tier Reserve' }));
 
-    expect(await percentInput.getErrorText()).toBe('Maximum value is 100');
+    expect(await percentInput.getErrorText()).toBe('Maximum value is 95');
     expect(await jobsInput.getErrorText()).toBe('Minimum value is 1');
+    expect(await reserveInput.getErrorText()).toBe('Maximum value is 30');
 
     const saveButton = await loader.getHarness(MatButtonHarness.with({ text: 'Save' }));
     expect(await saveButton.isDisabled()).toBe(true);

src/app/pages/storage/components/tier-config-form/tier-config-form.component.ts

@@ -56,11 +56,13 @@ export class TierConfigFormComponent implements OnInit {
   protected readonly enabledWarningMessage = T('Once tiering is on, SMB shares and Webshares stop following nested datasets. Each share will expose only its own dataset, and any child datasets under it will no longer be visible to clients through that share. Create a separate share for each dataset you want to expose.');
 
   protected readonly helptext = {
-    maxConcurrentJobs: T('Maximum number of tiering rewrite jobs that can run in parallel. Higher values speed up data movement between tiers but increase CPU and I/O load on the system.'),
-    maxUsedPercentage: T('Pool capacity threshold (in percent) above which tiering will move data off the performance tier to keep free space available. Lower values reserve more free space; higher values let the performance tier fill more before data is migrated.'),
+    maxConcurrentJobs: T('Maximum number of tiering jobs that can run at the same time. Higher values speed up data movement between tiers but increase CPU and I/O load on the system.'),
+    maxUsedPercentage: T('Stop moving data between tiers when the pool reaches this percentage full (70–95). This keeps tiering from using up the last of the pool\'s free space.'),
+    performanceTierReserve: T('Percentage of the performance tier kept in reserve (10–30). When only this much space is left on the performance tier, new data goes to the regular tier instead. Shown as reserved space on the pool Usage card.'),
   };
 
   private static readonly defaultMaxConcurrentJobs = 1;
+  private static readonly defaultReservePercent = 25;
 
   formGroup = this.fb.nonNullable.group({
     enabled: [false],
@@ -70,7 +72,11 @@ export class TierConfigFormComponent implements OnInit {
     ],
     max_used_percentage: [
       poolLowCapacityPercent,
-      [Validators.required, Validators.min(0), Validators.max(100)],
+      [Validators.required, Validators.min(70), Validators.max(95)],
+    ],
+    special_class_metadata_reserve_pct: [
+      TierConfigFormComponent.defaultReservePercent,
+      [Validators.required, Validators.min(10), Validators.max(30)],
     ],
   });