RSDK-8701 Show configuring state through MachineStatus endpoint #4359
Conversation
This file contains 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
viambot
added
safe to test
maximpertsov
commented
Sep 9, 2024
Comment on lines
+3542
to
+3616
| t.Run("poll during reconfiguration", func(t *testing.T) { | ||
| rev1 := "rev1" | ||
| lr := setupLocalRobot(t, ctx, &config.Config{ | ||
| Revision: rev1, | ||
| Components: []resource.Config{newMockConfig("m", 200, false, "")}, | ||
| }, logger) | ||
|
|
||
| // update resource with a working config that is slow to reconfigure. | ||
| rev2 := "rev2" | ||
| var wg sync.WaitGroup | ||
| wg.Add(1) | ||
| go func() { | ||
| defer wg.Done() | ||
| lr.Reconfigure(ctx, &config.Config{ | ||
| Revision: rev2, | ||
| Components: []resource.Config{newMockConfig("m", 300, false, "1s")}, | ||
| }) | ||
| }() | ||
| // sleep for a short amount of time to allow the machine to receive a new | ||
| // revision. this sleep should be shorter than the resource update duration | ||
| // defined above so that updated resource is still in a "configuring" state. | ||
| time.Sleep(time.Millisecond * 100) | ||
|
|
||
| // get status while reconfiguring | ||
| mStatus, err := lr.MachineStatus(ctx) | ||
| test.That(t, err, test.ShouldBeNil) | ||
| test.That(t, mStatus.Config.Revision, test.ShouldEqual, rev2) | ||
|
|
||
| // the component whose config changed should be the only component in a | ||
| // "configuring" state and associated with the original revision. | ||
| filterConfiguring := rtestutils.FilterByStatus(t, mStatus.Resources, resource.NodeStateConfiguring) | ||
| expectedConfiguring := []resource.Status{ | ||
| { | ||
| Name: mockNamed("m"), | ||
| State: resource.NodeStateConfiguring, | ||
| Revision: rev1, | ||
| }, | ||
| } | ||
| rtestutils.VerifySameResourceStatuses(t, filterConfiguring, expectedConfiguring) | ||
|
|
||
| // all other components should be in the "ready" state and associated with the | ||
| // new revision. | ||
| filterReady := rtestutils.FilterByStatus(t, mStatus.Resources, resource.NodeStateReady) | ||
| expectedReady := getExpectedDefaultStatuses(rev2) | ||
| rtestutils.VerifySameResourceStatuses(t, filterReady, expectedReady) | ||
|
|
||
| wg.Wait() | ||
|
|
||
| // get status after reconfigure finishes | ||
| mStatus, err = lr.MachineStatus(ctx) | ||
| test.That(t, err, test.ShouldBeNil) | ||
| test.That(t, mStatus.Config.Revision, test.ShouldEqual, rev2) | ||
|
|
||
| // now all components, including the one whose config changed, should all be in | ||
| // the "ready" state and associated with the new revision. | ||
| expectedStatuses := rtestutils.ConcatResourceStatuses( | ||
| getExpectedDefaultStatuses(rev2), | ||
| []resource.Status{ | ||
| { | ||
| Name: mockNamed("m"), | ||
| State: resource.NodeStateReady, | ||
| Revision: rev2, | ||
| }, | ||
| }, | ||
| ) | ||
| rtestutils.VerifySameResourceStatuses(t, mStatus.Resources, expectedStatuses) | ||
| }) |
There was a problem hiding this comment.
pardon the noisy diff - the test highlighted with this comment is the only new test. the remaining changes are refactors.
this test correctly fails if the locked removed in commit 3556889 is reinstated.
viambot
added
safe to test
maximpertsov
force-pushed
the
RSDK-8701-show-configuring-state
branch
from
a8f90e5
to
1f34a19
Compare
viambot
added
safe to test
maximpertsov
commented
Sep 9, 2024
Comment on lines
+3560
to
+3563
| // sleep for a short amount of time to allow the machine to receive a new | ||
| // revision. this sleep should be shorter than the resource update duration | ||
| // defined above so that updated resource is still in a "configuring" state. | ||
| time.Sleep(time.Millisecond * 100) |
There was a problem hiding this comment.
relying on a sleep is a little janky - alternatively we could poll machine status until the revision on the machine is updated and fail after some attempts. any other suggestions are welcome here.
cheukt
approved these changes
Sep 10, 2024
Comment on lines
+3560
to
+3563
| // sleep for a short amount of time to allow the machine to receive a new | ||
| // revision. this sleep should be shorter than the resource update duration | ||
| // defined above so that updated resource is still in a "configuring" state. | ||
| time.Sleep(time.Millisecond * 100) |
maximpertsov
force-pushed
the
RSDK-8701-show-configuring-state
branch
from
3556889
to
f4628a8
Compare
viambot
added
safe to test
This reverts commit f4628a8.
viambot
added
safe to test
viambot
added
safe to test
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.
Stop holding
resourceGraphLockwhile fetching machine status from local robot, since this prevents users from seeing resources statuses while a robot is (re)configuring.