Merge pull request #411 from isucon/feature/inject-urls-for-livestream

Feature/inject urls for livestream
isucon · Nov 25, 2023 · 2b8e5b0 · 2b8e5b0
2 parents 4b03bda + aeedc63
commit 2b8e5b0
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 16 deletions.
diff --git a/bench/internal/bencherror/message.go b/bench/internal/bencherror/message.go
@@ -13,7 +13,7 @@ var ErrTimeout = errors.New("タイムアウトによりリクエスト失敗")
 // ベンチマーカー本体由来のエラー
 
 func NewInternalError(err error) error {
-	err = fmt.Errorf("[ベンチ本体のエラー] スタッフにのみ表示されます: %w", err)
+	err = fmt.Errorf("[致命的なエラー]: %w", err)
 	return WrapInternalError(SystemError, err)
 }
 

diff --git a/bench/internal/scheduler/reservation.go b/bench/internal/scheduler/reservation.go
@@ -2,6 +2,7 @@ package scheduler
 
 import (
 	"log"
+	"math/rand"
 	"time"
 
 	"github.com/biogo/store/interval"
@@ -26,6 +27,23 @@ func ConvertFromIntInterface(i []interval.IntInterface) ([]*Reservation, error)
 	return reservations, nil
 }
 
+type ReservationUrls struct {
+	ThumbnailUrl string
+	PlaylistUrl  string
+}
+
+var urls = []*ReservationUrls{
+	&ReservationUrls{ThumbnailUrl: "https://media.xiii.isucon.dev/BBB.webp", PlaylistUrl: "https://media.xiii.isucon.dev/bbb.m3u8"},
+	&ReservationUrls{ThumbnailUrl: "https://media.xiii.isucon.dev/timewarp.webp", PlaylistUrl: "https://media.xiii.isucon.dev/timewarp.m3u8"},
+	&ReservationUrls{ThumbnailUrl: "https://media.xiii.isucon.dev/yoru.webp", PlaylistUrl: "https://media.xiii.isucon.dev/yoru.m3u8"},
+	&ReservationUrls{ThumbnailUrl: "https://media.xiii.isucon.dev/isucon11_final.webp", PlaylistUrl: "https://media.xiii.isucon.dev/isucon11_final.m3u8"},
+	&ReservationUrls{ThumbnailUrl: "https://media.xiii.isucon.dev/isucon12_final_live.webp", PlaylistUrl: "https://media.xiii.isucon.dev/isucon12_final_live.m3u8"},
+	&ReservationUrls{ThumbnailUrl: "https://media.xiii.isucon.dev/isucon13.webp", PlaylistUrl: "https://media.xiii.isucon.dev/isucon13.m3u8"},
+	&ReservationUrls{ThumbnailUrl: "https://media.xiii.isucon.dev/isucon9.webp", PlaylistUrl: "https://media.xiii.isucon.dev/isucon9.m3u8"},
+	&ReservationUrls{ThumbnailUrl: "https://media.xiii.isucon.dev/hkd.webp", PlaylistUrl: "https://media.xiii.isucon.dev/hkd.m3u8"},
+	&ReservationUrls{ThumbnailUrl: "https://media.xiii.isucon.dev/ube.webp", PlaylistUrl: "https://media.xiii.isucon.dev/ube.m3u8"},
+}
+
 type Reservation struct {
 	// NOTE: id は、webappで割り振られるIDではなく、ReservationSchedulerが管理する上で利用するもの
 	id           int
@@ -48,14 +66,17 @@ func mustNewReservation(id int, title string, description string, startAtStr str
 		log.Fatalln(err)
 	}
 
+	urlIdx := rand.Intn(len(urls))
+	url := urls[urlIdx]
+
 	reservation := &Reservation{
 		id:           id,
 		Title:        title,
 		Description:  description,
 		StartAt:      startAt.Unix(),
 		EndAt:        endAt.Unix(),
-		PlaylistUrl:  playlistUrl,
-		ThumbnailUrl: thumbnailUrl,
+		PlaylistUrl:  url.PlaylistUrl,
+		ThumbnailUrl: url.ThumbnailUrl,
 	}
 
 	return reservation

diff --git a/bench/internal/scheduler/reservation_scheduler.go b/bench/internal/scheduler/reservation_scheduler.go
@@ -52,7 +52,7 @@ func mustNewReservationScheduler(baseAt int64, numSlots int64, hours int) *Reser
 
 	intervalTempertures, err := newIntervalTemperture(baseAt, numSlots, hours)
 	if err != nil {
-		lgr.Fatalf("failed to initiate interval temperture: %s\n", err.Error())
+		lgr.Warnf("failed to initiate interval temperture: %s\n", err.Error())
 	}
 	return &ReservationScheduler{
 		reservationPool:     []*Reservation{},
@@ -126,7 +126,7 @@ func (r *ReservationScheduler) GetHotShortReservation() (*Reservation, error) {
 
 		reservations, err := ConvertFromIntInterface(founds)
 		if err != nil {
-			lgr.Fatalf("GetHotShortReservation: failed to convert reservation: %s\n", err.Error())
+			lgr.Warnf("GetHotShortReservation: failed to convert reservation: %s\n", err.Error())
 			return nil, err
 		}
 
@@ -142,7 +142,7 @@ func (r *ReservationScheduler) GetHotShortReservation() (*Reservation, error) {
 		}
 	}
 
-	lgr.Fatal("GetHotShortReservation: failed to get reservation (not found)")
+	lgr.Warn("GetHotShortReservation: failed to get reservation (not found)")
 	return nil, ErrNoReservation
 }
 
@@ -171,7 +171,7 @@ func (r *ReservationScheduler) GetHotLongReservation() (*Reservation, error) {
 
 		reservations, err := ConvertFromIntInterface(founds)
 		if err != nil {
-			lgr.Fatalf("GetHotLongReservation: failed to convert reservation: %s\n", err.Error())
+			lgr.Warnf("GetHotLongReservation: failed to convert reservation: %s\n", err.Error())
 			return nil, err
 		}
 
@@ -187,7 +187,7 @@ func (r *ReservationScheduler) GetHotLongReservation() (*Reservation, error) {
 		}
 	}
 
-	lgr.Fatal("GetHotLongReservation: failed to get reservation (not found)")
+	lgr.Warn("GetHotLongReservation: failed to get reservation (not found)")
 	return nil, ErrNoReservation
 }
 
