Skip to content

Fix clean_docker_image_cache.py detection of image pushes. #6151

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

Merged
edgchen1 merged 1 commit into from
Dec 17, 2020
Merged

Fix clean_docker_image_cache.py detection of image pushes. #6151

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 17 additions & 13 deletions tools/ci_build/clean_docker_image_cache.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,19 +112,23 @@ def parse_timestamp(timestamp_str):
def parse_log_line(line, min_datetime):
entry = json.loads(line)

for field_name, expected_value in [
def check_time(value):
timestamp = parse_timestamp(value)
return timestamp is not None and timestamp >= min_datetime

for field_name, expected_value_or_checker in [
("category", "ContainerRegistryRepositoryEvents"),
("operationName", lambda value: value in ["Pull", "Push"]),
("resultType", "HttpStatusCode"),
("resultDescription", "200")]:
if entry.get(field_name) != expected_value:
return None

timestamp = parse_timestamp(entry.get("time", ""))
if timestamp is None or timestamp < min_datetime:
return None

if entry.get("operationName") not in ["Pull", "Push"]:
return None
("resultDescription", lambda value: value in ["200", "201"]),
("time", check_time)]:
value = entry.get(field_name, "")
if callable(expected_value_or_checker):
if not expected_value_or_checker(value):
return None
else:
if value != expected_value_or_checker:
return None

props = entry.get("properties", {})
repo, digest = props.get("repository"), props.get("digest")
Expand Down Expand Up @@ -184,8 +188,8 @@ def clean_images(container_registry, image_names, az_path):
let cache_min_access_count = 1;
ContainerRegistryRepositoryEvents
| where TimeGenerated >= ago(cache_history)
| where OperationName in ("Push", "Pull")
| where ResultDescription == "200"
| where OperationName in ("Pull", "Push")
| where ResultDescription in ("200", "201")
| summarize AccessCount = count() by Repository, Digest
| where AccessCount >= cache_min_access_count
| project Repository, Digest
Expand Down