DATA-1419 | DATA-861 - Check sync config in reconfigure #2309
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
the
safe to test
alexis-wei
changed the title
AaronCasas
reviewed
May 1, 2023
| @@ -426,12 +428,16 @@ func (svc *builtIn) Reconfigure( | |||
| } | |||
| svc.collectors = newCollectors | |||
|
|
|||
| if svc.syncDisabled == svcConfig.ScheduledSyncDisabled && | |||
| svc.syncIntervalMins == svcConfig.SyncIntervalMins && | |||
| reflect.DeepEqual(svc.additionalSyncPaths, svcConfig.AdditionalSyncPaths) { | |||
There was a problem hiding this comment.
Only use reflection when necessary because it's incredibly slow, should use a string slice method here
| @@ -98,6 +99,7 @@ type builtIn struct { | |||
| syncerConstructor datasync.ManagerConstructor | |||
| cloudConnSvc cloud.ConnectionService | |||
| cloudConn rpc.ClientConn | |||
| ticker *clk.Ticker | |||
There was a problem hiding this comment.
Include use/purpose in name, syncTicker or something
| @@ -447,6 +453,10 @@ func (svc *builtIn) Reconfigure( | |||
| svc.startSyncScheduler(svc.syncIntervalMins) | |||
| } else { | |||
| svc.closeSyncer() | |||
| if svc.ticker != nil { | |||
There was a problem hiding this comment.
Should this be done before closing the syncer? If this ticks between these two lines, would there be a risk of a NPE?
| svc.backgroundWorkers.Add(1) | ||
| goutils.PanicCapturingGo(func() { | ||
| defer svc.backgroundWorkers.Done() | ||
| defer ticker.Stop() | ||
| defer svc.ticker.Stop() |
There was a problem hiding this comment.
Is calling svc.ticker.Stop() safe? Just making sure since this is being deferred and also called explicitly elsewhere
| @@ -426,12 +428,16 @@ func (svc *builtIn) Reconfigure( | |||
| } | |||
| svc.collectors = newCollectors | |||
|
|
|||
| if svc.syncDisabled == svcConfig.ScheduledSyncDisabled && | |||
| svc.syncIntervalMins == svcConfig.SyncIntervalMins && | |||
| reflect.DeepEqual(svc.additionalSyncPaths, svcConfig.AdditionalSyncPaths) { | |||
There was a problem hiding this comment.
I don't think the additional paths changing needs to impact the sync ticker. More of a product question ig but I'd lean towards removing this part of the check
viambot
added
safe to test
viambot
added
safe to test
viambot
added
safe to test
viambot
added
safe to test
agreenb
approved these changes
May 1, 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.
Fix:
Test: