Commit 89521b32 authored by droger's avatar droger Committed by Commit bot

tools/android/loading Fix precision and formatting issues in frontend

Fix rounding issue:
int(x + 0.5) does not round up correctly.
This should be round(x+0.5) or math.ceil(x).

Fix formatting issue: the timeout is a float, and should be printed
using %f instead of %i.

Review-Url: https://codereview.chromium.org/2037373003
Cr-Commit-Position: refs/heads/master@{#398277}
parent db571fbd
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
# found in the LICENSE file. # found in the LICENSE file.
import logging import logging
import math
import os import os
import sys import sys
import time import time
...@@ -359,8 +360,8 @@ def StartFromJsonString(http_body_str): ...@@ -359,8 +360,8 @@ def StartFromJsonString(http_body_str):
# Compute the number of required instances if not specified. # Compute the number of required instances if not specified.
if not task.BackendParams().get('instance_count'): if not task.BackendParams().get('instance_count'):
target_parallel_duration_s = 1800.0 # 30 minutes. target_parallel_duration_s = 1800.0 # 30 minutes.
task.BackendParams()['instance_count'] = int( task.BackendParams()['instance_count'] = math.ceil(
sequential_duration_s / target_parallel_duration_s + 0.5) # Rounded up. sequential_duration_s / target_parallel_duration_s)
# Check the instance quotas. # Check the instance quotas.
clovis_logger.info( clovis_logger.info(
...@@ -383,7 +384,7 @@ def StartFromJsonString(http_body_str): ...@@ -383,7 +384,7 @@ def StartFromJsonString(http_body_str):
# Timeout is at least 1 hour. # Timeout is at least 1 hour.
task.BackendParams()['timeout_hours'] = max(1, 5 * expected_duration_h) task.BackendParams()['timeout_hours'] = max(1, 5 * expected_duration_h)
clovis_logger.info( clovis_logger.info(
'Timeout delay: %i hours. ' % task.BackendParams()['timeout_hours']) 'Timeout delay: %.1f hours. ' % task.BackendParams()['timeout_hours'])
if not EnqueueTasks(sub_tasks, task_tag): if not EnqueueTasks(sub_tasks, task_tag):
return Render('Task creation failed.', memory_logs) return Render('Task creation failed.', memory_logs)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment