Peng Tao
0a5315b1c6
Merge pull request #2283 from tedyu/rm-pause-resume
...
vc: Drop Sandbox#Pause and Sandbox#Resume
2019-12-02 13:19:15 +08:00
Peng Tao
450a646afd
Merge pull request #2290 from tedyu/get-container
...
vc: Use map built-in accessor to find container in Sandbox#GetContainer
2019-12-02 10:29:44 +08:00
Peng Tao
e49569a286
Merge pull request #2287 from devimc/topic/make/FixSuspiciousLine
...
Makefile: fix suspicious line
2019-12-02 10:29:20 +08:00
Ted Yu
bec46bb59b
vc: Use map to represent ignoredMounts
...
We can use map from Source to Mount as ignoredMounts representation.
Inner loop in kataAgent#removeIgnoredOCIMount is removed.
Fixes #2299
Signed-off-by: Ted Yu yuzhihong@gmail.com
2019-11-30 12:36:27 -08:00
Ted Yu
628799a42f
vc: Check return value from os.MkdirAll in virtiofsdArgs
...
Fixes #2297
Signed-off-by: Ted Yu yuzhihong@gmail.com
2019-11-30 08:43:23 -08:00
Julio Montes
9dd3f13a92
Makefile: Move the .git-commit: rule block to below the all: rule
...
the first rule defined becomes the default and the default rule should be all.
Signed-off-by: Julio Montes <julio.montes@intel.com>
2019-11-29 15:39:43 +00:00
Julio Montes
7bcce3da63
Makefile: do not use tabs in if/else blocks
...
tabs should only appear in rules, not in ifeq/ifneq blocks
(since otherwise make can get very confused on error).
Signed-off-by: Julio Montes <julio.montes@intel.com>
2019-11-29 15:38:53 +00:00
Ted Yu
38224e8b7b
vc: Use map built-in accessor to find container in Sandbox#GetContainer
...
Fixes #2289
Signed-off-by: Ted Yu <yuzhihong@gmail.com>
2019-11-29 07:17:15 -08:00
Ted Yu
544730b4b1
vc: Drop Sandbox#Pause and Sandbox#Resume
...
Fixes #2276
Signed-off-by: Ted Yu <yuzhihong@gmail.com>
2019-11-29 05:58:06 -08:00
Julio Montes
d4be097b71
Makefile: fix suspicious line
...
Emacs (the good and infalible text editor) detects a suspicious line in
Makefile, this line contains both space and tab (something that could be
introduced by a less sophisticated text editor) that is not correct
for a Makefile.
fixes #2286
Signed-off-by: Julio Montes <julio.montes@intel.com>
2019-11-29 13:49:35 +00:00
Johan Kuijpers
e8cc87b378
clh: basic/unit tests for clh driver
...
- added clh unit tests
- removed some inconsistencies in the cli builder to enable unit tests
- suppressed version check for in startSandbox to enable unit tests
- added clh related constants and methods to virtcontainer test
- small corrections after review applied
Fixes : #2205
Signed-off-by: Johan Kuijpers <johan.kuijpers@ericsson.com>
2019-11-28 10:27:37 +01:00
Eric Ernst
06971246ea
fc: update comments for startSandbox
...
The comment didn't reflect what the function does. Updated accordingly.
Fixes : #2277
Signed-off-by: Eric Ernst <eric.ernst@intel.com>
2019-11-26 15:25:51 -08:00
Archana Shinde
d054556f60
Merge pull request #2251 from devimc/topic/k8s/fixWrongNumberCPUs
...
k8s: fix wrong number cpus after killing a container
2019-11-26 10:12:36 -08:00
Archana Shinde
cc3506403b
Merge pull request #2220 from tedyu/new-mount-map
...
vc: Utilize map for newMounts to speed up replaceOCIMountSource
2019-11-26 09:10:25 -08:00
Penny Zheng
837a0ee0ae
cache-factory: set bridge info when creating vm
...
For now, we will encounter `failed to get available address from
bridges` error when launching kata containers from cache factory.
Although we've already passed bridges info to clients from cache factory
server, we still missed the setting part when creating vm.
Fixes : #2272
Signed-off-by: Penny Zheng <penny.zheng@arm.com>
2019-11-26 00:42:39 -08:00
Penny Zheng
3d8ffe4120
cache-factory: fix nil pointer runtime panic
...
For now, when we're using cache factory to launch kata containers,
we would encounter nil pointer runtime panic.
Fixes : #2272
Signed-off-by: Penny Zheng <penny.zheng@arm.com>
2019-11-26 00:42:12 -08:00
Johan Kuijpers
3ef8f6cf1b
clh: fixes erroneous killing of virtiofsd
...
remove type in kill statement for virtiofsd
Fixes : #2270
Signed-off-by: Johan Kuijpers <johan.kuijpers@ericsson.com>
2019-11-26 09:12:13 +01:00
Johan Kuijpers
6af127f7f9
clh: improve driver logging for failed hypervisor
...
added logging of stdout and stderr for failed hypervisor
Fixes : #2271
Signed-off-by: Johan Kuijpers <johan.kuijpers@ericsson.com>
2019-11-26 09:08:11 +01:00
Eric Ernst
c58e6f973c
kernel: update to 4.19.86
...
Fixes : #2193
Depends-on: github.com/kata-containers/packaging#807
Signed-off-by: Eric Ernst <eric.ernst@intel.com>
2019-11-25 14:10:11 -08:00
Eric Ernst
552e9407b8
Merge pull request #2245 from tedyu/block-index-update
...
vc: Sandbox#getAndSetSandboxBlockIndex shouldn't alter BlockIndex in case of error
2019-11-25 13:19:06 -08:00
Archana Shinde
545d61cbe8
Merge pull request #2253 from devimc/topic/virtcontainers/GetPatchedOCI
...
virtcontainers: rename GetOCISpec to GetPatchedOCISpec
2019-11-25 11:29:58 -08:00
GabyCT
d937c067f2
Merge pull request #2265 from jodh-intel/unbreak-tracing-test
...
tracing: Unbreak tracing test
2019-11-25 13:16:01 -06:00
Julio Montes
b7731e97dd
virtcontainers: don't consider non-running container resources
...
Don't hot add again non-running container resources to avoid having extra
and useless resources
fixes #2186
Signed-off-by: Julio Montes <julio.montes@intel.com>
2019-11-25 18:42:34 +00:00
Julio Montes
43f051313e
virtcontainers: update resources after adding container to sandbox
...
Status of container should know prior to calculate the number of CPU
and memory
Signed-off-by: Julio Montes <julio.montes@intel.com>
2019-11-25 18:42:34 +00:00
Julio Montes
613fd0fb60
virtcontainers: rename GetOCISpec to GetPatchedOCISpec
...
GetOCISpec returns a patched version of the original OCI spec, it was modified
to support:
* capabilities
* Ephemeral storage
* k8s empty dir
In order to avoid consusions and make api clear, rename GetOCISpec
to GetPatchedOCISpec and ContainerConfig.Spec to ContainerConfig.CustomSpec
fixes #2252
Signed-off-by: Julio Montes <julio.montes@intel.com>
2019-11-25 17:22:23 +00:00
James O. D. Hunt
330cc72ef3
tracing: Unbreak tracing test
...
Force Jaeger to log when it reports traces to ensure the tracing test
[1] works as expected.
Fixes : #2264 .
[1] - https://github.com/kata-containers/tests/blob/master/tracing/tracing-test.sh
Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
2019-11-25 16:48:41 +00:00
Julio Montes
dd15db3250
Merge pull request #2261 from teawater/fc_log_debug
...
fc.go: Set firecracker log level to debug if hypervisor.enable_debug …
2019-11-25 10:32:26 -06:00
Peng Tao
35d4cac999
Merge pull request #2257 from devimc/topic/virtcontainers/honourDontSaveSpec
...
virtcontainers: honour ContainerConfig struct comment and don't save OCI spec
2019-11-25 20:41:35 +08:00
Graham Whaley
6727c68005
Merge pull request #2255 from devimc/topic/virtcontainers/useMapSearch
...
virtcontainers: improve algorithm to find containers
2019-11-25 09:29:51 +00:00
Hui Zhu
191ee63750
fc.go: Set fc log level to debug if hypervisor.enable_debug is true
...
Set firecracker log level to debug if hypervisor.enable_debug is true.
Fixes : #2260
Signed-off-by: Hui Zhu <teawater@antfin.com>
2019-11-25 17:08:00 +08:00
Johan Kuijpers
7b8e15f3a7
Merge pull request #3 from kata-containers/master
...
Merge #3 of kata-containers/runtime
2019-11-25 09:37:27 +01:00
Hui Zhu
562d9fd5c2
Merge pull request #2073 from Pennyzct/firecracker_fifo_log
...
FC: extract error info from firecracker built-in log and metrics scheme
2019-11-25 16:15:36 +08:00
Julio Montes
336edf75ea
virtcontainers: honour ContainerConfig struct comment and not save Spec
...
Currently kata-runtime saves the Container OCI Spec even when it's not needed
and a comment in `ContainerConfig struct` specifically indicates that
it won't be saved to disk.
Use '-' as json tag instead of '_' to indicates that `Spec` field shouldn't
be saved to disk.
fixes #2256
Signed-off-by: Julio Montes <julio.montes@intel.com>
2019-11-22 21:16:11 +00:00
Julio Montes
7f67b9f084
virtcontainers: improve algorithm to find containers
...
Do not iterate over a map to find a container, use map built-in
method instead.
fixes #2254
Signed-off-by: Julio Montes <julio.montes@intel.com>
2019-11-22 20:08:37 +00:00
Salvador Fuentes
fea166d8eb
Merge pull request #2250 from devimc/topic/gitignore/addClhToml
...
gitignore: include cloud hypervisor configuration toml
2019-11-22 11:33:34 -06:00
GabyCT
7938cd8965
Merge pull request #2208 from choury/patch-1
...
Respect containerd's debug config
2019-11-22 08:33:34 -06:00
Julio Montes
0ac43558c8
gitignore: include cloud hypervisor configuration toml
...
update .gitignore to include configuration-clh.toml to the list of
untracked files
fixes #2249
Signed-off-by: Julio Montes <julio.montes@intel.com>
2019-11-22 13:39:39 +00:00
Julio Montes
0ff0e54769
Merge pull request #2217 from ericooper/clh-driver-fix-2206
...
Clh driver: removed hard-coded vsock contextid (cid)
2019-11-22 07:23:14 -06:00
Johan Kuijpers
1abe52abd7
clh: removed hard-coded vsock contextid (cid)
...
update after review 2. applied ci static checks
Fixes : #2206
Signed-off-by: Johan Kuijpers <johan.kuijpers@ericsson.com>
2019-11-22 09:35:41 +01:00
Fupan Li
eae8449231
Merge pull request #2242 from tedyu/to-disk-close
...
vc: Persist file handle may leak in FS#ToDisk
2019-11-22 09:12:50 +08:00
Archana Shinde
db696da98b
Merge pull request #2232 from tedyu/rm-persist-dir
...
vc: Clean up directories in case MkdirAll fails
2019-11-21 15:42:23 -08:00
Ted Yu
c833ac2c53
vc: BlockIndex should not be altered in case of error
...
BlockIndex should not increment in case of error.
Similar issue applies to decrementSandboxBlockIndex where the symptom may be more severe - in worst case, the block index may become negative.
Fixes #2244
Signed-off-by: Ted Yu <yuzhihong@gmail.com>
2019-11-21 15:34:35 -08:00
Ted Yu
b8b6733f62
vc: Persist file handle may leak in FS#ToDisk
...
Fixes #2241
Signed-off-by: Ted Yu <yuzhihong@gmail.com>
2019-11-21 12:42:10 -08:00
Julio Montes
a17ca14c7a
Merge pull request #2238 from tedyu/start-sandbox-running
...
vc: Restore sandbox state when there is error starting containers
2019-11-21 13:58:56 -06:00
Julio Montes
3a4025fbf4
Merge pull request #2234 from tedyu/close-cf
...
vc: Persist file handle may leak in FS#FromDisk
2019-11-21 09:38:29 -06:00
Ted Yu
03478d4540
vc: Clean up directories in case MkdirAll fails
...
Fixes #2230
Signed-off-by: Ted Yu <yuzhihong@gmail.com>
2019-11-21 02:27:30 -08:00
choury
51d7c23e41
shim: Respect containerd's debug config
...
There are too many logs from kata shim in containerd's log.
Fixes #2209
Signed-off-by: choury <chouryzhou@tencent.com>
2019-11-21 14:46:29 +08:00
Ted Yu
93a03369ae
vc: Restore sandbox state when there is error starting containers
...
Fixes #2237
Signed-off-by: Ted Yu <yuzhihong@gmail.com>
2019-11-20 18:47:37 -08:00
Archana Shinde
88205cff6d
Merge pull request #2224 from amshinde/1.10.0-alpha1-branch-bump
...
# Kata Containers 1.10.0-alpha1
2019-11-20 12:21:28 -08:00
Eric Ernst
660728fb65
Merge pull request #2229 from amshinde/disable-jailer
...
config: Disable jailer by default for firecracker
2019-11-20 12:14:43 -08:00