fix: schema sync is broken #2843
Merged
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
stuartwdouglas
added
the
run-all
stuartwdouglas
force-pushed
the
stuartwdouglas/fix-schema-sync
branch
from
80ceaba
to
a35040c
Compare
alecthomas
approved these changes
Sep 26, 2024
| modulesByName := map[string]*schema.Module{} | ||
| retry := backoff.Backoff{Max: time.Second * 5} | ||
| for { | ||
| err := s.watchModuleChanges(ctx, func(response *ftlv1.PullSchemaResponse) error { |
There was a problem hiding this comment.
Is this being used anymore? If not we should remove it.
There was a problem hiding this comment.
It's used for PullSchema
backend/controller/controller.go
Outdated
| return orderedModules[i].Name < orderedModules[j].Name | ||
| }) | ||
| combined := &schema.Schema{Modules: orderedModules} | ||
| s.schema.Store(ftlreflect.DeepCopy(combined)) |
There was a problem hiding this comment.
I don't think you need the DeepCopy anymore?
backend/controller/controller.go
Outdated
| retry.Reset() | ||
| } | ||
| } | ||
| s.routes.Store(newRoutes) |
There was a problem hiding this comment.
To fix the lack of atomicity we could store both in a single atomic.Value as a single struct.
There was a problem hiding this comment.
In practice I don't think it would matter, however the lack of atomicity just feels wrong. I will move it into a single struct.
stuartwdouglas
force-pushed
the
stuartwdouglas/fix-schema-sync
branch
from
a35040c
to
239c4e6
Compare
stuartwdouglas
force-pushed
the
stuartwdouglas/fix-schema-sync
branch
2 times, most recently
from
29aa19a
to
737068e
Compare
As the sync works on module name rather than deployment when a deployment is removed it will remove any newer version of the module. This PR changes to build the schema in the same function as the route table, so they stay in sync.
stuartwdouglas
force-pushed
the
stuartwdouglas/fix-schema-sync
branch
from
737068e
to
c7a988a
Compare
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.
As the sync works on module name rather than deployment when a deployment is removed it will remove any newer version of the module.
This PR changes to build the schema in the same function as the route table, so they stay in sync.
At persent this is not an atomic operation however, so there is a slight possibility for a request to see a new schema for an old route table, however this is still way better than the current situation.