diff --git a/.commitlintrc.json b/.commitlintrc.json index 572f86773..62ca5cf61 100644 --- a/.commitlintrc.json +++ b/.commitlintrc.json @@ -10,7 +10,7 @@ "block", "bot", "build", - "cephfs-mirror", + "cephfsmirror", "ci", "core", "csi", @@ -28,7 +28,7 @@ "operator", "osd", "pool", - "rbd-mirror", + "rbdmirror", "rgw", "security", "subvolumegroup", diff --git a/pkg/operator/ceph/cluster/rbd/spec.go b/pkg/operator/ceph/cluster/rbd/spec.go index 9a410284a..dc85ec565 100644 --- a/pkg/operator/ceph/cluster/rbd/spec.go +++ b/pkg/operator/ceph/cluster/rbd/spec.go @@ -17,8 +17,6 @@ limitations under the License. package rbd import ( - "fmt" - cephv1 "github.com/rook/rook/pkg/apis/ceph.rook.io/v1" "github.com/rook/rook/pkg/operator/ceph/config" "github.com/rook/rook/pkg/operator/ceph/controller" @@ -52,7 +50,12 @@ func (r *ReconcileCephRBDMirror) makeDeployment(daemonConfig *daemonConfig, rbdM if r.cephClusterSpec.LogCollector.Enabled { shareProcessNamespace := true podSpec.Spec.ShareProcessNamespace = &shareProcessNamespace - podSpec.Spec.Containers = append(podSpec.Spec.Containers, *controller.LogCollectorContainer(fmt.Sprintf("ceph-client.rbd-mirror.%s", daemonConfig.DaemonID), r.clusterInfo.Namespace, *r.cephClusterSpec)) + + // The rbd mirror daemon logs to multiple logs, so we need a more generous log rotation filter for files: + // ceph-client.rbd-mirror.a.log + // -client.rbd-mirror-peer.log + logRotationFilter := "*-client.rbd-mirror*" + podSpec.Spec.Containers = append(podSpec.Spec.Containers, *controller.LogCollectorContainer(logRotationFilter, r.clusterInfo.Namespace, *r.cephClusterSpec)) } // Replace default unreachable node toleration