kubernetes

mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-04 15:05:20 +00:00

Files

Kubernetes Submit Queue 0955f3602e Merge pull request #50381 from sczizzo/bugfix-issue-47800

Automatic merge from submit-queue (batch tested with PRs 50381, 51307, 49645, 50995, 51523)

Bugfix: Use local JSON log buffer in parseDockerJSONLog.

**What this PR does / why we need it**:
The issue described in #47800 is due to a race condition in `ReadLogs`: Because the JSON log buffer (`dockerJSONLog`) is package-scoped, any two goroutines modifying the buffer could race and overwrite the other's changes. In particular, one goroutine could unmarshal a JSON log line into the buffer, then another goroutine could `Reset()` the buffer, and the resulting `Stream` would be empty (`""`). This empty `Stream` is caught in a `case` block and raises an `unexpected stream type` error.

This PR creates a new buffer for each execution of `parseDockerJSONLog`, so each goroutine is guaranteed to have a local instance of the buffer.

**Which issue this PR fixes**: fixes #47800

**Release note**:
```release-note
Fixed an issue (#47800) where `kubectl logs -f` failed with `unexpected stream type ""`.
```

2017-09-01 16:33:56 -07:00

BUILD

Revert "CPU manager wiring and none policy"

2017-09-01 18:17:36 +02:00

doc.go

cmd/kubelet

2016-11-23 15:53:09 -08:00

fake_kuberuntime_manager.go

Revert "CPU manager wiring and none policy"

2017-09-01 18:17:36 +02:00

helpers_test.go

follow our go code style: error->err