Skip to content

fix: allow reclaiming of sites claimed over an hour ago #430

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

Open
adam-miller wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: allow reclaiming of sites claimed over an hour ago #430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
935896e
fix: allow reclaiming of sites claimed over an hour ago
adam-miller Dec 16, 2025
ab27094
chore: note that max_claimed_sites is optional
adam-miller Dec 16, 2025
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
10 changes: 6 additions & 4 deletions brozzler/frontier.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,18 @@ def filter_claimable_site_ids(
):
is_claimable = True

# or site has been disclaimed more than an hour ago
# or site has been claimed more than an hour ago
if "last_claimed" in site and site["last_claimed"] <= (
now - datetime.timedelta(hours=1)
):
is_claimable = True

# Count number of claimed sites per job_id (optional field)
# Count number of claimed sites per job_id (ignoring sites claimed over an hour ago)
Comment thread
mistydemeo marked this conversation as resolved.
# for enforcing the optional max_claimed_sites per job
if site["claimed"] and "max_claimed_sites" in site and "job_id" in site:
job_id = site["job_id"]
job_counts[job_id] = job_counts.get(job_id, 0) + 1
if not is_claimable:
job_id = site["job_id"]
job_counts[job_id] = job_counts.get(job_id, 0) + 1

if is_claimable:
claimable_sites.append(site)
Expand Down
20 changes: 16 additions & 4 deletions tests/test_frontier.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@

import doublethink
import pytest
import rethinkdb as rdb

import brozzler.cli

Expand All @@ -35,6 +36,7 @@
args = arg_parser.parse_args([])
args.log_level = logging.INFO
brozzler.cli.configure_logging(args)
r = rdb.RethinkDB()


@pytest.fixture(scope="module")
Expand Down Expand Up @@ -953,10 +955,20 @@ def test_max_claimed_sites(rethinker):
sites = list(frontier.job_sites(job.id))
assert len(sites) == 5

claimed_sites = frontier.claim_sites(1)
assert len(claimed_sites) == 1
claimed_sites = frontier.claim_sites(3)
assert len(claimed_sites) == 2
claimed_sites_1 = frontier.claim_sites(1)
assert len(claimed_sites_1) == 1
claimed_sites_2 = frontier.claim_sites(3)
assert len(claimed_sites_2) == 2
with pytest.raises(brozzler.NothingToClaim):
frontier.claim_sites(3)

# if we "wait" an hour, we can reclaim
rr.table("sites").get_all(
r.args([item["id"] for item in (claimed_sites_1 + claimed_sites_2)])
).update({"claimed": True, "last_claimed": r.now().sub(61 * 60)}).run()

claimed_sites_3 = frontier.claim_sites(3)
assert len(claimed_sites_3) == 3
with pytest.raises(brozzler.NothingToClaim):
frontier.claim_sites(3)

Expand Down