enable etcd logging in local-e2e jobs

We are not saving the etcd logs and just redirecting the output to /dev/null. In this change, we set ETCD_LOGFILE to the same directory where we log other kube relates processes. Change-Id: I719a941665b749b864f2efdcdfc7ddc7b2a61776

enable etcd logging in local-e2e jobs
d98c21e9 · Davanum Srinivas · 2ffbaa13 · d98c21e9 · d98c21e9
Unverified Commit d98c21e9 authored Jul 27, 2018 by Davanum Srinivas
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

etcd.sh hack/lib/etcd.sh +1 -1

local-up-cluster.sh hack/local-up-cluster.sh +1 -0

No files found.
--- a/hack/lib/etcd.sh
+++ b/hack/lib/etcd.sh
@@ -71,7 +71,7 @@ kube::etcd::start() {
  if [[ -d "${ARTIFACTS_DIR:-}" ]]; then
    ETCD_LOGFILE="${ARTIFACTS_DIR}/etcd.$(uname -n).$(id -un).log.DEBUG.$(date +%Y%m%d-%H%M%S).$$"
  else
-    ETCD_LOGFILE=/dev/null
+    ETCD_LOGFILE=${ETCD_LOGFILE:-"/dev/null"}
  fi
  kube::log::info "etcd --advertise-client-urls http://${ETCD_HOST}:${ETCD_PORT} --data-dir ${ETCD_DIR} --listen-client-urls http://${ETCD_HOST}:${ETCD_PORT} --debug > \"${ETCD_LOGFILE}\" 2>/dev/null"
  etcd --advertise-client-urls http://${ETCD_HOST}:${ETCD_PORT} --data-dir ${ETCD_DIR} --listen-client-urls http://${ETCD_HOST}:${ETCD_PORT} --debug 2> "${ETCD_LOGFILE}" >/dev/null &

--- a/hack/local-up-cluster.sh
+++ b/hack/local-up-cluster.sh
@@ -445,6 +445,7 @@ function warning_log {
 function start_etcd {
    echo "Starting etcd"
+    ETCD_LOGFILE=${LOG_DIR}/etcd.log
    kube::etcd::start
 }