mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-30 06:54:01 +00:00
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
This commit is contained in:
commit
2bd777e9de
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user