opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-20 12:43:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #26492 from openshift-cherrypick-robot/cherry-pick-26471-to-v5.5

Browse Source 
[v5.5] fix panic on state refresh
This commit is contained in:
openshift-merge-bot[bot]
2025-06-23 17:33:37 +00:00
committed by GitHub
parent be2b298bee 881d48eae2
commit 90db13c50b
1 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
cmd/podman/root.go
View File

@ -293,6 +293,34 @@ func persistentPreRunE(cmd *cobra.Command, args []string) error {
} }
} }
} }
if cmd.Flag("cpu-profile").Changed {
f, err := os.Create(podmanConfig.CPUProfile)
if err != nil {
return err
}
if err := pprof.StartCPUProfile(f); err != nil {
return err
}
}
if cmd.Flag("memory-profile").Changed {
// Same value as the default in github.com/pkg/profile.
runtime.MemProfileRate = 4096
if rate := os.Getenv("MemProfileRate"); rate != "" {
r, err := strconv.Atoi(rate)
if err != nil {
return err
}
runtime.MemProfileRate = r
}
}
if podmanConfig.MaxWorks <= 0 {
return fmt.Errorf("maximum workers must be set to a positive number (got %d)", podmanConfig.MaxWorks)
}
if err := parallel.SetMaxThreads(uint(podmanConfig.MaxWorks)); err != nil {
return err
}
} }
if err := readRemoteCliFlags(cmd, podmanConfig); err != nil { if err := readRemoteCliFlags(cmd, podmanConfig); err != nil {
@ -346,35 +374,6 @@ func persistentPreRunE(cmd *cobra.Command, args []string) error {
} }
} }
if !registry.IsRemote() {
if cmd.Flag("cpu-profile").Changed {
f, err := os.Create(podmanConfig.CPUProfile)
if err != nil {
return err
}
if err := pprof.StartCPUProfile(f); err != nil {
return err
}
}
if cmd.Flag("memory-profile").Changed {
// Same value as the default in github.com/pkg/profile.
runtime.MemProfileRate = 4096
if rate := os.Getenv("MemProfileRate"); rate != "" {
r, err := strconv.Atoi(rate)
if err != nil {
return err
}
runtime.MemProfileRate = r
}
}
if podmanConfig.MaxWorks <= 0 {
return fmt.Errorf("maximum workers must be set to a positive number (got %d)", podmanConfig.MaxWorks)
}
if err := parallel.SetMaxThreads(uint(podmanConfig.MaxWorks)); err != nil {
return err
}
}
// Setup Rootless environment, IFF: // Setup Rootless environment, IFF:
// 1) in ABI mode // 1) in ABI mode
// 2) running as non-root // 2) running as non-root