diff --git a/Documentation/ceph-block.md b/Documentation/ceph-block.md index 30f788b0a..e8b9d06a1 100644 --- a/Documentation/ceph-block.md +++ b/Documentation/ceph-block.md @@ -67,8 +67,9 @@ parameters: csi.storage.k8s.io/node-stage-secret-namespace: rook-ceph # Specify the filesystem type of the volume. If not specified, csi-provisioner - # will set default as `ext4`. - csi.storage.k8s.io/fstype: xfs + # will set default as `ext4`. Note that `xfs` is not recommended due to potential deadlock + # in hyperconverged settings where the volume is mounted on the same node as the osds. + csi.storage.k8s.io/fstype: ext4 # Delete the rbd volume when a PVC is deleted reclaimPolicy: Delete @@ -169,7 +170,7 @@ parameters: # The value of "clusterNamespace" MUST be the same as the one in which your rook cluster exist clusterNamespace: rook-ceph # Specify the filesystem type of the volume. If not specified, it will use `ext4`. - fstype: xfs + fstype: ext4 # Optional, default reclaimPolicy is "Delete". Other options are: "Retain", "Recycle" as documented in https://kubernetes.io/docs/concepts/storage/storage-classes/ reclaimPolicy: Retain # Optional, if you want to add dynamic resize for PVC. Works for Kubernetes 1.14+ diff --git a/cluster/examples/kubernetes/ceph/csi/rbd/storageclass.yaml b/cluster/examples/kubernetes/ceph/csi/rbd/storageclass.yaml index 75beeb38a..572fa9559 100644 --- a/cluster/examples/kubernetes/ceph/csi/rbd/storageclass.yaml +++ b/cluster/examples/kubernetes/ceph/csi/rbd/storageclass.yaml @@ -47,7 +47,8 @@ parameters: csi.storage.k8s.io/node-stage-secret-name: rook-csi-rbd-node csi.storage.k8s.io/node-stage-secret-namespace: rook-ceph # Specify the filesystem type of the volume. If not specified, csi-provisioner - # will set default as `ext4`. + # will set default as `ext4`. Note that `xfs` is not recommended due to potential deadlock + # in hyperconverged settings where the volume is mounted on the same node as the osds. csi.storage.k8s.io/fstype: ext4 # uncomment the following to use rbd-nbd as mounter on supported nodes # **IMPORTANT**: If you are using rbd-nbd as the mounter, during upgrade you will be hit a ceph-csi diff --git a/cluster/examples/kubernetes/ceph/flex/storageclass-ec.yaml b/cluster/examples/kubernetes/ceph/flex/storageclass-ec.yaml index d0b0947f5..a2509f9e3 100644 --- a/cluster/examples/kubernetes/ceph/flex/storageclass-ec.yaml +++ b/cluster/examples/kubernetes/ceph/flex/storageclass-ec.yaml @@ -45,4 +45,4 @@ parameters: # This is also the namespace where the cluster will be clusterNamespace: rook-ceph # Specify the filesystem type of the volume. If not specified, it will use `ext4`. - fstype: xfs + fstype: ext4 diff --git a/cluster/examples/kubernetes/ceph/flex/storageclass-test.yaml b/cluster/examples/kubernetes/ceph/flex/storageclass-test.yaml index aec69047c..b41765090 100644 --- a/cluster/examples/kubernetes/ceph/flex/storageclass-test.yaml +++ b/cluster/examples/kubernetes/ceph/flex/storageclass-test.yaml @@ -22,4 +22,4 @@ allowVolumeExpansion: true parameters: blockPool: replicapool clusterNamespace: rook-ceph - fstype: xfs + fstype: ext4 diff --git a/cluster/examples/kubernetes/ceph/flex/storageclass.yaml b/cluster/examples/kubernetes/ceph/flex/storageclass.yaml index 1024c59c5..d27113d52 100644 --- a/cluster/examples/kubernetes/ceph/flex/storageclass.yaml +++ b/cluster/examples/kubernetes/ceph/flex/storageclass.yaml @@ -27,7 +27,7 @@ parameters: # This is also the namespace where the cluster will be clusterNamespace: rook-ceph # Specify the filesystem type of the volume. If not specified, it will use `ext4`. - fstype: xfs + fstype: ext4 # (Optional) Specify an existing Ceph user that will be used for mounting storage with this StorageClass. #mountUser: user1 # (Optional) Specify an existing Kubernetes secret name containing just one key holding the Ceph user secret.