xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix issue #659

This commit is contained in:
Jeff Tao 2019-10-29 19:20:51 +08:00
parent d4bcce0d8f
commit dea69ae5d2
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/system/src/vnodeFile.c
View File

@ -770,7 +770,10 @@ _again:
if (pMeter->finalNumOfBlocks > 0) { if (pMeter->finalNumOfBlocks > 0) {
pHeader->compInfoOffset = pMeter->compInfoOffset; pHeader->compInfoOffset = pMeter->compInfoOffset;
compInfoOffset += sizeof(SCompInfo) + pMeter->finalNumOfBlocks * sizeof(SCompBlock) + sizeof(TSCKSUM); compInfoOffset += sizeof(SCompInfo) + pMeter->finalNumOfBlocks * sizeof(SCompBlock) + sizeof(TSCKSUM);
} else {
pHeader->compInfoOffset = 0;
} }
dTrace("vid:%d sid:%d id:%s, oldBlocks:%d numOfBlocks:%d compInfoOffset:%d", pObj->vnode, pObj->sid, pObj->meterId, dTrace("vid:%d sid:%d id:%s, oldBlocks:%d numOfBlocks:%d compInfoOffset:%d", pObj->vnode, pObj->sid, pObj->meterId,
pMeter->oldNumOfBlocks, pMeter->finalNumOfBlocks, compInfoOffset); pMeter->oldNumOfBlocks, pMeter->finalNumOfBlocks, compInfoOffset);
} }
@ -1890,4 +1893,4 @@ _broken_exit:
tfree(pBlocks); tfree(pBlocks);
tfree(pHeader); tfree(pHeader);
return -1; return -1;
} }

12
src/system/src/vnodeImport.c
View File

@ -203,9 +203,15 @@ int vnodeOpenFileForImport(SImportInfo *pImport, char *payload, SHeadInfo *pHinf
return -1; return -1;
} }
pHinfo->compInfoOffset = pHinfo->headList[pObj->sid].compInfoOffset; if (pHinfo->compInfo.uid == pObj->uid) {
pHinfo->leftOffset = pHinfo->headList[pObj->sid].compInfoOffset + sizeof(SCompInfo); pHinfo->compInfoOffset = pHinfo->headList[pObj->sid].compInfoOffset;
} else { pHinfo->leftOffset = pHinfo->headList[pObj->sid].compInfoOffset + sizeof(SCompInfo);
} else {
pHinfo->headList[pObj->sid].compInfoOffset = 0;
}
}
if ( pHinfo->headList[pObj->sid].compInfoOffset == 0 ) {
memset(&pHinfo->compInfo, 0, sizeof(SCompInfo)); memset(&pHinfo->compInfo, 0, sizeof(SCompInfo));
pHinfo->compInfo.uid = pObj->uid; pHinfo->compInfo.uid = pObj->uid;