Skip to content

Commit

Permalink
Merge branch 'release-1.16.6' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
Ed McClanahan committed Jul 13, 2020
2 parents 81531d9 + 68a7f3b commit 66c8518
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 25 deletions.
26 changes: 4 additions & 22 deletions pfsagentd/fission.go
Original file line number Diff line number Diff line change
Expand Up @@ -890,32 +890,14 @@ func (dummy *globalsStruct) DoMkDir(inHeader *fission.InHeader, mkDirIn *fission

func (dummy *globalsStruct) DoUnlink(inHeader *fission.InHeader, unlinkIn *fission.UnlinkIn) (errno syscall.Errno) {
var (
err error
lookupPlusReply *jrpcfs.LookupPlusReply
lookupPlusRequest *jrpcfs.LookupPlusRequest
unlinkReply *jrpcfs.Reply
unlinkRequest *jrpcfs.UnlinkRequest
err error
unlinkReply *jrpcfs.Reply
unlinkRequest *jrpcfs.UnlinkRequest
)

_ = atomic.AddUint64(&globals.metrics.FUSE_DoUnlink_calls, 1)

lookupPlusRequest = &jrpcfs.LookupPlusRequest{
InodeHandle: jrpcfs.InodeHandle{
MountID: globals.mountID,
InodeNumber: int64(inHeader.NodeID),
},
Basename: string(unlinkIn.Name[:]),
}

lookupPlusReply = &jrpcfs.LookupPlusReply{}

err = globals.retryRPCClient.Send("RpcLookupPlus", lookupPlusRequest, lookupPlusReply)
if nil != err {
errno = convertErrToErrno(err, syscall.ENOENT)
return
}

doFlushIfNecessary(inode.InodeNumber(lookupPlusReply.InodeNumber), unlinkIn.Name)
doFlushIfNecessary(inode.InodeNumber(inHeader.NodeID), unlinkIn.Name)

unlinkRequest = &jrpcfs.UnlinkRequest{
InodeHandle: jrpcfs.InodeHandle{
Expand Down
4 changes: 1 addition & 3 deletions release_notes.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
# ProxyFS Release Notes

## 1.16.5 (July 13, 2020)
## 1.16.6 (July 13, 2020)

### Bug Fixes:

Fixed memory leak in PFSAgent where file stats not recently accessed
were cached indefinitely.

Fixed failure to flush in-flight write data for deleted files.

Fixed race condition in retryrpc path (PFSAgent->ProxyFS) that could
be exposed when connections need to be reestablished and requests
retransmitted.
Expand Down

0 comments on commit 66c8518

Please sign in to comment.