Merge pull request #329 from kzys/clean-logs

Declutter logs

Author: kzys

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",

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)

tools/docker/entrypoint.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -ex
+set -e
 
 chmod a+rwx ${FICD_LOG_DIR}
 

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)