fix: use existing mutable batch

ethersphere · Oct 4, 2023 · e8d40a8 · e8d40a8
1 parent 655c050
commit e8d40a8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/pkg/bee/client.go b/pkg/bee/client.go
@@ -418,10 +418,11 @@ func (c *Client) GetOrCreateBatch(ctx context.Context, amount int64, depth uint6
 		if !b.Exists {
 			continue
 		}
-		max := 1 << (b.Depth - b.BucketDepth)
-		hasFreeSlots := b.Utilization < uint32(max)
+		if b.ImmutableFlag { // skip immutable batches
+			continue
+		}
 
-		if b.Usable && (b.BatchTTL == -1 || b.BatchTTL > 0) && hasFreeSlots {
+		if b.Usable && (b.BatchTTL == -1 || b.BatchTTL > 0) {
 			return b.BatchID, nil
 		}
 	}

diff --git a/pkg/check/smoke/smoke.go b/pkg/check/smoke/smoke.go
@@ -91,8 +91,6 @@ func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, opts int
 
 	time.Sleep(5 * time.Second) // Wait for the nodes to warmup.
 
-	batches := NewStore(o.MaxUseBatch)
-
 	test := &test{clients: clients, logger: c.logger}
 
 	for i := 0; true; i++ {
@@ -149,15 +147,12 @@ func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, opts int
 			txCtx, txCancel = context.WithTimeout(ctx, o.UploadTimeout)
 
 			c.metrics.BatchCreateAttempts.Inc()
-			batchID := batches.Get(txName)
-			if batchID == "" {
-				batchID, err = clients[txName].CreatePostageBatch(txCtx, o.PostageAmount, o.PostageDepth, "load-test", true)
-				if err != nil {
-					c.logger.Errorf("create new batch: %v", err)
-					c.metrics.BatchCreateErrors.Inc()
-					continue
-				}
-				batches.Store(txName, batchID)
+
+			batchID, err := clients[txName].GetOrCreateBatch(txCtx, o.PostageAmount, o.PostageDepth, "load-test")
+			if err != nil {
+				c.logger.Errorf("create new batch: %v", err)
+				c.metrics.BatchCreateErrors.Inc()
+				continue
 			}
 
 			c.metrics.UploadAttempts.Inc()