Merge pull request #10821 from travisn/rbd-mirror-log-rotate
rbdmirror: Rotate all rbd mirroring logs
This commit is contained in:
2 files changed
+8
-5
No files matched your search
+2
-2
@@ -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",
|
||||
|
||||
@@ -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
|
||||
// <CLUSTER_FSID>-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
|
||||
|
||||
Reference in new issue
Block a user