Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions api/clients/v2/payloaddispersal/payload_disperser.go
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,13 @@ func (pd *PayloadDisperser) SendPayload(

probe.SetStage("QUEUED")

timeoutCtx, cancel = context.WithTimeout(ctx, pd.config.BlobCertifiedTimeout)
timeoutCtx, cancel = context.WithTimeout(ctx, pd.config.BlobCompleteTimeout)
defer cancel()
blobStatusReply, err := pd.pollBlobStatusUntilCertified(timeoutCtx, blobKey, blobStatus.ToProfobuf(), probe)
blobStatusReply, err := pd.pollBlobStatusUntilComplete(timeoutCtx, blobKey, blobStatus.ToProfobuf(), probe)
if err != nil {
return nil, fmt.Errorf("poll blob status until certified: %w", err)
return nil, fmt.Errorf("poll blob status until complete: %w", err)
}
pd.logger.Debug("Blob status CERTIFIED", "blobKey", blobKey.Hex())
pd.logger.Debug("Blob status COMPLETE", "blobKey", blobKey.Hex())

probe.SetStage("build_cert")

Expand Down Expand Up @@ -152,11 +152,11 @@ func (pd *PayloadDisperser) Close() error {
return nil
}

// pollBlobStatusUntilCertified polls the disperser for the status of a blob that has been dispersed
// pollBlobStatusUntilComplete polls the disperser for the status of a blob that has been dispersed
//
// This method will only return a non-nil BlobStatusReply if the blob is reported to be CERTIFIED prior to the timeout.
// This method will only return a non-nil BlobStatusReply if the blob is reported to be COMPLETE prior to the timeout.
// In all other cases, this method will return a nil BlobStatusReply, along with an error describing the failure.
func (pd *PayloadDisperser) pollBlobStatusUntilCertified(
func (pd *PayloadDisperser) pollBlobStatusUntilComplete(
ctx context.Context,
blobKey core.BlobKey,
initialStatus dispgrpc.BlobStatus,
Expand Down
12 changes: 6 additions & 6 deletions api/clients/v2/payloaddispersal/payload_disperser_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ type PayloadDisperserConfig struct {
// blob
DisperseBlobTimeout time.Duration

// BlobCertifiedTimeout is the duration after which the PayloadDisperser will time out, while polling
// the disperser for blob status, waiting for BlobStatus_CERTIFIED
BlobCertifiedTimeout time.Duration
// BlobCompleteTimeout is the duration after which the PayloadDisperser will time out, while polling
// the disperser for blob status, waiting for BlobStatus_COMPLETE
BlobCompleteTimeout time.Duration

// BlobStatusPollInterval is the tick rate for the PayloadDisperser to use, while polling the disperser with
// GetBlobStatus.
Expand All @@ -32,7 +32,7 @@ func getDefaultPayloadDisperserConfig() *PayloadDisperserConfig {
return &PayloadDisperserConfig{
PayloadClientConfig: *clients.GetDefaultPayloadClientConfig(),
DisperseBlobTimeout: 2 * time.Minute,
BlobCertifiedTimeout: 2 * time.Minute,
BlobCompleteTimeout: 2 * time.Minute,
BlobStatusPollInterval: 1 * time.Second,
ContractCallTimeout: 5 * time.Second,
}
Expand All @@ -47,8 +47,8 @@ func (dc *PayloadDisperserConfig) checkAndSetDefaults() error {
dc.DisperseBlobTimeout = defaultConfig.DisperseBlobTimeout
}

if dc.BlobCertifiedTimeout == 0 {
dc.BlobCertifiedTimeout = defaultConfig.BlobCertifiedTimeout
if dc.BlobCompleteTimeout == 0 {
dc.BlobCompleteTimeout = defaultConfig.BlobCompleteTimeout
}

if dc.BlobStatusPollInterval == 0 {
Expand Down
6 changes: 3 additions & 3 deletions test/v2/client/test_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,9 @@ func NewTestClient(
payloadClientConfig := clients.GetDefaultPayloadClientConfig()

payloadDisperserConfig := payloaddispersal.PayloadDisperserConfig{
PayloadClientConfig: *payloadClientConfig,
DisperseBlobTimeout: 1337 * time.Hour, // this suite enforces its own timeouts
BlobCertifiedTimeout: 1337 * time.Hour, // this suite enforces its own timeouts
PayloadClientConfig: *payloadClientConfig,
DisperseBlobTimeout: 1337 * time.Hour, // this suite enforces its own timeouts
BlobCompleteTimeout: 1337 * time.Hour, // this suite enforces its own timeouts
}
payloadDisperser, err := payloaddispersal.NewPayloadDisperser(
logger,
Expand Down
Loading