gian/cubefs
1
0
Fork 0
mirror of https://github.com/cubefs/cubefs.git synced 2026-08-02 02:00:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(objectnode): error adjustment in complete multipart

Browse Source 
Signed-off-by: yhjiango <jiangyunhua@oppo.com>
This commit is contained in:
yhjiango 2023-04-21 17:22:20 +08:00 committed by leonrayang
parent c5b008ebc8
commit 2b6b00126a
3 changed files with 36 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
objectnode/api_handler_multipart.go
View File

@ -629,10 +629,6 @@ func (o *ObjectNode) completeMultipartUploadHandler(w http.ResponseWriter, r *ht
if err != nil {
log.LogErrorf("completeMultipartUploadHandler: complete multipart fail: requestID(%v) volume(%v) uploadID(%v) err(%v)",
GetRequestID(r), param.Bucket(), uploadId, err)
if err == syscall.ENOENT {
errorCode = NoSuchUpload
return
}
if err == syscall.EINVAL {
errorCode = ObjectModeConflict
return

10
objectnode/api_handler_object.go
View File

@ -376,13 +376,13 @@ func (o *ObjectNode) headObjectHandler(w http.ResponseWriter, r *http.Request) {
// get object meta
var fileInfo *FSFileInfo
fileInfo, _, err = vol.ObjectMeta(param.Object())
if err == syscall.ENOENT {
errorCode = NoSuchKey
return
}
if err != nil {
log.LogErrorf("headObjectHandler: get file meta fail: requestId(%v) volume(%v) path(%v)err(%v)",
log.LogErrorf("headObjectHandler: get file meta fail: requestId(%v) volume(%v) path(%v) err(%v)",
GetRequestID(r), vol.Name(), param.Object(), err)
if err == syscall.ENOENT {
errorCode = NoSuchKey
return
}
errorCode = InternalErrorCode(err)
return
}

67
objectnode/fs_volume.go
View File

@ -1208,15 +1208,15 @@ func (v *Volume) CompleteMultipart(path, multipartID string, multipartInfo *prot
parentId uint64
)
if parentId, err = v.recursiveMakeDirectory(path); err != nil {
log.LogErrorf("PutObject: recursive make directory fail: volume(%v) path(%v) err(%v)",
v.name, path, err)
log.LogErrorf("CompleteMultipart: recursive make dir fail: volume(%v) path(%v) multipartID(%v) err(%v)",
v.name, path, multipartID, err)
return
}
var finalInode *proto.InodeInfo
if finalInode, err = v.mw.InodeGet_ll(completeInodeInfo.Inode); err != nil {
log.LogErrorf("CompleteMultipart: get inode fail: volume(%v) inode(%v) err(%v)",
v.name, completeInodeInfo.Inode, err)
log.LogErrorf("CompleteMultipart: get inode fail: volume(%v) multipartID(%v) inode(%v) err(%v)",
v.name, multipartID, completeInodeInfo.Inode, err)
return
}
@ -1236,44 +1236,45 @@ func (v *Volume) CompleteMultipart(path, multipartID string, multipartInfo *prot
}
}
if err = v.mw.BatchSetXAttr_ll(finalInode.Inode, attrs); err != nil {
log.LogErrorf("CompleteMultipart: store multipart extend fail: volume(%v) path(%v) inode(%v) attrs(%v) err(%v)",
v.name, path, finalInode.Inode, attrs, err)
log.LogErrorf("CompleteMultipart: store multipart extend fail: volume(%v) multipartID(%v) inode(%v) "+
"attrs(%v) err(%v)", v.name, multipartID, finalInode.Inode, attrs, err)
return nil, err
}
// remove multipart
err = v.mw.RemoveMultipart_ll(path, multipartID)
if err == syscall.ENOENT {
log.LogWarnf("CompleteMultipart: removing not exist multipart: volume(%v) multipartID(%v) path(%v)",
v.name, multipartID, path)
// apply new inode to dentry
if err = v.applyInodeToDEntry(parentId, filename, completeInodeInfo.Inode); err != nil {
log.LogErrorf("CompleteMultipart: apply inode to dentry fail: volume(%v) multipartID(%v) parentId(%v) "+
"fileName(%v) inode(%v) err(%v)", v.name, multipartID, parentId, filename, completeInodeInfo.Inode, err)
return
}
if err != nil {
log.LogErrorf("CompleteMultipart: meta complete multipart fail: volume(%v) multipartID(%v) path(%v) err(%v)",
v.name, multipartID, path, err)
return nil, err
// remove multipart
var err2 error
if err2 = v.mw.RemoveMultipart_ll(path, multipartID); err2 != nil {
log.LogWarnf("CompleteMultipart: remove multipart fail: volume(%v) multipartID(%v) path(%v) err(%v)",
v.name, multipartID, path, err2)
}
// delete part inodes
for _, part := range parts {
log.LogWarnf("CompleteMultipart: destroy part inode: volume(%v) multipartID(%v) partID(%v) inode(%v)",
v.name, multipartID, part.ID, part.Inode)
if err = v.mw.InodeDelete_ll(part.Inode); err != nil {
log.LogErrorf("CompleteMultipart: destroy part inode fail: volume(%v) multipartID(%v) partID(%v) inode(%v) err(%v)",
v.name, multipartID, part.ID, part.Inode, err)
if err2 = v.mw.InodeDelete_ll(part.Inode); err2 != nil {
log.LogWarnf("CompleteMultipart: delete part inode fail: volume(%v) multipartID(%v) part(%v) err(%v)",
v.name, multipartID, part, err2)
}
}
//discard part inodes
// discard part inodes
for discardedInode, partNum := range discardedPartInodes {
log.LogDebugf("CompleteMultipart: discard part number(%v)", partNum)
if _, err = v.mw.InodeUnlink_ll(discardedInode); err != nil {
log.LogWarnf("CompleteMultipart: unlink inode fail: volume(%v) inode(%v) err(%v)",
v.name, discardedInode, err)
log.LogWarnf("CompleteMultipart: discard part: volume(%v) multipartID(%v) partNum(%v) inode(%v)",
v.name, multipartID, partNum, discardedInode)
if _, err2 = v.mw.InodeUnlink_ll(discardedInode); err2 != nil {
log.LogWarnf("CompleteMultipart: unlink inode fail: volume(%v) multipartID(%v) inode(%v) err(%v)",
v.name, multipartID, discardedInode, err2)
}
}
log.LogDebugf("CompleteMultipart: meta complete multipart: volume(%v) multipartID(%v) path(%v) parentID(%v) inode(%v) etagValue(%v)",
v.name, multipartID, path, parentId, finalInode.Inode, etagValue)
// create file info
fInfo := &FSFileInfo{
Path: path,
@ -1285,12 +1286,6 @@ func (v *Volume) CompleteMultipart(path, multipartID string, multipartInfo *prot
Inode: finalInode.Inode,
}
// apply new inode to dentry
err = v.applyInodeToDEntry(parentId, filename, completeInodeInfo.Inode)
if err != nil {
log.LogErrorf("CompleteMultipart: apply new inode to dentry fail, parent id (%v), file name(%v), inode(%v)",
parentId, filename, completeInodeInfo.Inode)
}
return fInfo, nil
}
@ -1570,26 +1565,26 @@ func (v *Volume) ReadFile(path string, writer io.Writer, offset, size uint64) er
}
func (v *Volume) ObjectMeta(path string) (info *FSFileInfo, xattr *proto.XAttrInfo, err error) {
// process path
var inode uint64
var mode os.FileMode
var inoInfo *proto.InodeInfo
var retry = 0
for {
for {
if _, inode, _, mode, err = v.recursiveLookupTarget(path); err != nil {
log.LogErrorf("ObjectMeta: recursive look up path fail: volume(%v) path(%v) err(%v)",
v.name, path, err)
return
}
inoInfo, err = v.mw.InodeGet_ll(inode)
if err == syscall.ENOENT && retry < MaxRetry {
retry++
continue
}
if err != nil {
log.LogErrorf("ObjectMeta: get inode fail: volume(%v) path(%v) inode(%v) retry(%v) err(%v)", v.name, path, inode, retry, err)
log.LogErrorf("ObjectMeta: get inode fail: volume(%v) path(%v) inode(%v) retry(%v) err(%v)",
v.name, path, inode, retry, err)
return
}
break