From c9d67526b25502034c35a0a9d6cb93def7b0cffb Mon Sep 17 00:00:00 2001 From: Venky Shankar Date: Mon, 9 Oct 2023 10:36:49 +0530 Subject: [PATCH] Revert "mds: disable delegating inode ranges to clients" This isn't necessary -- the MDS handles delegating inode ranges to clients from its preallocated inode set properly - the suspected bug involving not persisting the sessionmap and causing asserts during replay isn't an issue. The preallocated set is persisted with the log event and the MDS correctly rebuild the set from this information during replay. Signed-off-by: Venky Shankar --- PendingReleaseNotes | 3 --- qa/suites/fs/workload/delegate_inos/default.yaml | 1 - qa/suites/fs/workload/delegate_inos/enabled.yaml | 5 ----- src/common/options/mds.yaml.in | 2 +- 4 files changed, 1 insertion(+), 10 deletions(-) delete mode 100644 qa/suites/fs/workload/delegate_inos/default.yaml delete mode 100644 qa/suites/fs/workload/delegate_inos/enabled.yaml diff --git a/PendingReleaseNotes b/PendingReleaseNotes index eae5f22efcf7c..1fc9c4510d3e9 100644 --- a/PendingReleaseNotes +++ b/PendingReleaseNotes @@ -50,9 +50,6 @@ recommend that users with versioned buckets, especially those that existed on prior releases, use these new tools to check whether their buckets are affected and to clean them up accordingly. -CephFS: Disallow delegating preallocated inode ranges to clients. Config - `mds_client_delegate_inos_pct` defaults to 0 which disables async dirops - in the kclient. >=18.0.0 diff --git a/qa/suites/fs/workload/delegate_inos/default.yaml b/qa/suites/fs/workload/delegate_inos/default.yaml deleted file mode 100644 index 219407f33fe0b..0000000000000 --- a/qa/suites/fs/workload/delegate_inos/default.yaml +++ /dev/null @@ -1 +0,0 @@ -# Use default (0) diff --git a/qa/suites/fs/workload/delegate_inos/enabled.yaml b/qa/suites/fs/workload/delegate_inos/enabled.yaml deleted file mode 100644 index 6c0e0da27a131..0000000000000 --- a/qa/suites/fs/workload/delegate_inos/enabled.yaml +++ /dev/null @@ -1,5 +0,0 @@ -overrides: - ceph: - conf: - mds: - mds_client_delegate_inos_pct: 50 diff --git a/src/common/options/mds.yaml.in b/src/common/options/mds.yaml.in index 4ce457234ba14..2599b6532b5dc 100644 --- a/src/common/options/mds.yaml.in +++ b/src/common/options/mds.yaml.in @@ -454,7 +454,7 @@ options: type: uint level: advanced desc: percentage of preallocated inos to delegate to client - default: 0 + default: 50 services: - mds flags: -- 2.39.5