github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 01:06:27 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Kubernetes Submit Queue 2017-02-09 14:27:47 -08:00 committed by GitHub
commit 2bd777e9de
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hack/lib/etcd.sh
View File

@ -28,8 +28,8 @@ kube::etcd::validate() {
} }
# validate it is not running # validate it is not running
if pgrep etcd >/dev/null 2>&1; then if pgrep -x 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)." 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." kube::log::usage "retry after you resolve this etcd error."
exit 1 exit 1
fi fi