Skip to content

Commit

Permalink
Changed how lastHeartBeatTime works in the etcd condition
Browse files Browse the repository at this point in the history
Signed-off-by: Vitor Savian <vitor.savian@suse.com>
  • Loading branch information
vitorsavian committed Feb 7, 2024
1 parent 358c4d6 commit f9ee66f
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion pkg/etcd/etcd.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ const (
// other defaults from k8s.io/apiserver/pkg/storage/storagebackend/factory/etcd3.go
defaultKeepAliveTime = 30 * time.Second
defaultKeepAliveTimeout = 10 * time.Second
heartbeatInterval = 5 * time.Minute

maxBackupRetention = 5

Expand Down Expand Up @@ -1251,8 +1252,17 @@ func (e *ETCD) setEtcdStatusCondition(node *v1.Node, client kubernetes.Interface
}

if find, condition := nodeUtil.GetNodeCondition(&node.Status, etcdStatusType); find >= 0 {
if condition.Status == newCondition.Status && memberStatus != StatusUnjoined {

// if the condition is not changing, we only want to update the last heartbeat time
if condition.Status == newCondition.Status && condition.Reason == newCondition.Reason && condition.Message == newCondition.Message {
logrus.Debugf("Node %s is not changing etcd status condition", memberName)

// If the condition status is not changing, we only want to update the last heartbeat time if the
// LastHeartbeatTime is older than the heartbeatTimeout.
if metav1.Now().Sub(condition.LastHeartbeatTime.Time) < heartbeatInterval {
return nil
}

condition.LastHeartbeatTime = metav1.Now()
return nodeHelper.SetNodeCondition(client, types.NodeName(node.Name), *condition)
}
Expand Down

0 comments on commit f9ee66f

Please sign in to comment.