github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #22453 from dchen1107/test1 

Enable --log-level=info for docker daemons for scalability jenkins jo…
pull/6/head
Jeff Lowdermilk 2016-03-03 16:29:34 -08:00
parent afa7816c38 84689a7a69
commit 7215860ecd
5 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cluster/common.sh
View File

@ -528,6 +528,11 @@ EOF
if [ -n "${KUBELET_TEST_LOG_LEVEL:-}" ]; then if [ -n "${KUBELET_TEST_LOG_LEVEL:-}" ]; then
cat >>$file <<EOF cat >>$file <<EOF
KUBELET_TEST_LOG_LEVEL: $(yaml-quote ${KUBELET_TEST_LOG_LEVEL}) 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 EOF
fi fi
if [ -n "${ENABLE_CUSTOM_METRICS:-}" ]; then if [ -n "${ENABLE_CUSTOM_METRICS:-}" ]; then

1
cluster/gce/config-test.sh
View File

@ -69,6 +69,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. # 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}" TEST_CLUSTER_LOG_LEVEL="${TEST_CLUSTER_LOG_LEVEL:---v=4}"
KUBELET_TEST_LOG_LEVEL="${KUBELET_TEST_LOG_LEVEL:-$TEST_CLUSTER_LOG_LEVEL}" 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}" 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}" 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}" SCHEDULER_TEST_LOG_LEVEL="${SCHEDULER_TEST_LOG_LEVEL:-$TEST_CLUSTER_LOG_LEVEL}"

5
cluster/gce/configure-vm.sh
View File

@ -464,6 +464,11 @@ EOF
if [ -n "${KUBELET_TEST_LOG_LEVEL:-}" ]; then if [ -n "${KUBELET_TEST_LOG_LEVEL:-}" ]; then
cat <<EOF >>/srv/salt-overlay/pillar/cluster-params.sls cat <<EOF >>/srv/salt-overlay/pillar/cluster-params.sls
kubelet_test_log_level: '$(echo "$KUBELET_TEST_LOG_LEVEL" | sed -e "s/'/''/g")' 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 EOF
fi fi
if [ -n "${CONTROLLER_MANAGER_TEST_ARGS:-}" ]; then if [ -n "${CONTROLLER_MANAGER_TEST_ARGS:-}" ]; then

6
cluster/saltbase/salt/docker/docker-defaults
View File

@ -7,5 +7,9 @@
{% if pillar.get('network_provider', '').lower() == 'kubenet' %} {% if pillar.get('network_provider', '').lower() == 'kubenet' %}
{% set bridge_opts = "" %} {% set bridge_opts = "" %}
{% endif -%} {% endif -%}
DOCKER_OPTS="{{grains_opts}} {{e2e_opts}} {{bridge_opts}} --iptables=false --ip-masq=false --log-level=warn" {% set log_level = pillar['log_level'] -%}
{% 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 DOCKER_NOFILE=1000000

2
hack/jenkins/job-configs/kubernetes-e2e.yaml
View File

@ -146,6 +146,8 @@
export REGISTER_MASTER="true" export REGISTER_MASTER="true"
# Reduce logs verbosity # Reduce logs verbosity
export TEST_CLUSTER_LOG_LEVEL="--v=2" export TEST_CLUSTER_LOG_LEVEL="--v=2"
# TODO: Remove when we figure out #22166 and other docker potential slowness
export DOCKER_TEST_LOG_LEVEL="--log-level=info"
# TODO: Remove when we figure out the reason for occasional failures #19048 # TODO: Remove when we figure out the reason for occasional failures #19048
export KUBELET_TEST_LOG_LEVEL="--v=4" export KUBELET_TEST_LOG_LEVEL="--v=4"
# Increase resync period to simulate production # Increase resync period to simulate production