forked from rook/rook
Sébastien Han
eb3c424d57
This commit introduces the necessary changes to support the new messenger feature coming with Ceph Nautilus (currently in development). What changes? Now the monitor listens on two port: * old 6789 for messenger v1, which will help us support older client (e,g: krbd) * new 3300 for messengers v2, which brings new improvement in the messaging layer. This new transport layer brings numerous advantages such as encryption improvement, speed improvement, pluggable nature to support different network stack than TCP and many more. We still have one Service IP, however it has 2 ports, see: ``` NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE rook-ceph-mon-a ClusterIP 10.106.217.160 <none> 3300/TCP,6789/TCP 4h rook-ceph-mon-b ClusterIP 10.99.36.175 <none> 3300/TCP,6789/TCP 4h rook-ceph-mon-c ClusterIP 10.108.220.74 <none> 3300/TCP,6789/TCP 4h ```` The `ceph.conf` has changed and we don't force the port when using an IP address (public addr etc). Ceph, depending on its version will naturally start the monitors on their right port, 6789. A new --ceph-version-name CLI argument has been added to the Rook binary so that when the pod starts it passes the ceph version name and the configuration of the ceph.conf, as well as daemon startup flags, happen properly. Given that the Rook Operator remembers the port of all the monitors it deployed (through Pod definition), this change is not an issue and will maintain backward compatibility. Note that to test this you must build rook with dev container image, which contains the dev Nautilus version. So you should do something like: `make -j4 BASEIMAGE='ceph/daemon-base:latest-master' IMAGES='ceph' build` Resolves: #2525 Signed-off-by: Sébastien Han <seb@redhat.com>
86 lines
2.1 KiB
Go
86 lines
2.1 KiB
Go
/*
|
|
Copyright 2017 The Rook Authors. All rights reserved.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package mon
|
|
|
|
import (
|
|
"fmt"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"github.com/rook/rook/pkg/daemon/ceph/client"
|
|
"github.com/rook/rook/pkg/operator/k8sutil"
|
|
v1 "k8s.io/api/core/v1"
|
|
"k8s.io/apimachinery/pkg/util/intstr"
|
|
)
|
|
|
|
const (
|
|
maxPerChar = 26
|
|
)
|
|
|
|
func monInQuorum(monitor client.MonMapEntry, quorum []int) bool {
|
|
for _, rank := range quorum {
|
|
if rank == monitor.Rank {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|
|
|
|
// convert the mon name to the numeric mon ID
|
|
func fullNameToIndex(name string) (int, error) {
|
|
prefix := appName + "-"
|
|
if strings.Index(name, prefix) != -1 && len(prefix) < len(name) {
|
|
return k8sutil.NameToIndex(name[len(prefix)+1:])
|
|
}
|
|
|
|
// attempt to parse the legacy mon name
|
|
legacyPrefix := appName
|
|
if strings.Index(name, legacyPrefix) == -1 || len(name) < len(appName) {
|
|
return -1, fmt.Errorf("unexpected mon name")
|
|
}
|
|
id, err := strconv.Atoi(name[len(legacyPrefix):])
|
|
if err != nil {
|
|
return -1, err
|
|
}
|
|
return id, nil
|
|
}
|
|
|
|
// addServicePort adds a port to a service
|
|
func addServicePort(service *v1.Service, name string, port int32) {
|
|
if port == 0 {
|
|
return
|
|
}
|
|
service.Spec.Ports = append(service.Spec.Ports, v1.ServicePort{
|
|
Name: name,
|
|
Port: port,
|
|
TargetPort: intstr.FromInt(int(port)),
|
|
Protocol: v1.ProtocolTCP,
|
|
})
|
|
}
|
|
|
|
// addContainerPort adds a port to a container
|
|
func addContainerPort(container v1.Container, name string, port int32) {
|
|
if port == 0 {
|
|
return
|
|
}
|
|
container.Ports = append(container.Ports, v1.ContainerPort{
|
|
Name: name,
|
|
ContainerPort: port,
|
|
Protocol: v1.ProtocolTCP,
|
|
})
|
|
}
|