Merge pull request #40502 from alindeman/etcd-false-positive

Automatic merge from submit-queue (batch tested with PRs 41121, 40048, 40502, 41136, 40759) Match etcd process name exactly A process named, e.g., etcd-operator, should not match **What this PR does / why we need it**: Matches etcd process name exactly **Which issue this PR fixes**: fixes #40499 **Special notes for your reviewer**: 👀 @lavalamp

Merge pull request #40502 from alindeman/etcd-false-positive
2bd777e9 · Kubernetes Submit Queue · GitHub · b7772e4f · 79d28389 · 2bd777e9
Commit 2bd777e9 authored Feb 09, 2017 by Kubernetes Submit Queue Committed by GitHub Feb 09, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

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

No files found.
--- a/hack/lib/etcd.sh
+++ b/hack/lib/etcd.sh
@@ -28,8 +28,8 @@ kube::etcd::validate() {
  }

  # validate it is not running
-  if pgrep etcd >/dev/null 2>&1; then
-    kube::log::usage "etcd appears to already be running on this machine (`pgrep -l etcd`) (or its a zombie and you need to kill its parent)."
+  if pgrep -x etcd >/dev/null 2>&1; then
+    kube::log::usage "etcd appears to already be running on this machine (`pgrep -xl etcd`) (or its a zombie and you need to kill its parent)."
    kube::log::usage "retry after you resolve this etcd error."
    exit 1
  fi