TrueCloudLab/frostfs-s3-gw
14
2
Fork 17
Code Issues 18 Pull requests 3 Projects Releases 16 Packages Activity Actions

[#305] Support checking if accessbox was removed #305

Merged
alexvanin merged 1 commit from dkirillov/frostfs-s3-gw:feature/checking_if_accessbox_is_removed_in_cache into master 2024-09-04 19:51:13 +00:00
Conversation 0 Commits 1 Files changed 1 +27 -18
1 changed files with 27 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit cc34f659d1 - Show all commits

45
creds/tokens/credentials.go
View file

@ -118,24 +118,7 @@ func New(cfg Config) Credentials {
func (c *cred) GetBox(ctx context.Context, addr oid.Address) (*accessbox.Box, error) {
cachedBoxValue := c.cache.Get(addr)
if cachedBoxValue != nil {
if time.Since(cachedBoxValue.PutTime) > c.removingCheckDuration {
if box, err := c.getAccessBox(ctx, addr); err != nil {
if client.IsErrObjectAlreadyRemoved(err) {
c.cache.Delete(addr)
return nil, fmt.Errorf("get access box: %w", err)
}
} else {
cachedBox, err := box.GetBox(c.key)
if err != nil {
c.cache.Delete(addr)
return nil, fmt.Errorf("get gate box: %w", err)
}
// we need this to reset PutTime
// to don't check for removing each time after removingCheckDuration interval
c.putBoxToCache(addr, cachedBox)
}
}
return cachedBoxValue.Box, nil
return c.checkIfCredentialsAreRemoved(ctx, addr, cachedBoxValue)
alexvanin marked this conversation as resolved Outdated
alexvanin commented 2024-02-08 15:44:48 +00:00
Outdated
Review
Copy link

suggestion (non-blocking): reversed condition reads a bit easier with less indent, I think.

	if cachedBoxValue != nil {
		if time.Since(cachedBoxValue.PutTime) <= c.removingCheckDuration {
			return cachedBoxValue.Box, nil
		}

		if box, err := c.getAccessBox(ctx, addr); err != nil {
			if client.IsErrObjectAlreadyRemoved(err) {
				c.cache.Delete(addr)
suggestion (non-blocking): reversed condition reads a bit easier with less indent, I think. ```go if cachedBoxValue != nil { if time.Since(cachedBoxValue.PutTime) <= c.removingCheckDuration { return cachedBoxValue.Box, nil } if box, err := c.getAccessBox(ctx, addr); err != nil { if client.IsErrObjectAlreadyRemoved(err) { c.cache.Delete(addr) ```
}
box, err := c.getAccessBox(ctx, addr)
@ -153,6 +136,32 @@ func (c *cred) GetBox(ctx context.Context, addr oid.Address) (*accessbox.Box, er
return cachedBox, nil
}
func (c *cred) checkIfCredentialsAreRemoved(ctx context.Context, addr oid.Address, cachedBoxValue *cache.AccessBoxCacheValue) (*accessbox.Box, error) {
if time.Since(cachedBoxValue.PutTime) < c.removingCheckDuration {
return cachedBoxValue.Box, nil
}
box, err := c.getAccessBox(ctx, addr)
if err != nil {
if client.IsErrObjectAlreadyRemoved(err) {
c.cache.Delete(addr)
return nil, fmt.Errorf("get access box: %w", err)
}
return cachedBoxValue.Box, nil
}
cachedBox, err := box.GetBox(c.key)
if err != nil {
c.cache.Delete(addr)
return nil, fmt.Errorf("get gate box: %w", err)
}
// we need this to reset PutTime
// to don't check for removing each time after removingCheckDuration interval
c.putBoxToCache(addr, cachedBox)
return cachedBoxValue.Box, nil
}
func (c *cred) putBoxToCache(addr oid.Address, box *accessbox.Box) {
if err := c.cache.Put(addr, box); err != nil {
c.log.Warn(logs.CouldntPutAccessBoxIntoCache, zap.String("address", addr.EncodeToString()))