Commit Graph

3106 Commits

Author SHA1 Message Date
Derek McGowan
c9dd974c27
Add parent directories to tar
Alternate solution which better accounts for hard links.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-01-02 16:01:31 -08:00
Michael Crosby
e479165a38
Merge pull request #1903 from darrenstahlmsft/ArchiveOpts
Implement Archive.apply on Windows
2018-01-02 16:08:36 -05:00
Stephen Day
d8cf1f5120
Merge pull request #1945 from dmcgowan/nanosecond-time-and
fs: update nanosecond diff comparison
2018-01-02 11:06:54 -08:00
Kenfe-Mickaël Laventure
3fa104f843
Merge pull request #1930 from crosbymichael/proc-exists
Check that process exists before it is returned
2017-12-27 13:05:47 -08:00
Derek McGowan
88d59d37fa
Update nanosecond diff comparison
Only check content of files if both files have zero nanosecond times.
A zero nanosecond time is considered ambiguous as to whether or
not the timestamp has been truncated by tar. Previously the diff
algorithm was attempting to account for comparisons from a source
to a directory with an applied tar. This condition is no longer
relevant since there is no support for recreating tars directories
which have had a tar extracted. In the case where the older directory
has a truncated timestamp and the newer one does not, this may always
be considered a change. In the case where both are zero, treat the
timestamp as ambiguous and compare content.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-12-26 14:17:03 -08:00
Michael Crosby
c6b8e57bad Only lock on map get for process state
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-12-21 13:03:51 -05:00
Michael Crosby
8e598fcb21 Check that process exists before it is returned
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-12-21 13:03:51 -05:00
Michael Crosby
c07ede497d
Merge pull request #1940 from schomatis/fix-io-testnewattach-race
Fix race condition in IO test (TestNewAttach)
2017-12-21 13:00:45 -05:00
Phil Estes
634a0e8008
Merge pull request #1939 from schomatis/update-getting-started-stdio
Update getting-started guide with the new IO implementation
2017-12-21 12:58:44 -05:00
Lucas Molas
eda50b1fa6 Fix race condition in IO test (TestNewAttach)
Signed-off-by: Lucas Molas <lmolas@fundacionsadosky.org.ar>
2017-12-21 13:54:22 -03:00
Lucas Molas
f61f60e01e Update getting-started guide with the new stdio implementation
Signed-off-by: Lucas Molas <lmolas@fundacionsadosky.org.ar>
2017-12-21 13:15:53 -03:00
Phil Estes
3affaff67b
Merge pull request #1937 from schomatis/add-native-build-i-option
Add go build option '-i' only for native builds
2017-12-20 23:40:18 -05:00
Lucas Molas
55b5e356de Added go build option '-i' only for native builds
Signed-off-by: Lucas Molas <lmolas@fundacionsadosky.org.ar>
2017-12-20 17:00:47 -03:00
Kenfe-Mickaël Laventure
cd05decbe2
Merge pull request #1936 from kolyshkin/netgo
BUILDING.md: add netgo for static build
2017-12-20 08:46:07 -08:00
Kir Kolyshkin
efc5df5773 BUILDING.md: add netgo for static build
When compiling containerd binaries statically, linker rightfully
complains:

