Skip to content

Commit d3ac53b

Browse files
Merge branch 'master' into fastfast
2 parents 2cf0648 + 0a41390 commit d3ac53b

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

src/clusterfuzz/_internal/cron/schedule_corpus_pruning.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,13 @@
1717
from clusterfuzz._internal.base import utils
1818
from clusterfuzz._internal.datastore import data_types
1919
from clusterfuzz._internal.datastore import fuzz_target_utils
20+
from clusterfuzz._internal.datastore import ndb_utils
2021
from clusterfuzz._internal.metrics import logs
2122

2223

2324
def get_tasks_to_schedule():
2425
"""Return (task_target, job_name, queue_name) arguments to schedule a task."""
25-
for job in data_types.Job.query():
26+
for job in ndb_utils.get_all_from_query(data_types.Job.query()):
2627
if not utils.string_is_true(job.get_environment().get('CORPUS_PRUNE')):
2728
continue
2829

src/clusterfuzz/_internal/cron/schedule_fuzz.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ def schedule_fuzz_tasks() -> bool:
201201
project = batch_config.get('project')
202202
available_cpus = get_available_cpus(project, region)
203203
# TODO(metzman): Remove this as we move from experimental code to production.
204-
available_cpus = min(available_cpus, 1000)
204+
available_cpus = min(available_cpus, 2500)
205205
fuzz_tasks = get_fuzz_tasks(available_cpus)
206206
if not fuzz_tasks:
207207
logs.error('No fuzz tasks found to schedule.')

src/clusterfuzz/_internal/google_cloud_utils/storage.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1352,6 +1352,11 @@ def _sign_urls_for_existing_file(
13521352
return (download_url, delete_url)
13531353

13541354

1355+
def _mappable_sign_urls_for_existing_file(url_and_include_delete_urls):
1356+
url, include_delete_urls = url_and_include_delete_urls
1357+
return _sign_urls_for_existing_file(url, include_delete_urls)
1358+
1359+
13551360
def sign_urls_for_existing_files(urls,
13561361
include_delete_urls) -> List[Tuple[str, str]]:
13571362
logs.info('Signing URLs for existing files.')

0 commit comments

Comments
 (0)