Skip to content

Commit bad8dd1

Browse files
committed
satellite/metainfo: make SkipPendingObject behind feature flag
To make sure new functionality won't leak unintentionally. Change-Id: I5cbb3a9d2a8df264374ec3de2f09947f0372d6d3
1 parent 7d2c971 commit bad8dd1

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

satellite/metainfo/endpoint_object.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ func (endpoint *Endpoint) CommitObject(ctx context.Context, req *pb.ObjectCommit
443443

444444
TransmitEvent: endpoint.bucketEventing.Enabled(keyInfo.ProjectID, string(streamID.Bucket)),
445445

446-
SkipPendingObject: !streamID.MultipartObject,
446+
SkipPendingObject: !streamID.MultipartObject && endpoint.config.isNoPendingObjectUploadEnabled(keyInfo.ProjectID),
447447
}
448448
// uplink can send empty metadata with not empty key/nonce
449449
// we need to fix it on uplink side but that part will be

satellite/metainfo/endpoint_segment.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ func (endpoint *Endpoint) CommitSegment(ctx context.Context, req *pb.SegmentComm
482482
Pieces: pieces,
483483
Placement: storj.PlacementConstraint(streamID.Placement),
484484

485-
SkipPendingObject: !streamID.MultipartObject,
485+
SkipPendingObject: !streamID.MultipartObject && endpoint.config.isNoPendingObjectUploadEnabled(keyInfo.ProjectID),
486486

487487
MaxCommitDelay: maxCommitDelay,
488488
TestingUseMutations: endpoint.config.TestingCommitSegmentUseMutations,
@@ -628,7 +628,7 @@ func (endpoint *Endpoint) MakeInlineSegment(ctx context.Context, req *pb.Segment
628628

629629
InlineData: req.EncryptedInlineData,
630630

631-
SkipPendingObject: !streamID.MultipartObject,
631+
SkipPendingObject: !streamID.MultipartObject && endpoint.config.isNoPendingObjectUploadEnabled(keyInfo.ProjectID),
632632

633633
MaxCommitDelay: maxCommitDelay,
634634
})

0 commit comments

Comments
 (0)