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(client): enable Datanode with version 3.3.2 compatible with client 3.4.0

Browse Source 
Signed-off-by: leonrayang <chl696@sina.com>
This commit is contained in:
leonrayang 2024-10-15 22:16:40 +08:00 committed by AmazingChi
parent 0647717f79
commit fc71116a51
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sdk/data/stream/packet.go
View File

@ -99,7 +99,7 @@ func NewOverwriteByAppendPacket(dp *wrapper.DataPartition, extentID uint64, exte
}
// NewOverwritePacket returns a new overwrite packet.
func NewOverwritePacket(dp *wrapper.DataPartition, extentID uint64, extentOffset int, inode uint64, fileOffset int) *Packet {
func NewOverwritePacket(dp *wrapper.DataPartition, extentID uint64, extentOffset int, inode uint64, fileOffset int, isSnap bool) *Packet {
p := new(Packet)
p.PartitionID = dp.PartitionID
p.Magic = proto.ProtoMagic
@ -110,7 +110,11 @@ func NewOverwritePacket(dp *wrapper.DataPartition, extentID uint64, extentOffset
p.Arg = nil
p.ArgLen = 0
p.RemainingFollowers = 0
p.Opcode = proto.OpRandomWriteVer // proto.OpRandomWrite
if isSnap {
p.Opcode = proto.OpRandomWriteVer // proto.OpRandomWrite
} else {
p.Opcode = proto.OpRandomWrite // proto.OpRandomWrite
}
p.inode = inode
p.KernelOffset = uint64(fileOffset)
p.Data, _ = proto.Buffers.Get(util.BlockSize)

3
sdk/data/stream/stream_writer.go
View File

@ -622,7 +622,8 @@ func (s *Streamer) doOverwrite(req *ExtentRequest, direct bool) (total int, err
sc := NewStreamConn(dp, false, s.client.streamRetryTimeout)
for total < size {
reqPacket := NewOverwritePacket(dp, req.ExtentKey.ExtentId, offset-ekFileOffset+total+ekExtOffset, s.inode, offset)
reqPacket := NewOverwritePacket(dp, req.ExtentKey.ExtentId, offset-ekFileOffset+total+ekExtOffset,
s.inode, offset, s.client.dataWrapper.IsSnapshotEnabled)
if s.client.dataWrapper.IsSnapshotEnabled {
reqPacket.VerSeq = s.verSeq
reqPacket.VerList = make([]*proto.VolVersionInfo, len(s.client.multiVerMgr.verList.VerList))