TrueCloudLab/frostfs-sdk-go
29
0
Fork 21
Code Issues 29 Pull requests 2 Releases Activity Actions

[#268] client: Fix sequential PayloadPatch calls

Browse source 
* The flag 'firstPayloadPatch' keeps its state after first
  `PatchPayload` that make other calls incorrectly set patch
  ranges.

Signed-off-by: Airat Arifullin <a.arifullin@yadro.com>
This commit is contained in:
Airat Arifullin 2024-09-12 15:09:01 +03:00
parent 7d84d104fb
commit f0c599d06d
2 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
client/object_patch.go
View file

@ -106,7 +106,6 @@ func (c *Client) ObjectPatchInit(ctx context.Context, prm PrmObjectPatch) (Objec
} }
objectPatcher.client = c objectPatcher.client = c
objectPatcher.stream = stream objectPatcher.stream = stream
objectPatcher.firstPatchPayload = true
if prm.MaxChunkLength > 0 { if prm.MaxChunkLength > 0 {
objectPatcher.maxChunkLen = prm.MaxChunkLength objectPatcher.maxChunkLen = prm.MaxChunkLength
@ -154,8 +153,6 @@ type objectPatcher struct {
respV2 v2object.PatchResponse respV2 v2object.PatchResponse
maxChunkLen int maxChunkLen int
firstPatchPayload bool
} }
func (x *objectPatcher) PatchAttributes(_ context.Context, newAttrs []object.Attribute, replace bool) bool { func (x *objectPatcher) PatchAttributes(_ context.Context, newAttrs []object.Attribute, replace bool) bool {
@ -171,7 +168,7 @@ func (x *objectPatcher) PatchPayload(_ context.Context, rng *object.Range, paylo
buf := make([]byte, x.maxChunkLen) buf := make([]byte, x.maxChunkLen)
for { for patchIter := 0; ; patchIter++ {
n, err := payloadReader.Read(buf) n, err := payloadReader.Read(buf)
if err != nil && err != io.EOF { if err != nil && err != io.EOF {
x.err = fmt.Errorf("read payload: %w", err) x.err = fmt.Errorf("read payload: %w", err)
@ -182,8 +179,7 @@ func (x *objectPatcher) PatchPayload(_ context.Context, rng *object.Range, paylo
} }
rngPart := object.NewRange() rngPart := object.NewRange()
if x.firstPatchPayload { if patchIter == 0 {
x.firstPatchPayload = false
rngPart.SetOffset(offset) rngPart.SetOffset(offset)
rngPart.SetLength(rng.GetLength()) rngPart.SetLength(rng.GetLength())
} else { } else {

11
client/object_patch_test.go
View file

@ -170,12 +170,11 @@ func TestObjectPatcher(t *testing.T) {
pk, _ := ecdsa.GenerateKey(elliptic.P256(), rand.Reader) pk, _ := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
patcher := objectPatcher{ patcher := objectPatcher{
client: &Client{}, client: &Client{},
stream: m, stream: m,
addr: oidtest.Address(), addr: oidtest.Address(),
key: pk, key: pk,
maxChunkLen: test.maxChunkLen, maxChunkLen: test.maxChunkLen,
firstPatchPayload: true,
} }
success := patcher.PatchAttributes(context.Background(), nil, false) success := patcher.PatchAttributes(context.Background(), nil, false)