ceph: osd: fix startup on sdn
This commit adds a new flag to the osd startup so that on msgr2 (default on Nautilus and above) the osd is able to find the IP address in the container to bind to. This requires this Ceph patch https://github.com/ceph/ceph/pull/28589 and is already present in Octopus. Closes: https://github.com/rook/rook/issues/3140 Signed-off-by: Sébastien Han <seb@redhat.com>
This commit is contained in:
1 parent
8da2221296
commit
b2f2ff6b9d
2 files changed
+32
No files matched your search
@@ -30,6 +30,7 @@ import (
|
||||
"github.com/rook/rook/pkg/operator/ceph/cluster/osd/config"
|
||||
opspec "github.com/rook/rook/pkg/operator/ceph/spec"
|
||||
"github.com/rook/rook/pkg/operator/ceph/version"
|
||||
cephver "github.com/rook/rook/pkg/operator/ceph/version"
|
||||
"github.com/rook/rook/pkg/operator/k8sutil"
|
||||
apps "k8s.io/api/apps/v1"
|
||||
batch "k8s.io/api/batch/v1"
|
||||
@@ -172,6 +173,8 @@ func (c *Cluster) makeDeployment(nodeName string, selection rookalpha.Selection,
|
||||
commonArgs = append(commonArgs, "--default-log-to-file", "false")
|
||||
}
|
||||
|
||||
commonArgs = append(commonArgs, osdOnSDNFlag(c.HostNetwork, c.clusterInfo.CephVersion)...)
|
||||
|
||||
// Add the volume to the spec and the mount to the daemon container
|
||||
copyBinariesVolume, copyBinariesContainer := c.getCopyBinariesContainer()
|
||||
volumes = append(volumes, copyBinariesVolume)
|
||||
@@ -222,6 +225,8 @@ func (c *Cluster) makeDeployment(nodeName string, selection rookalpha.Selection,
|
||||
args = append(args, "--default-log-to-file", "false")
|
||||
}
|
||||
|
||||
args = append(args, osdOnSDNFlag(c.HostNetwork, c.clusterInfo.CephVersion)...)
|
||||
|
||||
// mount /run/udev in the container so ceph-volume (via `lvs`)
|
||||
// can access the udev database
|
||||
volumes = append(volumes, v1.Volume{
|
||||
@@ -619,3 +624,15 @@ func getConfigFromContainer(osdContainer v1.Container) map[string]string {
|
||||
|
||||
return cfg
|
||||
}
|
||||
|
||||
func osdOnSDNFlag(hostnetwork bool, v cephver.CephVersion) []string {
|
||||
var args []string
|
||||
// OSD fails to find the right IP to bind to when running on SDN
|
||||
// for more details: https://github.com/rook/rook/issues/3140
|
||||
if !hostnetwork {
|
||||
if v.IsAtLeast(cephver.CephVersion{Major: 14, Minor: 2, Extra: 2}) {
|
||||
args = append(args, "--ms-learn-addr-from-peer", "false")
|
||||
}
|
||||
}
|
||||
return args
|
||||
}
|
||||
@@ -328,3 +328,18 @@ func TestHostNetwork(t *testing.T) {
|
||||
assert.Equal(t, true, r.Spec.Template.Spec.HostNetwork)
|
||||
assert.Equal(t, v1.DNSClusterFirstWithHostNet, r.Spec.Template.Spec.DNSPolicy)
|
||||
}
|
||||
|
||||
func TestOsdOnSDNFlag(t *testing.T) {
|
||||
hostnetwork := false
|
||||
v := cephver.Mimic
|
||||
args := osdOnSDNFlag(hostnetwork, v)
|
||||
assert.Empty(t, args)
|
||||
|
||||
v = cephver.CephVersion{Major: 14, Minor: 2, Extra: 2}
|
||||
args = osdOnSDNFlag(hostnetwork, v)
|
||||
assert.NotEmpty(t, args)
|
||||
|
||||
v = cephver.Octopus
|
||||
args = osdOnSDNFlag(hostnetwork, v)
|
||||
assert.NotEmpty(t, args)
|
||||
}
|
||||
Reference in new issue
Block a user