Skip to content

Commit 12c7c65

Browse files
committed
mgr/dashboard: Increase maximum namespace count to 1024
Fixes https://tracker.ceph.com/issues/67871 The maximum namespace count will be 1024 for subsystems now. Signed-off-by: Afreen Misbah <[email protected]>
1 parent f0e267a commit 12c7c65

File tree

6 files changed

+20
-13
lines changed

6 files changed

+20
-13
lines changed

src/pybind/mgr/dashboard/controllers/nvmeof.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,13 @@ def get(self, nqn: str):
6161
"Create a new NVMeoF subsystem",
6262
parameters={
6363
"nqn": Param(str, "NVMeoF subsystem NQN"),
64-
"max_namespaces": Param(int, "Maximum number of namespaces", True, 256),
64+
"max_namespaces": Param(int, "Maximum number of namespaces", True, 1024),
6565
"enable_ha": Param(bool, "Enable high availability"),
6666
},
6767
)
6868
@empty_response
6969
@handle_nvmeof_error
70-
def create(self, nqn: str, enable_ha: bool, max_namespaces: int = 256):
70+
def create(self, nqn: str, enable_ha: bool, max_namespaces: int = 1024):
7171
return NVMeoFClient().stub.create_subsystem(
7272
NVMeoFClient.pb2.create_subsystem_req(
7373
subsystem_nqn=nqn, max_namespaces=max_namespaces, enable_ha=enable_ha

src/pybind/mgr/dashboard/frontend/src/app/ceph/block/nvmeof-subsystems-form/nvmeof-subsystems-form.component.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,16 @@
4949
type="text"
5050
name="max_namespaces"
5151
formControlName="max_namespaces">
52-
<cd-help-text i18n>The maximum namespaces per subsystem. Default is 256.</cd-help-text>
52+
<cd-help-text i18n>The maximum namespaces per subsystem. Default is {{defaultMaxNamespace}}</cd-help-text>
5353
<span class="invalid-feedback"
5454
*ngIf="subsystemForm.showError('max_namespaces', formDir, 'min')"
5555
i18n>The value must be at least 1.</span>
5656
<span class="invalid-feedback"
5757
*ngIf="subsystemForm.showError('max_namespaces', formDir, 'max')"
58-
i18n>The value cannot be greated than 256.</span>
58+
i18n>The value cannot be greater than {{defaultMaxNamespace}}.</span>
5959
<span class="invalid-feedback"
6060
*ngIf="subsystemForm.showError('max_namespaces', formDir, 'pattern')"
61-
i18n>The value must be a positive integer.</span>
61+
i18n>The value must be a positive integer.</span>
6262
</div>
6363
</div>
6464
</div>

src/pybind/mgr/dashboard/frontend/src/app/ceph/block/nvmeof-subsystems-form/nvmeof-subsystems-form.component.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { CdFormGroup } from '~/app/shared/forms/cd-form-group';
1111
import { SharedModule } from '~/app/shared/shared.module';
1212
import { NvmeofSubsystemsFormComponent } from './nvmeof-subsystems-form.component';
1313
import { FormHelper } from '~/testing/unit-test-helper';
14-
import { NvmeofService } from '~/app/shared/api/nvmeof.service';
14+
import { MAX_NAMESPACE, NvmeofService } from '~/app/shared/api/nvmeof.service';
1515

1616
describe('NvmeofSubsystemsFormComponent', () => {
1717
let component: NvmeofSubsystemsFormComponent;
@@ -59,7 +59,7 @@ describe('NvmeofSubsystemsFormComponent', () => {
5959
component.onSubmit();
6060
expect(nvmeofService.createSubsystem).toHaveBeenCalledWith({
6161
nqn: expectedNqn,
62-
max_namespaces: 256,
62+
max_namespaces: MAX_NAMESPACE,
6363
enable_ha: true
6464
});
6565
});
@@ -76,8 +76,8 @@ describe('NvmeofSubsystemsFormComponent', () => {
7676
formHelper.expectError('max_namespaces', 'pattern');
7777
});
7878

79-
it('should give error on max_namespaces greater than 256', () => {
80-
formHelper.setValue('max_namespaces', 300);
79+
it(`should give error on max_namespaces greater than ${MAX_NAMESPACE}`, () => {
80+
formHelper.setValue('max_namespaces', 2000);
8181
component.onSubmit();
8282
formHelper.expectError('max_namespaces', 'max');
8383
});

src/pybind/mgr/dashboard/frontend/src/app/ceph/block/nvmeof-subsystems-form/nvmeof-subsystems-form.component.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { AuthStorageService } from '~/app/shared/services/auth-storage.service';
1010
import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service';
1111
import { FinishedTask } from '~/app/shared/models/finished-task';
1212
import { Router } from '@angular/router';
13-
import { NvmeofService } from '~/app/shared/api/nvmeof.service';
13+
import { MAX_NAMESPACE, NvmeofService } from '~/app/shared/api/nvmeof.service';
1414

1515
@Component({
1616
selector: 'cd-nvmeof-subsystems-form',
@@ -23,6 +23,7 @@ export class NvmeofSubsystemsFormComponent implements OnInit {
2323
action: string;
2424
resource: string;
2525
pageURL: string;
26+
defaultMaxNamespace: number = MAX_NAMESPACE;
2627

2728
constructor(
2829
private authStorageService: AuthStorageService,
@@ -68,8 +69,12 @@ export class NvmeofSubsystemsFormComponent implements OnInit {
6869
CdValidators.unique(this.nvmeofService.isSubsystemPresent, this.nvmeofService)
6970
]
7071
}),
71-
max_namespaces: new UntypedFormControl(256, {
72-
validators: [CdValidators.number(false), Validators.max(256), Validators.min(1)]
72+
max_namespaces: new UntypedFormControl(this.defaultMaxNamespace, {
73+
validators: [
74+
CdValidators.number(false),
75+
Validators.max(this.defaultMaxNamespace),
76+
Validators.min(1)
77+
]
7378
})
7479
});
7580
}

src/pybind/mgr/dashboard/frontend/src/app/shared/api/nvmeof.service.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import _ from 'lodash';
55
import { Observable, of as observableOf } from 'rxjs';
66
import { catchError, mapTo } from 'rxjs/operators';
77

8+
export const MAX_NAMESPACE = 1024;
9+
810
export interface ListenerRequest {
911
host_name: string;
1012
traddr: string;

src/pybind/mgr/dashboard/openapi.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8237,7 +8237,7 @@ paths:
82378237
description: Enable high availability
82388238
type: boolean
82398239
max_namespaces:
8240-
default: 256
8240+
default: 1024
82418241
description: Maximum number of namespaces
82428242
type: integer
82438243
nqn:

0 commit comments

Comments
 (0)