From 257a902696ce188c00395bccf275752adfc55edf Mon Sep 17 00:00:00 2001 From: Kazuyoshi Kato Date: Wed, 13 Nov 2019 13:49:36 -0800 Subject: [PATCH 1/3] Disable colors on systemd ANSI escape sequences in JSON just hurts readability. Signed-off-by: Kazuyoshi Kato --- runtime/integ_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/integ_test.go b/runtime/integ_test.go index 8614a8bec..fc15d3f3b 100644 --- a/runtime/integ_test.go +++ b/runtime/integ_test.go @@ -26,7 +26,7 @@ const runtimeConfigPath = "/etc/containerd/firecracker-runtime.json" var defaultRuntimeConfig = Config{ FirecrackerBinaryPath: "/usr/local/bin/firecracker", KernelImagePath: "/var/lib/firecracker-containerd/runtime/default-vmlinux.bin", - KernelArgs: "ro console=ttyS0 noapic reboot=k panic=1 pci=off nomodules systemd.journald.forward_to_console systemd.unit=firecracker.target init=/sbin/overlay-init", + KernelArgs: "ro console=ttyS0 noapic reboot=k panic=1 pci=off nomodules systemd.journald.forward_to_console systemd.log_color=false systemd.unit=firecracker.target init=/sbin/overlay-init", RootDrive: "/var/lib/firecracker-containerd/runtime/default-rootfs.img", CPUCount: 1, CPUTemplate: "T2", From c4eb079854857d9ce5d1380411fe4e7e2d9a4ce8 Mon Sep 17 00:00:00 2001 From: Kazuyoshi Kato Date: Wed, 13 Nov 2019 14:06:15 -0800 Subject: [PATCH 2/3] Remove set -x to declutter logs Signed-off-by: Kazuyoshi Kato --- tools/docker/entrypoint.sh | 2 +- tools/image-builder/files_debootstrap/sbin/overlay-init | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/docker/entrypoint.sh b/tools/docker/entrypoint.sh index b9266a6a8..38e300b1c 100755 --- a/tools/docker/entrypoint.sh +++ b/tools/docker/entrypoint.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -ex +set -e chmod a+rwx ${FICD_LOG_DIR} diff --git a/tools/image-builder/files_debootstrap/sbin/overlay-init b/tools/image-builder/files_debootstrap/sbin/overlay-init index a27b845d6..f68a22f9b 100755 --- a/tools/image-builder/files_debootstrap/sbin/overlay-init +++ b/tools/image-builder/files_debootstrap/sbin/overlay-init @@ -12,8 +12,6 @@ # express or implied. See the License for the specific language governing # permissions and limitations under the License. -set -x - # Parameters: # 1. rw_root -- path where the read/write root is mounted # 2. work_dir -- path to the overlay workdir (must be on same filesystem as rw_root) From df2d580a6b4df9f67595b9bc7480860dd9d916e5 Mon Sep 17 00:00:00 2001 From: Kazuyoshi Kato Date: Wed, 13 Nov 2019 14:06:58 -0800 Subject: [PATCH 3/3] Log vmID as like other log messages Signed-off-by: Kazuyoshi Kato --- runtime/service.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/service.go b/runtime/service.go index feb62214b..c57273117 100644 --- a/runtime/service.go +++ b/runtime/service.go @@ -328,7 +328,7 @@ func (s *service) StartShim(shimCtx context.Context, containerID, containerdBina log.Info("will start a single-task VM since no VMID has been provided") } else { - log.Info("will start a persistent VM") + log.WithField("vmID", s.vmID).Info("will start a persistent VM") } client, err := ttrpcutil.NewClient(containerdTTRPCAddress)