@@ -216,7 +216,7 @@ func (r *ReservationScheduler) GetColdShortReservation() (*Reservation, error) {
 
 		reservations, err := ConvertFromIntInterface(founds)
 		if err != nil {
-			lgr.Fatalf("GetColdShortReservation: failed to convert reservation: %s\n", err.Error())
+			lgr.Warnf("GetColdShortReservation: failed to convert reservation: %s\n", err.Error())
 			return nil, err
 		}
 
@@ -233,7 +233,7 @@ func (r *ReservationScheduler) GetColdShortReservation() (*Reservation, error) {
 		}
 	}
 
-	lgr.Fatal("GetColdShortReservation: failed to get reservation (not found)")
+	lgr.Warn("GetColdShortReservation: failed to get reservation (not found)")
 	return nil, ErrNoReservation
 }
 
@@ -262,7 +262,7 @@ func (r *ReservationScheduler) GetColdLongReservation() (*Reservation, error) {
 
 		reservations, err := ConvertFromIntInterface(founds)
 		if err != nil {
-			lgr.Fatalf("GetColdLongReservation: failed to convert reservation: %s\n", err.Error())
+			lgr.Warnf("GetColdLongReservation: failed to convert reservation: %s\n", err.Error())
 			return nil, err
 		}
 
@@ -279,7 +279,7 @@ func (r *ReservationScheduler) GetColdLongReservation() (*Reservation, error) {
 		}
 	}
 
-	lgr.Fatal("GetColdLongReservation: failed to get reservation (not found)")
+	lgr.Warn("GetColdLongReservation: failed to get reservation (not found)")
 	return nil, ErrNoReservation
 }
 

diff --git a/bench/isupipe/client_payment.go b/bench/isupipe/client_payment.go
@@ -32,9 +32,5 @@ func (c *Client) GetPaymentResult(ctx context.Context) (*PaymentResult, error) {
 		return nil, err
 	}
 
-	if err := ValidateResponse(req, paymentResp); err != nil {
-		return nil, err
-	}
-
 	return paymentResp, nil
 }