From 97167ccddd96ea73f9d02884ccbf0c1dde5f7f15 Mon Sep 17 00:00:00 2001 From: Francesco Giudici Date: Mon, 27 Sep 2021 15:48:32 +0200 Subject: [PATCH] runtime: rename GetSanboxesStoragePath() --> GetSandboxesStoragePath() Add the missing 'd'. Fixes: #2738 Suggested-by: Jakob Naucke Signed-off-by: Francesco Giudici (cherry picked from commit 315295e0ef9c18eb3b1d42877dc33ac01abeef70) --- src/runtime/containerd-shim-v2/shim_management.go | 4 ++-- src/runtime/pkg/kata-monitor/shim_client.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/runtime/containerd-shim-v2/shim_management.go b/src/runtime/containerd-shim-v2/shim_management.go index 05b228300..81d938043 100644 --- a/src/runtime/containerd-shim-v2/shim_management.go +++ b/src/runtime/containerd-shim-v2/shim_management.go @@ -184,12 +184,12 @@ func (s *service) mountPprofHandle(m *http.ServeMux, ociSpec *specs.Spec) { } // GetSandboxesStoragePath returns the storage path where sandboxes info are stored -func GetSanboxesStoragePath() string { +func GetSandboxesStoragePath() string { return filepath.Join(string(filepath.Separator), "run", "vc", "sbs") } // SocketAddress returns the address of the unix domain socket for communicating with the // shim management endpoint func SocketAddress(id string) string { - return fmt.Sprintf("unix://%s", filepath.Join(string(filepath.Separator), GetSanboxesStoragePath(), id, "shim-monitor.sock")) + return fmt.Sprintf("unix://%s", filepath.Join(string(filepath.Separator), GetSandboxesStoragePath(), id, "shim-monitor.sock")) } diff --git a/src/runtime/pkg/kata-monitor/shim_client.go b/src/runtime/pkg/kata-monitor/shim_client.go index cbcfb9761..c7f0f5d96 100644 --- a/src/runtime/pkg/kata-monitor/shim_client.go +++ b/src/runtime/pkg/kata-monitor/shim_client.go @@ -39,7 +39,7 @@ func getSandboxIDFromReq(r *http.Request) (string, error) { } func getSandboxFS() string { - return shim.GetSanboxesStoragePath() + return shim.GetSandboxesStoragePath() } func checkSandboxFSExists(sandboxID string) bool {