github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-16 07:05:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2739 from fgiudici/kata-monitor_improvements3

Browse Source 
kata-monitor (minor) improvements
This commit is contained in:
Chelsea Mafrica 2021-09-27 15:45:21 -07:00 committed by GitHub
commit 0b087a873d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/runtime/pkg/containerd-shim-v2/shim_management.go
View File

@ -184,12 +184,12 @@ func (s *service) mountPprofHandle(m *http.ServeMux, ociSpec *specs.Spec) {
} }
// GetSandboxesStoragePath returns the storage path where sandboxes info are stored // 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") return "/run/vc/sbs"
} }
// SocketAddress returns the address of the unix domain socket for communicating with the // SocketAddress returns the address of the unix domain socket for communicating with the
// shim management endpoint // shim management endpoint
func SocketAddress(id string) string { 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"))
} }

2
src/runtime/pkg/kata-monitor/shim_client.go
View File

@ -40,7 +40,7 @@ func getSandboxIDFromReq(r *http.Request) (string, error) {
} }
func getSandboxFS() string { func getSandboxFS() string {
return shim.GetSanboxesStoragePath() return shim.GetSandboxesStoragePath()
} }
func checkSandboxFSExists(sandboxID string) bool { func checkSandboxFSExists(sandboxID string) bool {