Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Scale itp calculation based on total throughput of user #1831

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Scale itp calculation based on total throughput of user #1831

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b83d765
Scale itp calculation based on total TP instead of active runs count.
XInTheDark Oct 8, 2023
e577fda
Use itp instead of tp.
XInTheDark Oct 8, 2023
5e95d78
Update formula
XInTheDark Oct 8, 2023
0455583
count is at least 1.0
XInTheDark Oct 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions server/fishtest/rundb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,7 @@ def get_results(self, run, save_run=True):

return results

def calc_itp(self, run, count):
def calc_itp(self, run, total_tp):
itp = run["args"]["throughput"]
itp = max(min(itp, 500), 1)

Expand Down Expand Up @@ -668,9 +668,12 @@ def calc_itp(self, run, count):
itp *= bonus

# Malus for too many active runs
itp *= 36.0 / (36.0 + count * count)
# We scale based on total TP across all runs from this user
count = max(total_tp / 100.0, 1.0)
capped_count = min(count, 6.0) # cap at total 300 itp per user
itp *= 36.0 / (36.0 + capped_count * capped_count) * (capped_count / count)

run["args"]["itp"] = itp
return itp

def update_workers_cores(self, run):
workers = cores = 0
Expand Down Expand Up @@ -767,19 +770,21 @@ def sync_request_task(self, worker_info):
if runs_finished or time.time() > self.task_time + 60:
print("Request_task: refresh queue", flush=True)

# list user names for active runs
# list user names and ITP for active runs
user_active = []
for r in self.get_unfinished_runs_id():
run = self.get_run(r["_id"])
if any(task["active"] for task in reversed(run["tasks"])):
user_active.append(run["args"].get("username"))
user_active.append((run["args"].get("username"), run["args"].get("throughput")))

# now compute their itp
# now compute and update their itp
self.task_runs = []
for r in self.get_unfinished_runs_id():
run = self.get_run(r["_id"])
self.update_workers_cores(run)
self.calc_itp(run, user_active.count(run["args"].get("username")))
run_user = run["args"].get("username")
total_tp = sum([tp for user, tp in user_active if user == run_user])
run["args"]["itp"] = self.calc_itp(run, total_tp)
self.task_runs.append(run)
self.task_time = time.time()

Expand Down