From 3203673d1748d1e4b6738a15b10ab5e81c33237c Mon Sep 17 00:00:00 2001 From: Rakshith R Date: Thu, 27 Jan 2022 11:07:23 +0530 Subject: [PATCH] cleanup: remove ceph.conf WA options which are already fixed This commit removes ceph.conf WA options: ``` # Workaround for http://tracker.ceph.com/issues/23446 fuse_set_user_groups = false # ceph-fuse which uses libfuse2 by default has write buffer size of 2KiB # adding 'fuse_big_writes = true' option by default to override this limit # see https://github.com/ceph/ceph-csi/issues/1928 fuse_big_writes = true ``` Since they are already fixed. Refer: https://tracker.ceph.com/issues/44885 Refer: https://tracker.ceph.com/issues/23446 Closes: #2825 Signed-off-by: Rakshith R --- charts/ceph-csi-rbd/values.yaml | 8 -------- examples/ceph-conf.yaml | 7 ------- internal/util/cephconf.go | 8 -------- 3 files changed, 23 deletions(-) diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml index 3ffdb973d..eaa578b6e 100644 --- a/charts/ceph-csi-rbd/values.yaml +++ b/charts/ceph-csi-rbd/values.yaml @@ -423,14 +423,6 @@ cephconf: | auth_service_required = cephx auth_client_required = cephx - # Workaround for http://tracker.ceph.com/issues/23446 - fuse_set_user_groups = false - - # ceph-fuse which uses libfuse2 by default has write buffer size of 2KiB - # adding 'fuse_big_writes = true' option by default to override this limit - # see https://github.com/ceph/ceph-csi/issues/1928 - fuse_big_writes = true - ######################################################### # Variables for 'internal' use please use with caution! # ######################################################### diff --git a/examples/ceph-conf.yaml b/examples/ceph-conf.yaml index 8ef1b96f7..0905fbd9e 100644 --- a/examples/ceph-conf.yaml +++ b/examples/ceph-conf.yaml @@ -15,13 +15,6 @@ data: auth_service_required = cephx auth_client_required = cephx - # Workaround for http://tracker.ceph.com/issues/23446 - fuse_set_user_groups = false - - # ceph-fuse which uses libfuse2 by default has write buffer size of 2KiB - # adding 'fuse_big_writes = true' option by default to override this limit - # see https://github.com/ceph/ceph-csi/issues/1928 - fuse_big_writes = true # keyring is a required key and its value should be empty keyring: | metadata: diff --git a/internal/util/cephconf.go b/internal/util/cephconf.go index 006b53e6f..9977a9f84 100644 --- a/internal/util/cephconf.go +++ b/internal/util/cephconf.go @@ -24,14 +24,6 @@ var cephConfig = []byte(`[global] auth_cluster_required = cephx auth_service_required = cephx auth_client_required = cephx - -# Workaround for http://tracker.ceph.com/issues/23446 -fuse_set_user_groups = false - -# ceph-fuse which uses libfuse2 by default has write buffer size of 2KiB -# adding 'fuse_big_writes = true' option by default to override this limit -# see https://github.com/ceph/ceph-csi/issues/1928 -fuse_big_writes = true `) const (