Merge pull request #409 from isucon/feature/fix-scenario-panic

guard basic viewer rand source
isucon · Nov 25, 2023 · 7bb0ffa · 7bb0ffa
2 parents 5aed969 + 939c809
commit 7bb0ffa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/bench/cmd/bench/supervise.go b/bench/cmd/bench/supervise.go
@@ -137,6 +137,10 @@ func execBench(ctx context.Context, job *Job) (*Result, error) {
 		benchOptions = append(benchOptions, "--enable-ssl")
 		benchOptions = append(benchOptions, "--target", "https://pipe.u.isucon.dev:443")
 	}
+	for _, server := range job.Servers {
+		benchOptions = append(benchOptions, "--webapp")
+		benchOptions = append(benchOptions, server)
+	}
 	log.Printf("benchmark options = %+v\n", benchOptions)
 
 	var stdout, stderr bytes.Buffer

diff --git a/bench/scenario/viewer.go b/bench/scenario/viewer.go
@@ -5,14 +5,18 @@ import (
 	"errors"
 	"math/rand"
 	"net/http"
+	"sync"
 
 	"github.com/isucon/isucon13/bench/internal/bencherror"
 	"github.com/isucon/isucon13/bench/internal/scheduler"
 	"github.com/isucon/isucon13/bench/isupipe"
 	"go.uber.org/zap"
 )
 
-var basicViewerScenarioRandSource = rand.New(rand.NewSource(63877281473681))
+var (
+	basicViewerScenarioRandSourceMu sync.Mutex
+	basicViewerScenarioRandSource = rand.New(rand.NewSource(63877281473681))
+)
 
 func BasicViewerScenario(
 	ctx context.Context,
@@ -21,7 +25,9 @@ func BasicViewerScenario(
 	livestreamPool *isupipe.LivestreamPool,
 ) error {
 	lgr := zap.S()
+	basicViewerScenarioRandSourceMu.Lock()
 	n := basicViewerScenarioRandSource.Int()
+	basicViewerScenarioRandSourceMu.Unlock()
 
 	lgr.Info("basic viewer scenario")
 	client, err := viewerPool.Get(ctx)