Skip to content
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

Jump to bottom

meta/redis: fix some transactions that are not wrapped by multi/exec #4801

Merged
merged 1 commit into from
May 1, 2024
Merged

meta/redis: fix some transactions that are not wrapped by multi/exec #4801

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 27 additions & 8 deletions pkg/meta/redis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,18 +409,23 @@ func (m *redisMeta) incrCounter(name string, value int64) (int64, error) {

func (m *redisMeta) setIfSmall(name string, value, diff int64) (bool, error) {
var changed bool
ctx := Background
name = m.prefix + name
err := m.txn(Background, func(tx *redis.Tx) error {
err := m.txn(ctx, func(tx *redis.Tx) error {
changed = false
old, err := tx.Get(Background, name).Int64()
old, err := tx.Get(ctx, name).Int64()
if err != nil && err != redis.Nil {
return err
}
if old > value-diff {
return nil
} else {
changed = true
return tx.Set(Background, name, value, 0).Err()
_, err = tx.TxPipelined(ctx, func(pipe redis.Pipeliner) error {
pipe.Set(ctx, name, value, 0)
return nil
})
return err
}
}, name)

Expand Down Expand Up @@ -1185,7 +1190,11 @@ func (m *redisMeta) doReadlink(ctx Context, inode Ino, noatime bool) (atime int6
}
attr.Atime = now.Unix()
attr.Atimensec = uint32(now.Nanosecond())
return tx.Set(ctx, m.inodeKey(inode), m.marshal(attr), 0).Err()
_, e = tx.TxPipelined(ctx, func(pipe redis.Pipeliner) error {
pipe.Set(ctx, m.inodeKey(inode), m.marshal(attr), 0)
return nil
})
return e
}, m.inodeKey(inode))
atime = attr.Atime
return
Expand Down Expand Up @@ -3268,7 +3277,11 @@ func (m *redisMeta) doRepair(ctx Context, inode Ino, attr *Attr) syscall.Errno {
attr.Nlink++
}
}
return tx.Set(ctx, m.inodeKey(inode), m.marshal(attr), 0).Err()
_, err = tx.TxPipelined(ctx, func(pipe redis.Pipeliner) error {
pipe.Set(ctx, m.inodeKey(inode), m.marshal(attr), 0)
return nil
})
return err
}, m.inodeKey(inode), m.entryKey(inode)))
}

Expand Down Expand Up @@ -3325,10 +3338,13 @@ func (m *redisMeta) doSetXattr(ctx Context, inode Ino, name string, value []byte
} else if !ok {
return ENOATTR
}
_, err := m.rdb.HSet(ctx, key, name, value).Result()
_, err := tx.TxPipelined(ctx, func(pipe redis.Pipeliner) error {
pipe.HSet(ctx, key, name, value)
return nil
})
return err
default: // XattrCreateOrReplace
_, err := m.rdb.HSet(ctx, key, name, value).Result()
_, err := tx.HSet(ctx, key, name, value).Result()
return err
}
}, key))
Expand Down Expand Up @@ -4336,7 +4352,10 @@ func (m *redisMeta) doTouchAtime(ctx Context, inode Ino, attr *Attr, now time.Ti
}
attr.Atime = now.Unix()
attr.Atimensec = uint32(now.Nanosecond())
if err = tx.Set(ctx, m.inodeKey(inode), m.marshal(attr), 0).Err(); err == nil {
if _, err = tx.TxPipelined(ctx, func(pipe redis.Pipeliner) error {
pipe.Set(ctx, m.inodeKey(inode), m.marshal(attr), 0)
return nil
}); err == nil {
updated = true
}
return err
Expand Down
Loading