Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
8fdaa0ea
Commit
8fdaa0ea
authored
Feb 23, 2022
by
Brad Davidson
Committed by
Brad Davidson
Mar 15, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add function to clear local alarms on etcd startup
Signed-off-by:
Brad Davidson
<
brad.davidson@rancher.com
>
(cherry picked from commit
555087b9
)
parent
5a7f5fc9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
46 additions
and
2 deletions
+46
-2
etcd.go
pkg/etcd/etcd.go
+46
-2
No files found.
pkg/etcd/etcd.go
View file @
8fdaa0ea
...
@@ -122,6 +122,7 @@ func (e *ETCD) SetControlConfig(config *config.Control) {
...
@@ -122,6 +122,7 @@ func (e *ETCD) SetControlConfig(config *config.Control) {
// Test ensures that the local node is a voting member of the target cluster.
// Test ensures that the local node is a voting member of the target cluster.
// If it is still a learner or not a part of the cluster, an error is raised.
// If it is still a learner or not a part of the cluster, an error is raised.
// If it has any alarms that cannot be disarmed, an error is raised.
func
(
e
*
ETCD
)
Test
(
ctx
context
.
Context
)
error
{
func
(
e
*
ETCD
)
Test
(
ctx
context
.
Context
)
error
{
ctx
,
cancel
:=
context
.
WithTimeout
(
ctx
,
testTimeout
)
ctx
,
cancel
:=
context
.
WithTimeout
(
ctx
,
testTimeout
)
defer
cancel
()
defer
cancel
()
...
@@ -135,6 +136,10 @@ func (e *ETCD) Test(ctx context.Context) error {
...
@@ -135,6 +136,10 @@ func (e *ETCD) Test(ctx context.Context) error {
return
errors
.
New
(
"this server has not yet been promoted from learner to voting member"
)
return
errors
.
New
(
"this server has not yet been promoted from learner to voting member"
)
}
}
if
err
:=
e
.
clearAlarms
(
ctx
);
err
!=
nil
{
return
errors
.
Wrap
(
err
,
"failed to report and disarm etcd alarms"
)
}
members
,
err
:=
e
.
client
.
MemberList
(
ctx
)
members
,
err
:=
e
.
client
.
MemberList
(
ctx
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
...
@@ -677,7 +682,7 @@ func (e *ETCD) RemovePeer(ctx context.Context, name, address string, allowSelfRe
...
@@ -677,7 +682,7 @@ func (e *ETCD) RemovePeer(ctx context.Context, name, address string, allowSelfRe
// manageLearners monitors the etcd cluster to ensure that learners are making progress towards
// manageLearners monitors the etcd cluster to ensure that learners are making progress towards
// being promoted to full voting member. The checks only run on the cluster member that is
// being promoted to full voting member. The checks only run on the cluster member that is
// the etcd leader.
// the etcd leader.
func
(
e
*
ETCD
)
manageLearners
(
ctx
context
.
Context
)
error
{
func
(
e
*
ETCD
)
manageLearners
(
ctx
context
.
Context
)
{
<-
e
.
config
.
Runtime
.
AgentReady
<-
e
.
config
.
Runtime
.
AgentReady
t
:=
time
.
NewTicker
(
manageTickerTime
)
t
:=
time
.
NewTicker
(
manageTickerTime
)
defer
t
.
Stop
()
defer
t
.
Stop
()
...
@@ -687,6 +692,10 @@ func (e *ETCD) manageLearners(ctx context.Context) error {
...
@@ -687,6 +692,10 @@ func (e *ETCD) manageLearners(ctx context.Context) error {
defer
cancel
()
defer
cancel
()
// Check to see if the local node is the leader. Only the leader should do learner management.
// Check to see if the local node is the leader. Only the leader should do learner management.
if
e
.
client
==
nil
{
logrus
.
Debug
(
"Etcd client was nil"
)
continue
}
if
status
,
err
:=
e
.
client
.
Status
(
ctx
,
endpoint
);
err
!=
nil
{
if
status
,
err
:=
e
.
client
.
Status
(
ctx
,
endpoint
);
err
!=
nil
{
logrus
.
Errorf
(
"Failed to check local etcd status for learner management: %v"
,
err
)
logrus
.
Errorf
(
"Failed to check local etcd status for learner management: %v"
,
err
)
continue
continue
...
@@ -715,7 +724,7 @@ func (e *ETCD) manageLearners(ctx context.Context) error {
...
@@ -715,7 +724,7 @@ func (e *ETCD) manageLearners(ctx context.Context) error {
}
}
}
}
}
}
return
nil
return
}
}
// trackLearnerProcess attempts to promote a learner. If it cannot be promoted, progress through the raft index is tracked.
// trackLearnerProcess attempts to promote a learner. If it cannot be promoted, progress through the raft index is tracked.
...
@@ -805,6 +814,41 @@ func (e *ETCD) setLearnerProgress(ctx context.Context, status *learnerProgress)
...
@@ -805,6 +814,41 @@ func (e *ETCD) setLearnerProgress(ctx context.Context, status *learnerProgress)
return
err
return
err
}
}
// clearAlarms checks for any alarms on the local etcd member. If found, they are
// reported and the alarm state is cleared.
func
(
e
*
ETCD
)
clearAlarms
(
ctx
context
.
Context
)
error
{
ctx
,
cancel
:=
context
.
WithTimeout
(
ctx
,
testTimeout
)
defer
cancel
()
if
e
.
client
==
nil
{
return
errors
.
New
(
"etcd client was nil"
)
}
alarmList
,
err
:=
e
.
client
.
AlarmList
(
ctx
)
if
err
!=
nil
{
return
fmt
.
Errorf
(
"etcd alarm list failed: %v"
,
err
)
}
if
len
(
alarmList
.
Alarms
)
==
0
{
return
nil
}
var
hasAlarm
bool
for
_
,
alarm
:=
range
alarmList
.
Alarms
{
if
alarmList
.
Header
.
MemberId
!=
alarm
.
MemberID
{
continue
}
logrus
.
Warnf
(
"Alarm on etcd server: %s"
,
alarm
.
Alarm
)
hasAlarm
=
true
}
if
hasAlarm
{
if
_
,
err
:=
e
.
client
.
AlarmDisarm
(
ctx
,
&
etcd
.
AlarmMember
{});
err
!=
nil
{
return
fmt
.
Errorf
(
"etcd alarm disarm failed: %v"
,
err
)
}
logrus
.
Infof
(
"Alarms disarmed on etcd server"
)
}
return
nil
}
// clientURLs returns a list of all non-learner etcd cluster member client access URLs
// clientURLs returns a list of all non-learner etcd cluster member client access URLs
func
ClientURLs
(
ctx
context
.
Context
,
clientAccessInfo
*
clientaccess
.
Info
,
selfIP
string
)
([]
string
,
Members
,
error
)
{
func
ClientURLs
(
ctx
context
.
Context
,
clientAccessInfo
*
clientaccess
.
Info
,
selfIP
string
)
([]
string
,
Members
,
error
)
{
var
memberList
Members
var
memberList
Members
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment