fix(onboarding): deprecate misleading retentionPeriodHrs key
#20798
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
danxmoran
force-pushed
the
dm-onboarding-retention-period-fix-name-20452
branch
from
bfd1615
to
4b8e2b1
Compare
davidby-influx
approved these changes
Feb 26, 2021
cmd/influx/setup.go
Outdated
| } | ||
|
|
||
| if setupFlags.retention != "" { | ||
| dur, err := internal2.RawDurationToTimeDuration(setupFlags.retention) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| req.RetentionPeriod = dur | ||
| secs := dur / time.Second |
There was a problem hiding this comment.
Would it be better here to use the Duration.Seconds() and Duration.Nanoseconds() to hide the internal representation in the Duration? The modulo will have to change, if you do this, of course.
cmd/influxd/upgrade/setup.go
Outdated
| } | ||
|
|
||
| if options.target.retention != "" { | ||
| dur, err := internal.RawDurationToTimeDuration(options.target.retention) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| req.RetentionPeriod = dur | ||
| secs := dur / time.Second |
There was a problem hiding this comment.
As above, can you use the Duration.Seconds() call?
There was a problem hiding this comment.
Sounds like a good idea, I'll play with the math
danxmoran
commented
Feb 26, 2021
onboarding.go
Outdated
| Org string `json:"org"` | ||
| Bucket string `json:"bucket"` | ||
| RetentionPeriodSeconds int64 `json:"retentionPeriodSeconds,omitempty"` | ||
| RetentionPeriodHours time.Duration `json:"retentionPeriodHrs,omitempty"` |
There was a problem hiding this comment.
Self-review: I meant to name this RetentionPeriodDeprecated to emphasize that it's not actually hours
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.
Closes #20452
Using seconds as the unit matches the create-bucket API. Need to open a matching PR in Cloud