Skip to content

feat(redundancy): add redundancy level configuration for smoke check #556

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gacevicljubisa merged 12 commits into from
Mar 31, 2026
Merged

feat(redundancy): add redundancy level configuration for smoke check #556

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e63ce38
feat(redundancy): add redundancy level configuration for smoke check
akrem-chabchoub Jan 2, 2026
08d39c4
feat(redundancy): add redundancy level configuration to download
akrem-chabchoub Jan 2, 2026
199b519
feat(redundancy): update redundancy level configuration to support mu…
akrem-chabchoub Feb 6, 2026
a00ad6c
refactor(redundancy): remove deprecated r-level configuration in favo…
akrem-chabchoub Feb 17, 2026
0dae27d
Merge branch 'master' of github.com:ethersphere/beekeeper into feat/s…
akrem-chabchoub Feb 17, 2026
a9b0600
fix(api): update header variable name for redundancy level in API req…
akrem-chabchoub Mar 8, 2026
e801457
fix: update redundancy level handling to use pointers for options
akrem-chabchoub Mar 9, 2026
c14ea9b
chore(smoke): remove logging of redundancy levels in smoke check
akrem-chabchoub Mar 9, 2026
5d5d384
feat(smoke): add redundancy level and file size dimensions to metrics…
gacevicljubisa Mar 12, 2026
1420fcf
fix: simplify redundancy level checks by removing direct comparison t…
akrem-chabchoub Mar 12, 2026
47f4a1f
Merge branch 'master' of github.com:ethersphere/beekeeper into feat/s…
akrem-chabchoub Mar 12, 2026
5581575
fix: revert back changed metrics
gacevicljubisa Mar 12, 2026
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
1 change: 1 addition & 0 deletions config/local.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,7 @@ checks:
download-timeout: 1m
iteration-wait: 5m
duration: 10m
r-levels: [0, 2, 4]
timeout: 11m
type: smoke
ci-load:
Expand Down
6 changes: 6 additions & 0 deletions pkg/bee/api/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import (
"net/url"
"strconv"
"strings"

"github.com/ethersphere/bee/v2/pkg/file/redundancy"
)

const (
Expand All @@ -32,6 +34,7 @@ const (
swarmFeedIndexNextHeader = "Swarm-Feed-Index-Next"
swarmIndexDocumentHeader = "Swarm-Index-Document"
swarmErrorDocumentHeader = "Swarm-Error-Document"
redundancyLevelHeader = "Swarm-Redundancy-Level"
Comment thread
akrem-chabchoub marked this conversation as resolved.
Outdated
)

// Client manages communication with the Bee API.
Expand Down Expand Up @@ -223,6 +226,9 @@ func (c *Client) requestDataGetHeader(ctx context.Context, method, path string,
if opts != nil && opts.Cache != nil {
req.Header.Set(swarmCacheDownloadHeader, strconv.FormatBool(*opts.Cache))
}
if opts != nil && opts.RLevel != redundancy.NONE {
req.Header.Set(redundancyLevelHeader, strconv.Itoa(int(opts.RLevel)))
}
if opts != nil && opts.RedundancyFallbackMode != nil {
req.Header.Set(swarmRedundancyFallbackMode, strconv.FormatBool(*opts.RedundancyFallbackMode))
}
Expand Down
5 changes: 5 additions & 0 deletions pkg/bee/api/bytes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"net/http"
"strconv"

"github.com/ethersphere/bee/v2/pkg/file/redundancy"
"github.com/ethersphere/bee/v2/pkg/swarm"
)

Expand Down Expand Up @@ -34,6 +35,10 @@ func (b *BytesService) Upload(ctx context.Context, data io.Reader, o UploadOptio
}
h.Add(deferredUploadHeader, strconv.FormatBool(!o.Direct))
h.Add(postageStampBatchHeader, o.BatchID)
if o.RLevel != redundancy.NONE {
h.Add(redundancyLevelHeader, strconv.Itoa(int(o.RLevel)))
}

err := b.client.requestWithHeader(ctx, http.MethodPost, "/"+apiVersion+"/bytes", h, data, &resp)
return resp, err
}
7 changes: 6 additions & 1 deletion pkg/bee/api/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
package api

import "github.com/ethersphere/bee/v2/pkg/swarm"
import (
"github.com/ethersphere/bee/v2/pkg/file/redundancy"
"github.com/ethersphere/bee/v2/pkg/swarm"
)

type UploadOptions struct {
Act bool
Expand All @@ -9,6 +12,7 @@ type UploadOptions struct {
BatchID string
Direct bool
ActHistoryAddress swarm.Address
RLevel redundancy.Level
Comment thread
akrem-chabchoub marked this conversation as resolved.
Outdated

// Dirs
IndexDocument string
Expand All @@ -21,6 +25,7 @@ type DownloadOptions struct {
ActPublicKey *swarm.Address
ActTimestamp *uint64
Cache *bool
RLevel redundancy.Level
Comment thread
akrem-chabchoub marked this conversation as resolved.
Outdated
RedundancyFallbackMode *bool
OnlyRootChunk *bool
}
5 changes: 3 additions & 2 deletions pkg/check/load/load.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"sync"
"time"

"github.com/ethersphere/bee/v2/pkg/file/redundancy"
"github.com/ethersphere/bee/v2/pkg/swarm"
"github.com/ethersphere/beekeeper/pkg/bee"
"github.com/ethersphere/beekeeper/pkg/beekeeper"
Expand Down Expand Up @@ -203,7 +204,7 @@ func (c *Check) run(ctx context.Context, cluster orchestration.Cluster, o Option

c.logger.WithField("batch_id", batchID).Infof("node %s: using batch", uploader.Name())

address, duration, err = test.Upload(ctx, uploader, txData, batchID)
address, duration, err = test.Upload(ctx, uploader, txData, batchID, redundancy.NONE)
if err != nil {
c.metrics.UploadErrors.WithLabelValues(sizeLabel).Inc()
c.logger.Errorf("upload failed: %v", err)
Expand Down Expand Up @@ -246,7 +247,7 @@ func (c *Check) run(ctx context.Context, cluster orchestration.Cluster, o Option

c.metrics.DownloadAttempts.WithLabelValues(sizeLabel).Inc()

rxData, rxDuration, err = test.Download(ctx, downloader, address)
rxData, rxDuration, err = test.Download(ctx, downloader, address, redundancy.NONE)
if err != nil {
c.metrics.DownloadErrors.WithLabelValues(sizeLabel).Inc()
c.logger.Errorf("download failed for size %d: %v", contentSize, err)
Expand Down
Loading
Loading