Replace HAResources with TieredLimits #169
Conversation
v2/account_claims.go
Outdated
| // OperatorLimits are used to limit access by an account | ||
| type OperatorLimits struct { | ||
| NatsLimits | ||
| AccountLimits | ||
| JetStreamLimits | ||
| TieredLimits `json:"tiered_limits,omitempty"` |
There was a problem hiding this comment.
Since these are ultimately JetStream limits not sure why don't we group them with JetStreamLimits.
There was a problem hiding this comment.
so we don't get recursive tiers.
It's either move tieredlimits into JetStream Limits but then the actual values have to be moved into their own struct.
Or keep them next to each other.
v2/account_claims.go
Outdated
| @@ -72,26 +71,36 @@ func (j *JetStreamLimits) IsJSEnabled() bool { | |||
| return j.MemoryStorage != 0 || j.DiskStorage != 0 | |||
| } | |||
There was a problem hiding this comment.
The fact that TieredLimits is not part of JetStreamLimits (although they are JS limits) as Alberto suggested, means that JetStreamLimits.ISJSEnabled() would return false here, even if there are tiered limits. Is that correct?
There was a problem hiding this comment.
I will push an update with refactored limits, so we can look at the alternative.
There was a problem hiding this comment.
Turns out IsJSEnabled was added with the previous (HAResources commit) and has not been released.
| @@ -61,7 +60,7 @@ type JetStreamLimits struct { | |||
|
|
|||
| // IsUnlimited returns true if all limits are unlimited | |||
| func (j *JetStreamLimits) IsUnlimited() bool { | |||
| return *j == JetStreamLimits{NoLimit, NoLimit, NoLimit, NoLimit, NoLimit, false} | |||
| return *j == JetStreamLimits{NoLimit, NoLimit, NoLimit, NoLimit, false} | |||
There was a problem hiding this comment.
JetStreamLimits will be mapped to R factor in the future, right?
There was a problem hiding this comment.
Yes, for now we will be indexing with tier names "R1" and "R3".
However, that indexing gives us the flexibility to change that going forward.
You can see a sample of this in the attached unit test
TieredLimits are mutually exclusive with JetStream limits Signed-off-by: Matthias Hanel <mh@synadia.com>
Signed-off-by: Matthias Hanel <mh@synadia.com>
Signed-off-by: Matthias Hanel <mh@synadia.com>
Signed-off-by: Matthias Hanel <mh@synadia.com>
TieredLimits are mutually exclusive with JetStream limits
Signed-off-by: Matthias Hanel mh@synadia.com