Skip to content

quota: atomically set limitation #4158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 19 commits into from
Nov 13, 2023
Merged

quota: atomically set limitation #4158

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
34ac6ac
quota: atomically set limitation
Hexilee Nov 10, 2023
35611ad
fix unit test
Hexilee Nov 10, 2023
3d69f07
add more detailed error
Hexilee Nov 10, 2023
3e0ca98
polished logic
Hexilee Nov 10, 2023
e3ab815
reduce changed lines
Hexilee Nov 10, 2023
2fa742f
remove doGetOrSetQuota
Hexilee Nov 10, 2023
c9c1e5b
fix build
Hexilee Nov 10, 2023
2004079
fix tkv set quota
Hexilee Nov 10, 2023
6d4c567
fix redis load & dump
Hexilee Nov 10, 2023
6aded07
fix lint
Hexilee Nov 10, 2023
831adbf
refactor redis and sql
Hexilee Nov 12, 2023
cf26ee4
fix redis and sql conflict
Hexilee Nov 12, 2023
f510406
fix tkv doSetQuota
Hexilee Nov 13, 2023
e12ddb1
refactor sql engine
Hexilee Nov 13, 2023
b1e504a
refactor redis engine
Hexilee Nov 13, 2023
2173eda
fix lint
Hexilee Nov 13, 2023
f4229af
resume tests
Hexilee Nov 13, 2023
6adcefd
polish code
Hexilee Nov 13, 2023
c8e85c9
polish code again
Hexilee Nov 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions pkg/meta/redis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3471,19 +3471,18 @@ func (m *redisMeta) doSetQuota(ctx Context, inode Ino, quota *Quota) (bool, erro
var created bool
err := m.txn(ctx, func(tx *redis.Tx) error {
origin := new(Quota)
created = true
field := inode.String()
buf, e := tx.HGet(ctx, m.dirQuotaKey(), field).Bytes()
if e == nil {
created = false
origin.MaxSpace, origin.MaxInodes = m.parseQuota(buf)
} else if e != redis.Nil {
} else if e == redis.Nil {
created = true
} else {
return e
}
if created && quota.MaxSpace < 0 && quota.MaxInodes < 0 {
// limit is deleted, skip
created = false
return nil
return errors.Errorf("limitation not set or deleted")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

move this into the case for e is redis.Nil

}
if quota.MaxSpace >= 0 {
origin.MaxSpace = quota.MaxSpace
Expand Down
7 changes: 3 additions & 4 deletions pkg/meta/sql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3204,7 +3204,6 @@ func (m *dbMeta) doGetQuota(ctx Context, inode Ino) (*Quota, error) {
func (m *dbMeta) doSetQuota(ctx Context, inode Ino, quota *Quota) (bool, error) {
var created bool
err := m.txn(func(s *xorm.Session) error {
created = true
origin := dirQuota{Inode: inode}
exist, e := s.ForUpdate().Get(&origin)
if e != nil {
Expand All @@ -3213,9 +3212,9 @@ func (m *dbMeta) doSetQuota(ctx Context, inode Ino, quota *Quota) (bool, error)
if exist {
created = false
} else if quota.MaxSpace < 0 && quota.MaxInodes < 0 {
// limit is deleted, skip
created = false
return nil
return errors.Errorf("limitation not set or deleted")
} else {
created = true
}
updateColumns := make([]string, 0, 4)
if quota.MaxSpace >= 0 {
Expand Down
6 changes: 2 additions & 4 deletions pkg/meta/tkv.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2752,20 +2752,18 @@ func (m *kvMeta) doSetQuota(ctx Context, inode Ino, quota *Quota) (bool, error)
var created bool
err := m.txn(func(tx *kvTxn) error {
var origin *Quota
created = true
buf := tx.get(m.dirQuotaKey(inode))
if len(buf) == 32 {
origin = m.parseQuota(buf)
created = false
} else if len(buf) != 0 {
return fmt.Errorf("invalid quota value: %v", buf)
} else {
created = true
origin = new(Quota)
}
if created && quota.MaxSpace < 0 && quota.MaxInodes < 0 {
// limit is deleted, skip
created = false
return nil
return errors.Errorf("limitation not set or deleted")
}
if quota.MaxSpace >= 0 {
origin.MaxSpace = quota.MaxSpace
Expand Down