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>
71 lines
3.3 KiB
Go
71 lines
3.3 KiB
Go
/*
|
|
Copyright 2016 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 test
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/coreos/pkg/capnslog"
|
|
)
|
|
|
|
var logger = capnslog.NewPackageLogger("github.com/rook/rook", "ceph-op-testlib")
|
|
|
|
// ArgumentsMatchExpected returns a descriptive error if any of the expected arguments do not exist.
|
|
// This supports arguments in which flags appear multiple times with different values but does not
|
|
// support multiple instances of the same flag-value. This test is designed to fail if the list
|
|
// of actual arguments contains extra arguments not specified in the expected args.
|
|
// The expected arguments are given as an array of string arrays. This is to support flags which
|
|
// may have multiple values. Examples:
|
|
// expectedArgs := [][]string{
|
|
// {"-h"}, // test for a short flag
|
|
// {"-vvv"}, // test for a short flag with value(s) specified
|
|
// {"-d", "3"}, // test for a short flag with a value specified
|
|
// {"--verbose"}, // test for a --bool flag
|
|
// {"--name=alex"}, // test for a --flag=value flag
|
|
// {"--name", "sam"}, // test for a --flag with a value after a space
|
|
// {"--full-name", "sam", "goodhuman"}, // test for a --flag with 2 values separated by spaces
|
|
// }
|
|
func ArgumentsMatchExpected(actualArgs []string, expectedArgs [][]string) error {
|
|
// join all args into a big space-separated arg string so we can use string search on it
|
|
// this is simpler than a bunch of nested for loops and if statements with continues in them
|
|
fullArgString := strings.Join(actualArgs, " ")
|
|
logger.Infof("testing that actual args: %s\nmatch expected args:%v", fullArgString, actualArgs)
|
|
for _, arg := range expectedArgs {
|
|
validArgMatcher := strings.Join(arg, " ")
|
|
// We join each individual argument together the same was as the big string
|
|
if validArgMatcher == "" {
|
|
return fmt.Errorf("Expected argument %v evaluated to empty string; ArgumentsMatchExpected() doesn't know what to do", arg)
|
|
}
|
|
matches := strings.Count(fullArgString, validArgMatcher)
|
|
if matches > 1 {
|
|
return fmt.Errorf("More than one instance of flag '%s' in: %s; ArgumentsMatchExpected() doesn't know what to do",
|
|
validArgMatcher, fullArgString)
|
|
} else if matches == 1 {
|
|
// Remove the instance of the valid match so we can't match to it any more
|
|
fullArgString = strings.Replace(fullArgString, validArgMatcher, "", 1)
|
|
} else { // zero matches
|
|
return fmt.Errorf("Expected argument '%s' missing in: %s\n(It's possible the same arg is in expectedArgs twice.)",
|
|
validArgMatcher, strings.Join(actualArgs, " "))
|
|
}
|
|
}
|
|
if remainingArgs := strings.Trim(fullArgString, " "); remainingArgs != "" {
|
|
return fmt.Errorf("The actual arguments have additional args specified: %s", remainingArgs)
|
|
}
|
|
return nil
|
|
}
|