osd: remove statelog from osd_class_load_list config

Signed-off-by: Casey Bodley <cbodley@redhat.com>

diff --git a/qa/suites/rados/basic/tasks/rados_cls_all.yaml b/qa/suites/rados/basic/tasks/rados_cls_all.yaml
index ec85c18f7cff0b14eeaa39d9c7e2733b2d0e1061..bcc58e19dc7476ffd14a5630744ecbbb88d3533a 100644 (file)
--- a/qa/suites/rados/basic/tasks/rados_cls_all.yaml
+++ b/qa/suites/rados/basic/tasks/rados_cls_all.yaml
@@ -3,9 +3,9 @@ overrides:
     conf:
       osd:
         osd_class_load_list: "cephfs hello journal lock log numops rbd refcount 
-                              rgw sdk statelog timeindex user version"
+                              rgw sdk timeindex user version"
         osd_class_default_list: "cephfs hello journal lock log numops rbd refcount 
-                                 rgw sdk statelog timeindex user version"
+                                 rgw sdk timeindex user version"
 tasks:
 - workunit:
     clients:

diff --git a/qa/suites/rados/verify/tasks/rados_cls_all.yaml b/qa/suites/rados/verify/tasks/rados_cls_all.yaml
index ec85c18f7cff0b14eeaa39d9c7e2733b2d0e1061..bcc58e19dc7476ffd14a5630744ecbbb88d3533a 100644 (file)
--- a/qa/suites/rados/verify/tasks/rados_cls_all.yaml
+++ b/qa/suites/rados/verify/tasks/rados_cls_all.yaml
@@ -3,9 +3,9 @@ overrides:
     conf:
       osd:
         osd_class_load_list: "cephfs hello journal lock log numops rbd refcount 
-                              rgw sdk statelog timeindex user version"
+                              rgw sdk timeindex user version"
         osd_class_default_list: "cephfs hello journal lock log numops rbd refcount 
-                                 rgw sdk statelog timeindex user version"
+                                 rgw sdk timeindex user version"
 tasks:
 - workunit:
     clients:

diff --git a/qa/suites/smoke/basic/tasks/rados_cls_all.yaml b/qa/suites/smoke/basic/tasks/rados_cls_all.yaml
index cddb6281d74e469332c4ffe28ab484c14cb8b995..5f46a1abdcd599910c5f52c0ec742f5ef05a4244 100644 (file)
--- a/qa/suites/smoke/basic/tasks/rados_cls_all.yaml
+++ b/qa/suites/smoke/basic/tasks/rados_cls_all.yaml
@@ -3,9 +3,9 @@ overrides:
     conf:
       osd:
         osd_class_load_list: "cephfs hello journal lock log numops rbd refcount
-                              rgw sdk statelog timeindex user version"
+                              rgw sdk timeindex user version"
         osd_class_default_list: "cephfs hello journal lock log numops rbd refcount
-                                 rgw sdk statelog timeindex user version"
+                                 rgw sdk timeindex user version"
 tasks:
 - install:
 - ceph:

diff --git a/qa/suites/upgrade/luminous-x/parallel/0-cluster/start.yaml b/qa/suites/upgrade/luminous-x/parallel/0-cluster/start.yaml
index c36d564c703f375d16ffae31df68a018d920cba7..2373e3d5138d389e465310323c601f964e41e7a2 100644 (file)
--- a/qa/suites/upgrade/luminous-x/parallel/0-cluster/start.yaml
+++ b/qa/suites/upgrade/luminous-x/parallel/0-cluster/start.yaml
@@ -34,7 +34,7 @@ overrides:
         mon warn on osd down out interval zero: false
       osd:
         osd_class_load_list: "cephfs hello journal lock log numops rbd refcount 
-                              rgw sdk statelog timeindex user version"
+                              rgw sdk timeindex user version"
         osd_class_default_list: "cephfs hello journal lock log numops rbd refcount 
-                                 rgw sdk statelog timeindex user version"
+                                 rgw sdk timeindex user version"
     fs: xfs

diff --git a/qa/suites/upgrade/mimic-x/parallel/0-cluster/start.yaml b/qa/suites/upgrade/mimic-x/parallel/0-cluster/start.yaml
index 8c3fdc4b1b8a5047460146f767974f7c6a98fcb8..1839036742063a9a8d59b8b0665ac87869e23084 100644 (file)
--- a/qa/suites/upgrade/mimic-x/parallel/0-cluster/start.yaml
+++ b/qa/suites/upgrade/mimic-x/parallel/0-cluster/start.yaml
@@ -34,9 +34,9 @@ overrides:
         mon warn on osd down out interval zero: false
       osd:
         osd_class_load_list: "cephfs hello journal lock log numops rbd refcount 
-                              rgw sdk statelog timeindex user version"
+                              rgw sdk timeindex user version"
         osd_class_default_list: "cephfs hello journal lock log numops rbd refcount 
-                                 rgw sdk statelog timeindex user version"
+                                 rgw sdk timeindex user version"
     fs: xfs
   #enable RHEL runs on ovh nodes
   ansible.cephlab:

diff --git a/src/common/options.cc b/src/common/options.cc
index 56eea23f2818adb55af2f25db9765ccb9f118aa1..e06b67ea769d979ca1cbe7aca5755f75d9eebc09 100644 (file)
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -3163,11 +3163,11 @@ std::vector<Option> get_global_options() {
     .set_description(""),
 
     Option("osd_class_load_list", Option::TYPE_STR, Option::LEVEL_ADVANCED)
-    .set_default("cephfs hello journal lock log numops " "otp rbd refcount rgw statelog timeindex user version cas")
+    .set_default("cephfs hello journal lock log numops " "otp rbd refcount rgw timeindex user version cas")
     .set_description(""),
 
     Option("osd_class_default_list", Option::TYPE_STR, Option::LEVEL_ADVANCED)
-    .set_default("cephfs hello journal lock log numops " "otp rbd refcount rgw statelog timeindex user version cas")
+    .set_default("cephfs hello journal lock log numops " "otp rbd refcount rgw timeindex user version cas")
     .set_description(""),
 
     Option("osd_check_for_log_corruption", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)