toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge component 'engine' from git@github.com:moby/moby master

Browse Source
This commit is contained in:
GordonTheTurtle
2018-05-18 17:06:57 +00:00
parent f2fa4c2c77 1bbbe71c5b
commit 3aa2f160d0
9 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/engine/api/swagger.yaml
View File

@ -5095,9 +5095,9 @@ paths:
This endpoint returns a live stream of a container’s resource usage
statistics.
The `precpu_stats` is the CPU statistic of last read, which is used
for calculating the CPU usage percentage. It is not the same as the
`cpu_stats` field.
The `precpu_stats` is the CPU statistic of the *previous* read, and is
used to calculate the CPU usage percentage. It is not an exact copy
of the `cpu_stats` field.
If either `precpu_stats.online_cpus` or `cpu_stats.online_cpus` is
nil then for compatibility with older daemons the length of the

2
components/engine/daemon/logger/ring.go
View File

@ -150,7 +150,7 @@ func newRing(maxBytes int64) *messageRing {
}
// Enqueue adds a message to the buffer queue
// If the message is too big for the buffer it drops the oldest messages to make room
// If the message is too big for the buffer it drops the new message.
// If there are no messages in the queue and the message is still too big, it adds the message anyway.
func (r *messageRing) Enqueue(m *Message) error {
mSize := int64(len(m.Line))

2
components/engine/daemon/logger/ring_test.go
View File

@ -58,7 +58,7 @@ func TestRingCap(t *testing.T) {
}
}
// should have messages in the queue for "5" to "10"
// should have messages in the queue for "0" to "4"
for i := 0; i < 5; i++ {
m, err := r.Dequeue()
if err != nil {

2
components/engine/docs/api/v1.19.md
View File

@ -739,7 +739,7 @@ This endpoint returns a live stream of a container's resource usage statistics.
}
}
The `precpu_stats` is the cpu statistic of last read, which is used for calculating the cpu usage percent. It is not the exact copy of the `cpu_stats` field.
The `precpu_stats` is the cpu statistic of *previous* read, which is used for calculating the cpu usage percent. It is not the exact copy of the `cpu_stats` field.
**Query parameters**:

2
components/engine/docs/api/v1.20.md
View File

@ -748,7 +748,7 @@ This endpoint returns a live stream of a container's resource usage statistics.
}
}
The `precpu_stats` is the cpu statistic of last read, which is used for calculating the cpu usage percent. It is not the exact copy of the `cpu_stats` field.
The `precpu_stats` is the cpu statistic of *previous* read, which is used for calculating the cpu usage percent. It is not the exact copy of the `cpu_stats` field.
**Query parameters**:

2
components/engine/docs/api/v1.21.md
View File

@ -829,7 +829,7 @@ This endpoint returns a live stream of a container's resource usage statistics.
}
}
The `precpu_stats` is the cpu statistic of last read, which is used for calculating the cpu usage percent. It is not the exact copy of the `cpu_stats` field.
The `precpu_stats` is the cpu statistic of *previous* read, which is used for calculating the cpu usage percent. It is not the exact copy of the `cpu_stats` field.
**Query parameters**:

2
components/engine/docs/api/v1.22.md
View File

@ -957,7 +957,7 @@ This endpoint returns a live stream of a container's resource usage statistics.
}
}
The `precpu_stats` is the cpu statistic of last read, which is used for calculating the cpu usage percent. It is not the exact copy of the `cpu_stats` field.
The `precpu_stats` is the cpu statistic of *previous* read, which is used for calculating the cpu usage percent. It is not the exact copy of the `cpu_stats` field.
**Query parameters**:

2
components/engine/docs/api/v1.23.md
View File

@ -986,7 +986,7 @@ This endpoint returns a live stream of a container's resource usage statistics.
}
}
The `precpu_stats` is the cpu statistic of last read, which is used for calculating the cpu usage percent. It is not the exact copy of the `cpu_stats` field.
The `precpu_stats` is the cpu statistic of *previous* read, which is used for calculating the cpu usage percent. It is not the exact copy of the `cpu_stats` field.
**Query parameters**:

2
components/engine/docs/api/v1.24.md
View File

@ -1036,7 +1036,7 @@ This endpoint returns a live stream of a container's resource usage statistics.
}
}
The `precpu_stats` is the cpu statistic of last read, which is used for calculating the cpu usage percent. It is not the exact copy of the `cpu_stats` field.
The `precpu_stats` is the cpu statistic of *previous* read, which is used for calculating the cpu usage percent. It is not the exact copy of the `cpu_stats` field.
**Query parameters**: