From fd10ca2f45611b04aef316af5fc05d913a6757fa Mon Sep 17 00:00:00 2001
From: Dawn Chen <dawnchen@google.com>
Date: Fri, 4 Mar 2016 11:47:50 -0800
Subject: [PATCH] Enable --log-level=info for docker daemons for jenkins jobs
 and e2e tests except soak-continuous.

---
 cluster/common.sh                                           | 5 +++++
 cluster/gce/config-test.sh                                  | 1 +
 cluster/gce/configure-vm.sh                                 | 5 +++++
 cluster/saltbase/salt/docker/docker-defaults                | 6 +++++-
 .../job-configs/kubernetes-jenkins/kubernetes-soak.yaml     | 2 ++
 5 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/cluster/common.sh b/cluster/common.sh
index cef36f1d6b..77e4fe0074 100755
--- a/cluster/common.sh
+++ b/cluster/common.sh
@@ -537,6 +537,11 @@ EOF
   if [ -n "${KUBELET_TEST_LOG_LEVEL:-}" ]; then
       cat >>$file <<EOF
 KUBELET_TEST_LOG_LEVEL: $(yaml-quote ${KUBELET_TEST_LOG_LEVEL})
+EOF
+  fi
+  if [ -n "${DOCKER_TEST_LOG_LEVEL:-}" ]; then
+      cat >>$file <<EOF
+DOCKER_TEST_LOG_LEVEL: $(yaml-quote ${DOCKER_TEST_LOG_LEVEL})
 EOF
   fi
   if [ -n "${ENABLE_CUSTOM_METRICS:-}" ]; then
diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh
index 27a9342682..1db2aa0fea 100755
--- a/cluster/gce/config-test.sh
+++ b/cluster/gce/config-test.sh
@@ -76,6 +76,7 @@ ENABLE_CLUSTER_MONITORING="${KUBE_ENABLE_CLUSTER_MONITORING:-influxdb}"
 # Default Log level for all components in test clusters and variables to override it in specific components.
 TEST_CLUSTER_LOG_LEVEL="${TEST_CLUSTER_LOG_LEVEL:---v=4}"
 KUBELET_TEST_LOG_LEVEL="${KUBELET_TEST_LOG_LEVEL:-$TEST_CLUSTER_LOG_LEVEL}"
+DOCKER_TEST_LOG_LEVEL="${DOCKER_TEST_LOG_LEVEL:---log-level=info}"
 API_SERVER_TEST_LOG_LEVEL="${API_SERVER_TEST_LOG_LEVEL:-$TEST_CLUSTER_LOG_LEVEL}"
 CONTROLLER_MANAGER_TEST_LOG_LEVEL="${CONTROLLER_MANAGER_TEST_LOG_LEVEL:-$TEST_CLUSTER_LOG_LEVEL}"
 SCHEDULER_TEST_LOG_LEVEL="${SCHEDULER_TEST_LOG_LEVEL:-$TEST_CLUSTER_LOG_LEVEL}"
diff --git a/cluster/gce/configure-vm.sh b/cluster/gce/configure-vm.sh
index f7724a04c8..7eb6620f96 100755
--- a/cluster/gce/configure-vm.sh
+++ b/cluster/gce/configure-vm.sh
@@ -464,6 +464,11 @@ EOF
     if [ -n "${KUBELET_TEST_LOG_LEVEL:-}" ]; then
       cat <<EOF >>/srv/salt-overlay/pillar/cluster-params.sls
 kubelet_test_log_level: '$(echo "$KUBELET_TEST_LOG_LEVEL" | sed -e "s/'/''/g")'
+EOF
+    fi
+    if [ -n "${DOCKER_TEST_LOG_LEVEL:-}" ]; then
+      cat <<EOF >>/srv/salt-overlay/pillar/cluster-params.sls
+docker_test_log_level: '$(echo "$DOCKER_TEST_LOG_LEVEL" | sed -e "s/'/''/g")'
 EOF
     fi
     if [ -n "${CONTROLLER_MANAGER_TEST_ARGS:-}" ]; then
diff --git a/cluster/saltbase/salt/docker/docker-defaults b/cluster/saltbase/salt/docker/docker-defaults
index 5b97c16d6a..2eee8d74b1 100644
--- a/cluster/saltbase/salt/docker/docker-defaults
+++ b/cluster/saltbase/salt/docker/docker-defaults
@@ -7,5 +7,9 @@
 {% if pillar.get('network_provider', '').lower() == 'kubenet' %}
   {% set bridge_opts = "" %}
 {% endif -%}
-DOCKER_OPTS="{{grains_opts}} {{e2e_opts}} {{bridge_opts}} --iptables=false --ip-masq=false --log-level=warn"
+{% set log_level = "--log-level=warn" -%}
+{% if pillar['docker_test_log_level'] is defined -%}
+  {% set log_level = pillar['docker_test_log_level'] -%}
+{% endif -%}
+DOCKER_OPTS="{{grains_opts}} {{e2e_opts}} {{bridge_opts}} --iptables=false --ip-masq=false {{log_level}}"
 DOCKER_NOFILE=1000000
diff --git a/hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-soak.yaml b/hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-soak.yaml
index 4de7187db7..cb23967ba7 100644
--- a/hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-soak.yaml
+++ b/hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-soak.yaml
@@ -80,6 +80,8 @@
         export E2E_DOWN="false"
         # Clear out any orphaned namespaces in case previous run was interrupted.
         export E2E_CLEAN_START="true"
+        # TODO: Remove when we figure out #22166 and other docker potential slowness.
+        export DOCKER_TEST_LOG_LEVEL="--log-level=warn"
         # We should be testing the reliability of a long-running cluster. The
         # [Disruptive] tests kill/restart components or nodes in the cluster,
         # defeating the purpose of a soak cluster. (#15722)