Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Try to reattach volume if volume is detached or engine is dead unexpectedly (backport #2026) #2027

Merged
merged 2 commits into from
Jun 26, 2023
Merged

Try to reattach volume if volume is detached or engine is dead unexpectedly (backport #2026) #2027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6b2e01
Try to reattach volume if volume is detached or engine is dead unexpe…
derekbit Jun 24, 2023
7d2df94
Merge branch 'v1.5.x' into mergify/bp/v1.5.x/pr-2026
innobead Jun 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions constant/events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ const (
EventReasonUnknown = "Unknown"
EventReasonFailedEviction = "FailedEviction"

EventReasonDetachedUnexpectly = "DetachedUnexpectly"
EventReasonRemount = "Remount"
EventReasonAutoSalvaged = "AutoSalvaged"
EventReasonDetachedUnexpectedly = "DetachedUnexpectedly"
EventReasonRemount = "Remount"
EventReasonAutoSalvaged = "AutoSalvaged"

EventReasonFetching = "Fetching"
EventReasonFetched = "Fetched"
Expand Down
26 changes: 15 additions & 11 deletions controller/volume_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1330,19 +1330,23 @@ func (c *VolumeController) ReconcileVolumeState(v *longhorn.Volume, es map[strin
return nil
}

// reattach volume if detached unexpected and there are still healthy replicas
if e.Status.CurrentState == longhorn.InstanceStateError && v.Status.CurrentNodeID != "" {
log.Warn("Reattaching the volume since engine of volume dead unexpectedly")
msg := fmt.Sprintf("Engine of volume %v dead unexpectedly, reattach the volume", v.Name)
c.eventRecorder.Event(v, corev1.EventTypeWarning, constant.EventReasonDetachedUnexpectly, msg)
e.Spec.LogRequested = true
for _, r := range rs {
if r.Status.CurrentState == longhorn.InstanceStateRunning {
r.Spec.LogRequested = true
rs[r.Name] = r
// Reattach volume if
// - volume is detached unexpectedly and there are still healthy replicas
// - engine dead unexpectedly and there are still healthy replicas when the volume is not attached
if e.Status.CurrentState == longhorn.InstanceStateError {
if v.Status.CurrentNodeID != "" || (v.Spec.NodeID != "" && v.Status.CurrentNodeID == "" && v.Status.State != longhorn.VolumeStateAttached) {
log.Warn("Reattaching the volume since engine of volume dead unexpectedly")
msg := fmt.Sprintf("Engine of volume %v dead unexpectedly, reattach the volume", v.Name)
c.eventRecorder.Event(v, corev1.EventTypeWarning, constant.EventReasonDetachedUnexpectedly, msg)
e.Spec.LogRequested = true
for _, r := range rs {
if r.Status.CurrentState == longhorn.InstanceStateRunning {
r.Spec.LogRequested = true
rs[r.Name] = r
}
}
v.Status.Robustness = longhorn.VolumeRobustnessFaulted
}
v.Status.Robustness = longhorn.VolumeRobustnessFaulted
}
}

Expand Down
2 changes: 1 addition & 1 deletion manager/volume.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,7 @@ func (m *VolumeManager) EngineUpgrade(volumeName, image string) (v *longhorn.Vol
return nil, err
}
if image != defaultEngineImage {
return nil, fmt.Errorf("updrading to %v is not allowed. "+
return nil, fmt.Errorf("upgrading to %v is not allowed. "+
"Only allow to upgrade to the default engine image %v because the setting "+
"`Concurrent Automatic Engine Upgrade Per Node Limit` is greater than 0",
image, defaultEngineImage)
Expand Down