From 3584e8ccceeee287c1099a9891e856fbecc8be3e Mon Sep 17 00:00:00 2001 From: Blaine Gardner Date: Tue, 8 Oct 2019 13:20:39 -0600 Subject: [PATCH] ceph: osd: fix wrong log file path on host Log file path on host for OSDs was dataDirHostPath/log/ instead of dataDirHostPath//log as with other daemons. Signed-off-by: Blaine Gardner --- PendingReleaseNotes.md | 5 ++++- pkg/operator/ceph/spec/spec.go | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/PendingReleaseNotes.md b/PendingReleaseNotes.md index e773db6d6..7ee4aad22 100644 --- a/PendingReleaseNotes.md +++ b/PendingReleaseNotes.md @@ -9,9 +9,12 @@ - The job for detecting the Ceph version can be started with node affinity or tolerations according to the same settings in the Cluster CR as the mons. - A new CR property `skipUpgradeChecks` has been added, which allows you force an upgrade by skipping daemon checks. Use this at **YOUR OWN RISK**, only if you know what you're doing. To understand Rook's upgrade process of Ceph, read the [upgrade doc](Documentation/ceph-upgrade.html#ceph-version-upgrades). -- Ceph OSD's admin socket is now placed under Ceph's default system location `/run/ceph`. - Mon Quorum Disaster Recovery guide has been updated to work with the latest Rook and Ceph release. - A new CRD property `PreservePoolsOnDelete` has been added to Filesystem(fs) and Object Store(os) resources in order to increase protection against data loss. if it is set to `true`, associated pools won't be deleted when the main resource(fs/os) is deleted. Creating again the deleted fs/os with the same name will reuse the preserved pools. +- OSDs: + - Ceph OSD's admin socket is now placed under Ceph's default system location `/run/ceph`. + - The on-host log directory for OSDs was set incorrectly to `//log`; + fix this to be `/log/`, the same as other daemons. ### EdgeFS diff --git a/pkg/operator/ceph/spec/spec.go b/pkg/operator/ceph/spec/spec.go index aa7a2f675..dce7fd528 100644 --- a/pkg/operator/ceph/spec/spec.go +++ b/pkg/operator/ceph/spec/spec.go @@ -102,7 +102,7 @@ func PodVolumes(dataDirHostPath, namespace string, confGeneratedInPod bool) []v1 return []v1.Volume{ {Name: k8sutil.DataDirVolume, VolumeSource: dataDirSource}, configVolume, - StoredLogVolume(path.Join(dataDirHostPath, "log", namespace)), + StoredLogVolume(path.Join(dataDirHostPath, namespace, "log")), } }