[agent] Implement drbd-primary-controller #369
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Pavel Karpov <[email protected]>
Signed-off-by: Pavel Karpov <[email protected]>
Signed-off-by: Pavel Karpov <[email protected]>
Signed-off-by: Pavel Karpov <[email protected]>
Signed-off-by: Pavel Karpov <[email protected]>
Signed-off-by: Pavel Karpov <[email protected]>
Signed-off-by: Pavel Karpov <[email protected]>
Signed-off-by: Pavel Karpov <[email protected]>
Signed-off-by: Pavel Karpov <[email protected]>
Signed-off-by: Pavel Karpov <[email protected]>
Signed-off-by: Pavel Karpov <[email protected]>
Signed-off-by: Pavel Karpov <[email protected]>
asergunov
approved these changes
Dec 9, 2025
Comment on lines
+31
to
+32
| func BuildController(mgr manager.Manager) error { | ||
| cfg, err := env.GetConfig() |
Contributor
There was a problem hiding this comment.
Я вроде делал чтобы он сюда аргументом приезжал?
Contributor
Author
There was a problem hiding this comment.
Как раз не делал (
Поэтому я сделал как у тебя было сделано.
Contributor
There was a problem hiding this comment.
Я точно делал. Может в контроллере?
Contributor
Author
There was a problem hiding this comment.
В смерженном только тут images/agent/internal/controllers/rvr_status_config_address/controller.go.
В контроллере тишина grep -r cfg images/controller/internal/controllers/
Comment on lines
+126
to
+146
| if needPrimary { | ||
| log.Info("Promoting to primary") | ||
| cmdErr = drbdadm.ExecutePrimary(ctx, rvr.Spec.ReplicatedVolumeName) | ||
| } else { | ||
| log.Info("Demoting to secondary") | ||
| cmdErr = drbdadm.ExecuteSecondary(ctx, rvr.Spec.ReplicatedVolumeName) | ||
| } | ||
|
|
||
| // Extract error details | ||
| if cmdErr != nil { | ||
| var exitErr *exec.ExitError | ||
| if errors.As(cmdErr, &exitErr) { | ||
| exitCode = exitErr.ExitCode() | ||
| } | ||
| // The error from drbdadm.ExecutePrimary/ExecuteSecondary is a joined error | ||
| // containing both the exec error and the command output | ||
| cmdOutput = cmdErr.Error() | ||
| log.Error(cmdErr, "executed command failed", "command", drbdadm.Command, "args", map[bool][]string{true: drbdadm.PrimaryArgs(rvr.Spec.ReplicatedVolumeName), false: drbdadm.SecondaryArgs(rvr.Spec.ReplicatedVolumeName)}[needPrimary], "output", cmdOutput) | ||
| } else { | ||
| log.V(4).Info("executed command successfully", "command", drbdadm.Command, "args", map[bool][]string{true: drbdadm.PrimaryArgs(rvr.Spec.ReplicatedVolumeName), false: drbdadm.SecondaryArgs(rvr.Spec.ReplicatedVolumeName)}[needPrimary]) | ||
| } |
Contributor
There was a problem hiding this comment.
Пока норм. Но это техдолг. Тут по-хорошему надо мокать и тесты буду - конфетка
Comment on lines
+283
to
+297
| if rvr.Status == nil { | ||
| rvr.Status = &v1alpha3.ReplicatedVolumeReplicaStatus{} | ||
| } | ||
| if rvr.Status.DRBD == nil { | ||
| rvr.Status.DRBD = &v1alpha3.DRBD{} | ||
| } | ||
| if rvr.Status.DRBD.Config == nil { | ||
| rvr.Status.DRBD.Config = &v1alpha3.DRBDConfig{} | ||
| } | ||
| if rvr.Status.DRBD.Status == nil { | ||
| rvr.Status.DRBD.Status = &v1alpha3.DRBDStatus{} | ||
| } | ||
| if rvr.Status.DRBD.Actual == nil { | ||
| rvr.Status.DRBD.Actual = &v1alpha3.DRBDActual{} | ||
| } |
Contributor
There was a problem hiding this comment.
В следующий раз так не делай.
А может делай. Надо обсудить.
Co-authored-by: Anton Sergunov <[email protected]> Signed-off-by: Pavel Karpov <[email protected]>
asergunov
approved these changes
Dec 9, 2025
Signed-off-by: Pavel Karpov <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR introduces a new drbd-primary-controller in the agent component that manages DRBD role transitions (Primary/Secondary) for ReplicatedVolumeReplica resources. The controller monitors RVRs assigned to the current node and executes drbdadm primary or drbdadm secondary commands based on the desired state defined in rvr.Status.DRBD.Config.Primary. It also tracks command execution errors in the RVR status, storing them in rvr.Status.DRBD.Errors.LastPrimaryError or rvr.Status.DRBD.Errors.LastSecondaryError fields.
Why do we need it, and what problem does it solve?
The controller automates DRBD role management for replicated volumes.
What is the expected result?
After applying these changes:
rvr.Status.DRBD.Errors.LastPrimaryErrororrvr.Status.DRBD.Errors.LastSecondaryError.Checklist