Browse Source

Merge pull request #12277 from roidelapluie/restore-main

Revert type casting removal
pull/12285/head
Julien Pivotto 2 years ago committed by GitHub
parent
commit
388eb03923
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      util/runtime/limits_default.go

4
util/runtime/limits_default.go

@ -39,7 +39,9 @@ func getLimits(resource int, unit string) string {
if err != nil { if err != nil {
panic("syscall.Getrlimit failed: " + err.Error()) panic("syscall.Getrlimit failed: " + err.Error())
} }
return fmt.Sprintf("(soft=%s, hard=%s)", limitToString(rlimit.Cur, unit), limitToString(rlimit.Max, unit)) // rlimit.Cur and rlimit.Max are int64 on some platforms, such as dragonfly.
// We need to cast them explicitly to uint64.
return fmt.Sprintf("(soft=%s, hard=%s)", limitToString(uint64(rlimit.Cur), unit), limitToString(uint64(rlimit.Max), unit)) //nolint:unconvert
} }
// FdLimits returns the soft and hard limits for file descriptors. // FdLimits returns the soft and hard limits for file descriptors.

Loading…
Cancel
Save