-
Notifications
You must be signed in to change notification settings - Fork 364
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add OFSwitch connection check to Agent's liveness probes
This helps automatic recovery if some issues cause OFSwitch reconnection to not work properly. It also fixes a race condition between the IsConnected and SwitchConnected methods of OFBridge. For #4092 Signed-off-by: Quan Tian <[email protected]>
- Loading branch information
Showing
11 changed files
with
315 additions
and
47 deletions.
There are no files selected for viewing
This file contains 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 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 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 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 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 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 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 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 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,153 @@ | ||
| // Copyright 2022 Antrea Authors | ||
| // | ||
| // 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 apiserver | ||
|
|
||
| import ( | ||
| "net" | ||
| "net/http" | ||
| "net/http/httptest" | ||
| "os" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/golang/mock/gomock" | ||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
| genericapiserver "k8s.io/apiserver/pkg/server" | ||
|
|
||
| oftest "antrea.io/antrea/pkg/agent/openflow/testing" | ||
| aqtest "antrea.io/antrea/pkg/agent/querier/testing" | ||
| queriertest "antrea.io/antrea/pkg/querier/testing" | ||
| "antrea.io/antrea/pkg/version" | ||
| ) | ||
|
|
||
| type fakeAgentAPIServer struct { | ||
| *agentAPIServer | ||
| agentQuerier *aqtest.MockAgentQuerier | ||
| npQuerier *queriertest.MockAgentNetworkPolicyInfoQuerier | ||
| ofClient *oftest.MockClient | ||
| } | ||
|
|
||
| func newFakeAPIServer(t *testing.T) *fakeAgentAPIServer { | ||
| f, err := os.CreateTemp("", "authkubeconfig") | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| defer func() { | ||
| f.Close() | ||
| os.Remove(f.Name()) | ||
| }() | ||
| if _, err := f.Write([]byte(` | ||
| apiVersion: v1 | ||
| kind: Config | ||
| clusters: | ||
| - cluster: | ||
| server: http://localhost:56789 | ||
| name: cluster | ||
| contexts: | ||
| - context: | ||
| cluster: cluster | ||
| name: cluster | ||
| current-context: cluster | ||
| `)); err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| originalTokenPath := TokenPath | ||
| tokenFile, err := os.CreateTemp("", "tokenFile") | ||
| TokenPath = tokenFile.Name() | ||
| defer func() { | ||
| TokenPath = originalTokenPath | ||
| tokenFile.Close() | ||
| os.Remove(tokenFile.Name()) | ||
| }() | ||
| version.Version = "v1.2.3" | ||
| ctrl := gomock.NewController(t) | ||
| defer ctrl.Finish() | ||
| agentQuerier := aqtest.NewMockAgentQuerier(ctrl) | ||
| npQuerier := queriertest.NewMockAgentNetworkPolicyInfoQuerier(ctrl) | ||
| ofClient := oftest.NewMockClient(ctrl) | ||
| agentQuerier.EXPECT().GetOpenflowClient().AnyTimes().Return(ofClient) | ||
| cfg, err := newConfig(agentQuerier, npQuerier, net.ParseIP("127.0.0.1"), 10000, true, f.Name(), true) | ||
| require.NoError(t, err) | ||
| s, err := cfg.New(Name, genericapiserver.NewEmptyDelegate()) | ||
| require.NoError(t, err) | ||
| agentAPIServer := &agentAPIServer{GenericAPIServer: s} | ||
| fakeAPIServer := &fakeAgentAPIServer{ | ||
| agentAPIServer: agentAPIServer, | ||
| agentQuerier: agentQuerier, | ||
| npQuerier: npQuerier, | ||
| ofClient: ofClient, | ||
| } | ||
| return fakeAPIServer | ||
| } | ||
|
|
||
| func TestAPIServerLivezCheck(t *testing.T) { | ||
| tests := []struct { | ||
| name string | ||
| setupFunc func(*fakeAgentAPIServer) | ||
| expectedCode int | ||
| expectedBody string | ||
| }{ | ||
| { | ||
| name: "ovs connected", | ||
| setupFunc: func(apiserver *fakeAgentAPIServer) { | ||
| apiserver.ofClient.EXPECT().IsConnected().Return(true) | ||
| }, | ||
| expectedCode: 200, | ||
| expectedBody: "ok", | ||
| }, | ||
| { | ||
| name: "ovs disconnected", | ||
| setupFunc: func(apiserver *fakeAgentAPIServer) { | ||
| apiserver.ofClient.EXPECT().IsConnected().Return(false) | ||
| }, | ||
| expectedCode: 500, | ||
| expectedBody: `[+]ping ok | ||
| [+]log ok | ||
| [-]ovs failed: reason withheld | ||
| [+]poststarthook/max-in-flight-filter ok | ||
| livez check failed | ||
| `, | ||
| }, | ||
| } | ||
|
|
||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| apiserver := newFakeAPIServer(t) | ||
| stopCh := make(chan struct{}) | ||
| defer close(stopCh) | ||
| go func() { | ||
| apiserver.Run(stopCh) | ||
| }() | ||
| // Wait for APIServer to be health so checks installed by default are ensured ok. | ||
| assert.Eventuallyf(t, func() bool { | ||
| response := getResponse(apiserver, "/healthz") | ||
| return response.Body.String() == "ok" | ||
| }, time.Second*5, time.Millisecond*100, "APIServer didn't become health in 5 seconds") | ||
|
|
||
| tt.setupFunc(apiserver) | ||
| response := getResponse(apiserver, "/livez") | ||
| assert.Equal(t, tt.expectedBody, response.Body.String()) | ||
| assert.Equal(t, tt.expectedCode, response.Code) | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func getResponse(apiserver *fakeAgentAPIServer, query string) *httptest.ResponseRecorder { | ||
| req, _ := http.NewRequest(http.MethodGet, query, nil) | ||
| recorder := httptest.NewRecorder() | ||
| apiserver.GenericAPIServer.Handler.ServeHTTP(recorder, req) | ||
| return recorder | ||
| } |
This file contains 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
Oops, something went wrong.