extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2025-01-22 05:48:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix for not relaxing scoped bandwidth clases that are in a limited state (#606)

Browse Source
This commit is contained in:
Michael Quigley 2024-06-07 14:02:28 -04:00
parent afc8d22a9f
commit 60893100a5
No known key found for this signature in database
GPG Key ID: 9B60314A9DD20A62
2 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
controller/limits/relaxAction.go
View File

@ -27,6 +27,23 @@ func (a *relaxAction) HandleAccount(acct *store.Account, _, _ int64, bwc store.B
return errors.Wrapf(err, "error finding environments for account '%v'", acct.Email) return errors.Wrapf(err, "error finding environments for account '%v'", acct.Email)
} }
jes, err := a.str.FindAllLatestBandwidthLimitJournalForAccount(acct.Id, trx)
if err != nil {
return errors.Wrapf(err, "error finding latest bandwidth limit journal entries for account '%v'", acct.Email)
}
limitedBackends := make(map[sdk.BackendMode]bool)
for _, je := range jes {
if je.LimitClassId != nil {
lc, err := a.str.GetLimitClass(*je.LimitClassId, trx)
if err != nil {
return err
}
if lc.BackendMode != nil && lc.LimitAction == store.LimitLimitAction {
limitedBackends[*lc.BackendMode] = true
}
}
}
edge, err := zrokEdgeSdk.Client(a.zCfg) edge, err := zrokEdgeSdk.Client(a.zCfg)
if err != nil { if err != nil {
return err return err
@ -39,8 +56,8 @@ func (a *relaxAction) HandleAccount(acct *store.Account, _, _ int64, bwc store.B
} }
for _, shr := range shrs { for _, shr := range shrs {
// TODO: when relaxing unscoped classes; need to not relax other scoped limits _, stayLimited := limitedBackends[sdk.BackendMode(shr.BackendMode)]
if !bwc.IsScoped() || bwc.GetBackendMode() == sdk.BackendMode(shr.BackendMode) { if (!bwc.IsScoped() && !stayLimited) || bwc.GetBackendMode() == sdk.BackendMode(shr.BackendMode) {
switch shr.ShareMode { switch shr.ShareMode {
case string(sdk.PublicShareMode): case string(sdk.PublicShareMode):
if err := relaxPublicShare(a.str, edge, shr, trx); err != nil { if err := relaxPublicShare(a.str, edge, shr, trx); err != nil {

16
controller/store/bandwidthLimitJournal.go
View File

@ -90,6 +90,22 @@ func (str *Store) FindAllBandwidthLimitJournal(trx *sqlx.Tx) ([]*BandwidthLimitJ
return jes, nil return jes, nil
} }
func (str *Store) FindAllLatestBandwidthLimitJournalForAccount(acctId int, trx *sqlx.Tx) ([]*BandwidthLimitJournalEntry, error) {
rows, err := trx.Queryx("select * from bandwidth_limit_journal where account_id = $1", acctId)
if err != nil {
return nil, errors.Wrap(err, "error finding all for account from bandwidth_limit_journal")
}
var jes []*BandwidthLimitJournalEntry
for rows.Next() {
je := &BandwidthLimitJournalEntry{}
if err := rows.StructScan(je); err != nil {
return nil, errors.Wrap(err, "error scanning bandwidth_limit_journal")
}
jes = append(jes, je)
}
return jes, nil
}
func (str *Store) FindAllLatestBandwidthLimitJournal(trx *sqlx.Tx) ([]*BandwidthLimitJournalEntry, error) { func (str *Store) FindAllLatestBandwidthLimitJournal(trx *sqlx.Tx) ([]*BandwidthLimitJournalEntry, error) {
rows, err := trx.Queryx("select id, account_id, limit_class_id, action, rx_bytes, tx_bytes, created_at, updated_at from bandwidth_limit_journal where id in (select max(id) as id from bandwidth_limit_journal group by account_id)") rows, err := trx.Queryx("select id, account_id, limit_class_id, action, rx_bytes, tx_bytes, created_at, updated_at from bandwidth_limit_journal where id in (select max(id) as id from bandwidth_limit_journal group by account_id)")
if err != nil { if err != nil {