github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-09-03 01:46:12 +00:00
Code Issues Projects Releases Wiki Activity

Thick plugin should not wait for API readiness on CNI DEL

Browse Source 
This modifies the behavior on CNI DEL for the thick plugin to just check once for API readiness, as opposed to waiting.
This commit is contained in:
dougbtv
2024-05-14 11:14:21 -04:00
parent 5a2597b329
commit 181f56f026
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/server/api/api.go
View File

@@ -104,3 +104,12 @@ func WaitUntilAPIReady(socketPath string) error {
return err == nil, nil return err == nil, nil
}) })
} }
// CheckAPIReadyNow checks API readiness once
func CheckAPIReadyNow(socketPath string) error {
_, err := DoCNI(GetAPIEndpoint(MultusHealthAPIEndpoint), nil, SocketPath(socketPath))
if err != nil {
return fmt.Errorf("CheckAPIReadyNow: Daemon not reachable over socketfile: %v", err)
}
return nil
}

15
pkg/server/api/shim.go
View File

@@ -40,9 +40,12 @@ type ShimNetConf struct {
LogToStderr bool `json:"logToStderr,omitempty"` LogToStderr bool `json:"logToStderr,omitempty"`
} }
// Define a type for API readiness check functions
type APIReadyCheckFunc func(string) error
// CmdAdd implements the CNI spec ADD command handler // CmdAdd implements the CNI spec ADD command handler
func CmdAdd(args *skel.CmdArgs) error { func CmdAdd(args *skel.CmdArgs) error {
response, cniVersion, err := postRequest(args) response, cniVersion, err := postRequest(args, WaitUntilAPIReady)
if err != nil { if err != nil {
return logging.Errorf("CmdAdd (shim): %v", err) return logging.Errorf("CmdAdd (shim): %v", err)
} }
@@ -53,7 +56,7 @@ func CmdAdd(args *skel.CmdArgs) error {
// CmdCheck implements the CNI spec CHECK command handler // CmdCheck implements the CNI spec CHECK command handler
func CmdCheck(args *skel.CmdArgs) error { func CmdCheck(args *skel.CmdArgs) error {
_, _, err := postRequest(args) _, _, err := postRequest(args, WaitUntilAPIReady)
if err != nil { if err != nil {
return logging.Errorf("CmdCheck (shim): %v", err) return logging.Errorf("CmdCheck (shim): %v", err)
} }
@@ -63,7 +66,7 @@ func CmdCheck(args *skel.CmdArgs) error {
// CmdDel implements the CNI spec DEL command handler // CmdDel implements the CNI spec DEL command handler
func CmdDel(args *skel.CmdArgs) error { func CmdDel(args *skel.CmdArgs) error {
_, _, err := postRequest(args) _, _, err := postRequest(args, CheckAPIReadyNow)
if err != nil { if err != nil {
// No error in DEL (as of CNI spec) // No error in DEL (as of CNI spec)
logging.Errorf("CmdDel (shim): %v", err) logging.Errorf("CmdDel (shim): %v", err)
@@ -71,14 +74,14 @@ func CmdDel(args *skel.CmdArgs) error {
return nil return nil
} }
func postRequest(args *skel.CmdArgs) (*Response, string, error) { func postRequest(args *skel.CmdArgs, readinessCheck APIReadyCheckFunc) (*Response, string, error) {
multusShimConfig, err := shimConfig(args.StdinData) multusShimConfig, err := shimConfig(args.StdinData)
if err != nil { if err != nil {
return nil, "", fmt.Errorf("invalid CNI configuration passed to multus-shim: %w", err) return nil, "", fmt.Errorf("invalid CNI configuration passed to multus-shim: %w", err)
} }
// check API readiness // Execute the readiness check as necessary (e.g. don't wait on CNI DEL)
if err := WaitUntilAPIReady(multusShimConfig.MultusSocketDir); err != nil { if err := readinessCheck(multusShimConfig.MultusSocketDir); err != nil {
return nil, multusShimConfig.CNIVersion, err return nil, multusShimConfig.CNIVersion, err
} }