deepcrayon/lila
deepcrayon/lila
1
0
Fork 0
Code Releases Activity

just drop auto analysis requests silenty when queue is full

Browse source
This commit is contained in:
Thibault Duplessis 2015-06-27 19:10:08 +02:00
parent 5140740a0c
commit 3b16ffac99
4 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/Ai.scala
View file

@ -35,8 +35,10 @@ object Ai extends LilaController {
initialFen = get("initialFen", req), initialFen = get("initialFen", req),
requestedByHuman = getBool("human", req), requestedByHuman = getBool("human", req),
variant = requestVariant(req) variant = requestVariant(req)
).effectFold( ).effectFold({
err => WS.url(s"$replyToUrl/err").post(err.toString), case lila.ai.Queue.FullException => logwarn("Dropping analyse request, queue is full")
case err => WS.url(s"$replyToUrl/err").post(err.toString)
},
infos => WS.url(replyToUrl).post(lila.analyse.Info encodeList infos) infos => WS.url(replyToUrl).post(lila.analyse.Info encodeList infos)
) )
} }

14
modules/ai/src/main/Queue.scala
View file

@ -58,15 +58,15 @@ private[ai] final class Queue(config: Config) extends Actor {
tasks += Task(req, sender, timeout) tasks += Task(req, sender, timeout)
} }
case FullAnalReq(moves, fen, requestedByHuman, variant) if (requestedByHuman || tasks.size < maxTasks) => case FullAnalReq(moves, fen, human, variant) if (human || tasks.size < maxTasks) =>
val mrSender = sender val mrSender = sender
val size = moves.size val size = moves.size
val startedAtPly = fen.flatMap(chess.format.Forsyth.getPly) val startedAtPly = fen.flatMap(chess.format.Forsyth.getPly)
implicit val timeout = makeTimeout { implicit val timeout = makeTimeout {
if (requestedByHuman) 1.hour else 24.hours if (human) 1.hour else 24.hours
} }
val futures = (0 to size) map moves.take map { serie => val futures = (0 to size) map moves.take map { serie =>
self ? AnalReq(serie, fen, size, requestedByHuman, variant) mapTo manifest[Option[Evaluation]] self ? AnalReq(serie, fen, size, human, variant) mapTo manifest[Option[Evaluation]]
} }
Future.fold(futures)(Vector[Option[Evaluation]]())(_ :+ _) addFailureEffect { Future.fold(futures)(Vector[Option[Evaluation]]())(_ :+ _) addFailureEffect {
case e => mrSender ! Status.Failure(e) case e => mrSender ! Status.Failure(e)
@ -74,7 +74,11 @@ private[ai] final class Queue(config: Config) extends Actor {
mrSender ! Evaluation.toInfos(results.toList.map(_ | Evaluation.empty), moves, ~startedAtPly) mrSender ! Evaluation.toInfos(results.toList.map(_ | Evaluation.empty), moves, ~startedAtPly)
} }
case r: FullAnalReq => case r: FullAnalReq => sender ! Status.Failure(Queue.FullException)
sender ! Status.Failure(new Exception("analysis queue is full"))
} }
} }
object Queue {
case object FullException extends Exception("Analysis queue is full")
}

2
modules/ai/src/main/Server.scala
View file

@ -25,7 +25,7 @@ private[ai] final class Server(
implicit val timeout = makeTimeout { implicit val timeout = makeTimeout {
if (requestedByHuman) 1.hour else 24.hours if (requestedByHuman) 1.hour else 24.hours
} }
(queue ? FullAnalReq(uciMoves take config.analyseMaxPlies, initialFen map chess960Fen, requestedByHuman, variant)) mapTo manifest[List[Info]] queue ? FullAnalReq(uciMoves take config.analyseMaxPlies, initialFen map chess960Fen, requestedByHuman, variant) mapTo manifest[List[Info]]
} }
private def chess960Fen(fen: String) = (Forsyth << fen).fold(fen) { situation => private def chess960Fen(fen: String) = (Forsyth << fen).fold(fen) { situation =>

2
modules/ai/src/main/package.scala
View file

@ -1,3 +1,3 @@
package lila package lila
package object ai extends PackageObject with WithPlay package object ai extends PackageObject with WithPlay