```
+ make BUILDTAGS=static_build 'EXTRA_FLAGS=-buildmode pie'
'EXTRA_LDFLAGS=-extldflags "-fno-PIC -static"'
🇩 bin/ctr
/tmp/go-link-343047789/000000.o: In function
`_cgo_b0c710f30cfd_C2func_getaddrinfo':
/tmp/go-build/net/_obj/cgo-gcc-prolog:46: warning: Using 'getaddrinfo'
in statically linked applications requires at runtime the shared
libraries from the glibc version used for linking
```

The same error appears for ctr, containerd, and containerd-stress
binaries.

The fix is to use Go's own DNS resolver functions, rather than
glibc's getaddrinfo() -- this option is turned on by `netgo` build
tag.

See https://golang.org/pkg/net/ (look for "Name Resolution") for
more details.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2017-12-19 18:16:45 -08:00
Michael Crosby
1a560540b9
Merge pull request #1811 from dnephin/trim-makefile
Move install of dev tools from Makefile to a script
2017-12-18 16:56:29 -05:00
Daniel Nephin
cc9216c1dd Remove go install from Makefile
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2017-12-18 11:17:24 -05:00
Kenfe-Mickaël Laventure
a921fb65ad
Merge pull request #1904 from dnephin/less-verbose-ci
Less verbose CI output
2017-12-15 16:13:57 -08:00
Derek McGowan
984824d489
Merge pull request #1926 from crosbymichael/ctr-help
Change ctr help for mount from dest to dst
2017-12-15 14:38:20 -08:00
Michael Crosby
9bb2a6f769
Merge pull request #1900 from yanxuean/filter
add and refactor testcase for exchange
2017-12-15 17:35:13 -05:00
Daniel Nephin
274ce69f93 Less verbose build output
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2017-12-15 16:41:28 -05:00
Michael Crosby
399e3c57c3 Change ctr help for mount from dest to dst
dest is not valid, only destination and dst

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-12-15 16:40:25 -05:00
Phil Estes
71d1e55ca3
Merge pull request #1925 from dmcgowan/parent-directory-inclusion
Fix parent directories not included in tar
2017-12-15 15:51:29 -05:00
Derek McGowan
d4317a1b0d
Fix parent directories not included in tar
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-12-15 12:04:47 -08:00
Phil Estes
afbbe43745
Merge pull request #1895 from dnephin/refactor-cio
Refactor cio package
2017-12-15 14:44:44 -05:00
Phil Estes
f33f49e30f
Merge pull request #1924 from crosbymichael/fix-gauge
Fix gauge constant
2017-12-15 14:36:20 -05:00
Darren Stahl
c195ebb3e2 Implement archive.Apply on Windows
Signed-off-by: Darren Stahl <darst@microsoft.com>
2017-12-15 11:33:03 -08:00
Michael Crosby
0b318b476a Fix gauge constant
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-12-15 14:20:34 -05:00
Phil Estes
5956e152d5
Merge pull request #1923 from crosbymichael/stress-size
Add binary sizes to stress test metrics
2017-12-15 13:19:20 -05:00
Michael Crosby
0725b60402 Add binary sizes to stress test metrics
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-12-15 12:49:59 -05:00
Phil Estes
00bc24fcea
Merge pull request #1917 from dnephin/less-verbose-tests
Less verbose test suite
2017-12-15 12:23:49 -05:00
Phil Estes
7c37625af4
Merge pull request #1914 from stevvooe/stabilize-snapshot-tree-output
cmd/ctr: stablize output of snapshot tree
2017-12-15 12:22:26 -05:00
Kenfe-Mickaël Laventure
05537b0d82
Merge pull request #1922 from crosbymichael/bump-runc
Update runc to 7f24b40cc5423969b4554ef04ba0b00e2
2017-12-15 08:59:33 -08:00
Michael Crosby
a0f7bbb103 Update runc to 7f24b40cc5423969b4554ef04ba0b00e2
This includes fixes for file joining and apparmor without cgo.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-12-15 11:30:22 -05:00
Akihiro Suda
fad72b6ae4
Merge pull request #1910 from crosbymichael/stress-json
Add metrics endpoint to stress test tool
2017-12-15 19:00:17 +09:00
Phil Estes
5971d369e0
Merge pull request #1916 from dnephin/fix-pull-after-failure
Fix image pull after a failure
2017-12-14 14:54:04 -05:00
Michael Crosby
10ef7f37c7
Merge pull request #1912 from clnperez/threshold-test
check for threshold, not range
2017-12-14 14:53:45 -05:00
Daniel Nephin
49fffe8ec7 Less verbose tests
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2017-12-14 11:00:40 -05:00
Daniel Nephin
9184908075 Fix image pull after a failure
When resuming from a failed pull writer.Truncate() was not
seeking to the proper position in the file. This caused writes to
happen after the previously written content, instead of at the start
of the file.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2017-12-13 18:24:12 -05:00
Michael Crosby
6ae0f5f7e2 Add error metric for stress tests
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-12-13 13:15:07 -05:00
yason
224417aab7 add testcase for event.exchange and refactor
Signed-off-by: yason <yan.xuean@zte.com.cn>
2017-12-13 12:15:50 +08:00
Stephen J Day
9aeeefae55
cmd/ctr: stablize output of snapshot tree
Preserves the order of the tree output between each execution. Slightly
refactored the behavior to be more "object oriented".

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-12-12 14:50:05 -08:00
Daniel Nephin
f34d030178 Add unit test for cio
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2017-12-12 16:52:16 -05:00
Christy Perez
1607a9e0ca check for threshold, not range
This test seems to fall apart on a loaded system. In actuality it
doesn't seem to be testing for a threshold, but a "sane" range.

Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
2017-12-12 15:52:11 -06:00
Michael Crosby
652e078078 Add commit to stress metric
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-12-12 14:14:39 -05:00
Michael Crosby
4d55298aab Add prom timer to stress
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-12-12 14:05:14 -05:00
Phil Estes
03bc5e974d
Merge pull request #1906 from stevvooe/change-on-oom-failure
server: only warn on failed OOM score adjust
2017-12-12 11:09:59 -05:00
Michael Crosby
cb423f8360
Merge pull request #1907 from Random-Liu/fix-deadlock
Fix a containerd deadlock.
2017-12-12 10:38:19 -05:00
Lantao Liu
0eebf9051b Fix containerd deadlock.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-12-12 01:45:14 +00:00
Stephen J Day
af5d03e8e9
server: only warn on failed OOM score adjust
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-12-11 14:32:56 -08:00