ovsdb: exit clustered ovsdb server if multiple raft leaders found #6065
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| package ovs | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "fmt" | ||
| "net" | ||
| "os" | ||
| "os/exec" | ||
| "slices" | ||
| "strconv" | ||
| "strings" | ||
|
|
||
| "github.com/ovn-kubernetes/libovsdb/ovsdb" | ||
| "k8s.io/apimachinery/pkg/util/intstr" | ||
| ) | ||
|
|
||
| // OvsdbServerAddress constructs the ovsdb-server address based on the given host and port. | ||
| // It uses "ssl" scheme if the ENABLE_SSL environment variable is set to "true", otherwise "tcp". | ||
| // | ||
| // For example: | ||
| // | ||
| // OvsdbServerAddress("localhost:6641") returns "tcp:localhost:6641" or "ssl:localhost:6641" based on the ENABLE_SSL setting. | ||
| func OvsdbServerAddress(host string, port intstr.IntOrString) string { | ||
| scheme := "tcp" | ||
| if os.Getenv("ENABLE_SSL") == "true" { | ||
| scheme = "ssl" | ||
| } | ||
| return fmt.Sprintf("%s:%s", scheme, net.JoinHostPort(host, port.String())) | ||
| } | ||
|
|
||
| // Query executes an ovsdb-client query command against the given address and database with the provided operations | ||
| // and returns the operation results. | ||
| // For SSL connections, it assumes the certificates are located at /var/run/tls/{key,cert,cacert}. | ||
| // The timeout is specified in seconds. | ||
| // For more details, see `ovsdb-client --help`. | ||
| // | ||
| // For example: | ||
| // | ||
| // results, err := Query("tcp:[::1]:6641", "OVN_Northbound", 3, ovsdb.Operation{...}) | ||
| // results, err := Query("ssl:[::1]:6641", "OVN_Northbound", 3, ovsdb.Operation{...}) | ||
| func Query(address, database string, timeout int, operations ...ovsdb.Operation) ([]ovsdb.OperationResult, error) { | ||
| transArgs := ovsdb.NewTransactArgs(database, operations...) | ||
| query, err := json.Marshal(transArgs) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to marshal ovsdb transaction args %+v: %w", transArgs, err) | ||
| } | ||
|
|
||
| args := []string{"--timeout", strconv.Itoa(timeout), "query", address, string(query)} | ||
| if strings.HasPrefix(address, "ssl:") { | ||
| args = slices.Insert(args, 0, "-p", "/var/run/tls/key", "-c", "/var/run/tls/cert", "-C", "/var/run/tls/cacert") | ||
|
Contributor
There was a problem hiding this comment. The SSL certificate paths ( |
||
| } | ||
|
|
||
| output, err := exec.Command("ovsdb-client", args...).CombinedOutput() // #nosec G204 | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to execute ovsdb-client with args %v: %w\noutput: %s", args, err, string(output)) | ||
| } | ||
|
|
||
| var results []ovsdb.OperationResult | ||
| if err = json.Unmarshal(output, &results); err != nil { | ||
| return nil, fmt.Errorf("failed to unmarshal ovsdb-client output %q: %w", string(output), err) | ||
| } | ||
|
|
||
| return results, nil | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| package ovs | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "k8s.io/apimachinery/pkg/util/intstr" | ||
| ) | ||
|
|
||
| func TestOvsdbServerAddress(t *testing.T) { | ||
| tests := []struct { | ||
| name string | ||
| host string | ||
| port intstr.IntOrString | ||
| envValue string | ||
| expected string | ||
| }{ | ||
| { | ||
| name: "tcp scheme", | ||
| host: "localhost", | ||
| port: intstr.FromInt32(6641), | ||
| envValue: "false", | ||
| expected: "tcp:localhost:6641", | ||
| }, | ||
| { | ||
| name: "ssl scheme", | ||
| host: "127.0.0.1", | ||
| port: intstr.FromInt(6642), | ||
| envValue: "true", | ||
| expected: "ssl:127.0.0.1:6642", | ||
| }, | ||
| { | ||
| name: "tcp scheme with ipv6 address", | ||
| host: "::1", | ||
| port: intstr.FromInt(6643), | ||
| envValue: "false", | ||
| expected: "tcp:[::1]:6643", | ||
| }, | ||
| { | ||
| name: "ssl scheme with ipv6 address", | ||
| host: "2001:0db8:85a3:0000:0000:8a2e:0370:7334", | ||
| port: intstr.FromInt(6644), | ||
| envValue: "true", | ||
| expected: "ssl:[2001:0db8:85a3:0000:0000:8a2e:0370:7334]:6644", | ||
| }, | ||
| } | ||
|
|
||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| t.Setenv("ENABLE_SSL", tt.envValue) | ||
| result := OvsdbServerAddress(tt.host, tt.port) | ||
| if result != tt.expected { | ||
| t.Errorf("expected %s, got %s", tt.expected, result) | ||
| } | ||
| }) | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The new fields
localAddressandremoteAddressesare unexported, which is inconsistent with other fields in theConfigurationstruct. It's a good practice to export fields of configuration structs for consistency and reusability. Please consider making themLocalAddressandRemoteAddressesand updating their usage accordingly inParseFlags.