Skip to content
This repository was archived by the owner on Oct 21, 2022. It is now read-only.

Add retry for compatibility store #119

Merged
liyanhui1228 merged 8 commits into from
Sep 28, 2018
Merged

Add retry for compatibility store #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
abbb3c4
Add retry for compatibility store
liyanhui1228 Sep 27, 2018
011b894
fix
liyanhui1228 Sep 27, 2018
e7a39cb
Merge branch 'master' into retry
liyanhui1228 Sep 27, 2018
7a5fd69
Set logging level to info
liyanhui1228 Sep 27, 2018
e31be7d
Merge branch 'retry' of https://github.com/liyanhui1228/cloud-opensou…
liyanhui1228 Sep 27, 2018
9f8b0c4
Merge branch 'master' into retry
liyanhui1228 Sep 28, 2018
dc0c8b2
fix
liyanhui1228 Sep 28, 2018
e6f6242
Merge branch 'retry' of https://github.com/liyanhui1228/cloud-opensou…
liyanhui1228 Sep 28, 2018
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
11 changes: 6 additions & 5 deletions badge_server/badge_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,12 +410,13 @@ def run_check():
for py_ver in [2, 3]:
results = list(checker.get_pairwise_compatibility(
py_ver, pkg_sets))
logging.warning(results)
py_version = PY_VER_MAPPING[py_ver]

for res in results:
logging.warning(res)
status = res[0].get('result')
package = res[0].get('packages')[1]
res_item = res[0]
status = res_item.get('result')
package = res_item.get('packages')[1]
if status != 'SUCCESS':
# Ignore the package that not support for given py_ver
if package in \
Expand All @@ -424,8 +425,8 @@ def run_check():
continue
# Status showing one of the check failures
version_and_res[
py_version]['status'] = res.get('result')
description = res.get('description')
py_version]['status'] = res_item.get('result')
description = res_item.get('description')
details = EMPTY_DETAILS if description is None \
else description
version_and_res[
Expand Down
10 changes: 9 additions & 1 deletion compatibility_lib/compatibility_lib/compatibility_store.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import datetime
import enum
import itertools
import retrying
from typing import Any, FrozenSet, Iterable, List, Mapping, Optional

from google.cloud import bigquery
Expand Down Expand Up @@ -234,6 +235,8 @@ def get_self_compatibility(self,
"""
return self.get_self_compatibilities([p])[p]

@retrying.retry(stop_max_attempt_number=7,
wait_fixed=2000)
def get_self_compatibilities(self,
packages: Iterable[package.Package]) -> \
Mapping[package.Package, List[CompatibilityResult]]:
Expand Down Expand Up @@ -277,6 +280,8 @@ def get_self_compatibilities(self,
return {p: self._filter_older_versions(crs)
for (p, crs) in package_to_result.items()}

@retrying.retry(stop_max_attempt_number=7,
wait_fixed=2000)
def get_pair_compatibility(self, packages: List[package.Package]) -> \
Iterable[CompatibilityResult]:
"""Returns CompatibilityStatuses for a pair of packages.
Expand Down Expand Up @@ -317,6 +322,8 @@ def get_pair_compatibility(self, packages: List[package.Package]) -> \
self._row_to_compatibility_status(packages, row)
for row in query_job)

@retrying.retry(stop_max_attempt_number=7,
wait_fixed=2000)
def get_compatibility_combinations(self,
packages: List[package.Package]) -> \
Mapping[FrozenSet[package.Package], List[CompatibilityResult]]:
Expand Down Expand Up @@ -409,7 +416,8 @@ def save_compatibility_statuses(
self._release_time_table,
row)


@retrying.retry(stop_max_attempt_number=7,
wait_fixed=2000)
def get_dependency_info(self, package_name):
"""Returns dependency info for an indicated Google OSS package.

Expand Down
9 changes: 7 additions & 2 deletions dashboard/dashboard_builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@
from compatibility_lib import deprecated_dep_finder
from compatibility_lib import package

logging.basicConfig()
logging.getLogger().setLevel(logging.INFO)

_JINJA2_ENVIRONMENT = jinja2.Environment(
loader=jinja2.FileSystemLoader('.'), autoescape=jinja2.select_autoescape())

Expand Down Expand Up @@ -338,7 +341,9 @@ def main():

packages = [
package.Package(install_name) for install_name in args.packages]
logging.info("Getting self compatibility results...")
package_to_results = store.get_self_compatibilities(packages)
logging.info("Getting pairwise compatibility results...")
pairwise_to_results = store.get_compatibility_combinations(packages)

package_with_dependency_info = {}
Expand All @@ -356,15 +361,15 @@ def main():
dashboard_builder = DashboardBuilder(packages, results)

# Build the pairwise grid dashboard
logging.warning('Starting build the grid...')
logging.info('Starting build the grid...')
grid_html = dashboard_builder.build_dashboard(
'dashboard/grid-template.html')
grid_path = os.path.dirname(os.path.abspath(__file__)) + '/grid.html'
with open(grid_path, 'wt') as f:
f.write(grid_html)

# Build the dashboard main page
logging.warning('Starting build the main dashboard...')
logging.info('Starting build the main dashboard...')
main_html = dashboard_builder.build_dashboard(
'dashboard/main-template.html')

Expand Down