Merge pull request #400 from isucon/fix/go-json

RunViolationCheckerとめる, icon取得数を制限
isucon · Nov 24, 2023 · db94374 · db94374
2 parents 5a8617d + d366cf7
commit db94374
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/bench/cmd/bench/benchmarker.go b/bench/cmd/bench/benchmarker.go
@@ -11,7 +11,6 @@ import (
 
 	"github.com/isucon/isucandar/agent"
 	"github.com/isucon/isucandar/score"
-	"github.com/isucon/isucon13/bench/internal/bencherror"
 	"github.com/isucon/isucon13/bench/internal/benchscore"
 	"github.com/isucon/isucon13/bench/internal/config"
 	"github.com/isucon/isucon13/bench/internal/scheduler"
@@ -352,7 +351,7 @@ func (b *benchmarker) run(ctx context.Context) error {
 
 	b.runClientProviders(ctx)
 
-	violateCh := bencherror.RunViolationChecker(ctx)
+	violateCh := make(chan error) // とめておく bencherror.RunViolationChecker(ctx)
 
 	loadAttackHTTPClient := b.loadAttackHTTPClient()
 	// FIXME: LIMITは負荷をみて調整したい

diff --git a/bench/scenario/viewer.go b/bench/scenario/viewer.go
@@ -93,9 +93,12 @@ func BasicViewerScenario(
 			lgr.Warnf("view: failed to get livecomments: %s\n", err.Error())
 			continue
 		} else {
-			for _, comment := range comments {
+			for i, comment := range comments {
 				client.GetIcon(ctx, comment.User.Name, isupipe.WithETag(comment.User.IconHash))
 				// icon取得はエラーになっても気にしない
+				if i > 10 { // 全部取ると多すぎるので10件まで
+					break
+				}
 			}
 		}