chore(server): Updating data store test to use queues #3166
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
danielbdias
approved these changes
Sep 18, 2023
danielbdias
approved these changes
Sep 20, 2023
jorgeepc
approved these changes
Sep 20, 2023
| @@ -170,6 +176,32 @@ message TraceIdResponse { | |||
| string id = 1; | |||
| } | |||
|
|
|||
| message DataStoreConnectionTestRequest { | |||
| string requestID = 1; | |||
| DataStore datastore = 5; | |||
There was a problem hiding this comment.
Suggested change
| DataStore datastore = 5; | |
| DataStore datastore = 2; |
??
schoren
reviewed
Sep 20, 2023
server/http/controller.go
Outdated
| @@ -78,6 +83,13 @@ type transactionRunner interface { | |||
| Run(context.Context, testsuite.TestSuite, test.RunMetadata, variableset.VariableSet, *[]testrunner.RequiredGate) testsuite.TestSuiteRun | |||
| } | |||
|
|
|||
| type dataStoreTestRunner interface { | |||
There was a problem hiding this comment.
name suggestion
Suggested change
| type dataStoreTestRunner interface { | |
| type dataStoreTester interface { |
schoren
reviewed
Sep 20, 2023
server/testconnection/pipeline.go
Outdated
| } | ||
|
|
||
| func (p *DataStoreTestPipeline) Run(ctx context.Context, job Job) { | ||
| spew.Dump(job) |
There was a problem hiding this comment.
Suggested change
| spew.Dump(job) |
schoren
reviewed
Sep 20, 2023
server/testconnection/pipeline.go
Outdated
Comment on lines
51
to
58
| job := Job{ | ||
| Headers: make(map[string]string), | ||
| } | ||
| job.ID = uuid.New().String() | ||
| job.DataStore = datastore | ||
| job.Headers[string(middleware.TenantIDKey)] = middleware.TenantIDFromContext(ctx) | ||
|
|
||
| return job |
There was a problem hiding this comment.
Suggested change
| job := Job{ | |
| Headers: make(map[string]string), | |
| } | |
| job.ID = uuid.New().String() | |
| job.DataStore = datastore | |
| job.Headers[string(middleware.TenantIDKey)] = middleware.TenantIDFromContext(ctx) | |
| return job | |
| return Job{ | |
| ID: uuid.New().String() | |
| DataStore: datastore | |
| Headers:= map[string]string{ | |
| string(middleware.TenantIDKey): middleware.TenantIDFromContext(ctx) | |
| } | |
| } |
schoren
reviewed
Sep 20, 2023
server/testconnection/pipeline.go
Outdated
| ) | ||
|
|
||
| type Job struct { | ||
| Headers map[string]string `json:"headers"` |
There was a problem hiding this comment.
are the headers used for anything other than passing the tenant ID? if so, it might be simpler to just have a TenantID string field
There was a problem hiding this comment.
I wanted to keep using the same approach we have for the rest, but yeah we can just change it for a new field, let me check..
schoren
reviewed
Sep 20, 2023
schoren
reviewed
Sep 20, 2023
| ctx, pollingSpan := w.tracer.Start(ctx, "dsTestConnectionRequest.ProcessItem") | ||
| defer pollingSpan.End() | ||
|
|
||
| traceDB, err := getTraceDB(job.DataStore, w.newTraceDBFn) |
There was a problem hiding this comment.
If i understand this correctly, this function's only effect is to wrap the error with a message. I'd recommend to just have this behavior inlined here so it's easier to follow
schoren
reviewed
Sep 20, 2023
server/testconnection/listener.go
Outdated
Comment on lines
34
to
38
| func (m *Listener) Notify(job Job) { | ||
| for _, sub := range m.subscriptions[job.ID] { | ||
| sub(job) | ||
| } | ||
| } |
There was a problem hiding this comment.
If not using locks for reading there can still be race conditions
Suggested change
| func (m *Listener) Notify(job Job) { | |
| for _, sub := range m.subscriptions[job.ID] { | |
| sub(job) | |
| } | |
| } | |
| func (m *Listener) Notify(job Job) { | |
| m.mutex.Lock() | |
| defer m.mutex.Unlock() | |
| for _, sub := range m.subscriptions[job.ID] { | |
| sub(job) | |
| } | |
| } |
schoren
suggested changes
Sep 20, 2023
schoren
approved these changes
Sep 20, 2023
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.
This PR updates the data test connection logic to use queues
Changes
Checklist