swh:1:snp:eb70f1f85391e4b077c211bec36af0061c4bf937
Tip revision: ddac3d27e3ae79dfd1a9bc2ccd3948f82bbfd6b3 authored by Antoine R. Dumont (@ardumont) on 10 April 2020, 09:40:39 UTC
test_retry: Add missing skipped_content_add tests
test_retry: Add missing skipped_content_add tests
Tip revision: ddac3d2
retry.py
# Copyright (C) 2019-2020 The Software Heritage developers
# See the AUTHORS file at the top-level directory of this distribution
# License: GNU General Public License version 3, or any later version
# See top-level LICENSE file for more information
import logging
import traceback
from datetime import datetime
from typing import Dict, Iterable, List, Optional, Union
from tenacity import (
retry,
stop_after_attempt,
wait_random_exponential,
)
from swh.model.model import (
Content,
SkippedContent,
Directory,
Revision,
Release,
Snapshot,
Origin,
OriginVisit,
)
from swh.storage import get_storage
from swh.storage.exc import StorageArgumentException
logger = logging.getLogger(__name__)
def should_retry_adding(retry_state) -> bool:
"""Retry if the error/exception is (probably) not about a caller error
"""
try:
attempt = retry_state.outcome
except AttributeError:
# tenacity < 5.0
attempt = retry_state
if attempt.failed:
error = attempt.exception()
if isinstance(error, StorageArgumentException):
# Exception is due to an invalid argument
return False
else:
# Other exception
module = getattr(error, "__module__", None)
if module:
error_name = error.__module__ + "." + error.__class__.__name__
else:
error_name = error.__class__.__name__
logger.warning(
"Retry adding a batch",
exc_info=False,
extra={
"swh_type": "storage_retry",
"swh_exception_type": error_name,
"swh_exception": traceback.format_exc(),
},
)
return True
else:
# No exception
return False
swh_retry = retry(
retry=should_retry_adding,
wait=wait_random_exponential(multiplier=1, max=10),
stop=stop_after_attempt(3),
)
class RetryingProxyStorage:
"""Storage implementation which retries adding objects when it specifically
fails (hash collision, integrity error).
"""
def __init__(self, storage):
self.storage = get_storage(**storage)
def __getattr__(self, key):
if key == "storage":
raise AttributeError(key)
return getattr(self.storage, key)
@swh_retry
def content_add(self, content: Iterable[Content]) -> Dict:
return self.storage.content_add(content)
@swh_retry
def content_add_metadata(self, content: Iterable[Content]) -> Dict:
return self.storage.content_add_metadata(content)
@swh_retry
def skipped_content_add(self, content: Iterable[SkippedContent]) -> Dict:
return self.storage.skipped_content_add(content)
@swh_retry
def origin_add_one(self, origin: Origin) -> str:
return self.storage.origin_add_one(origin)
@swh_retry
def origin_visit_add(
self, origin_url: str, date: Union[datetime, str], type: str
) -> OriginVisit:
return self.storage.origin_visit_add(origin_url, date, type)
@swh_retry
def origin_visit_update(
self,
origin: str,
visit_id: int,
status: Optional[str] = None,
metadata: Optional[Dict] = None,
snapshot: Optional[Dict] = None,
) -> Dict:
return self.storage.origin_visit_update(
origin, visit_id, status=status, metadata=metadata, snapshot=snapshot
)
@swh_retry
def tool_add(self, tools: Iterable[Dict]) -> List[Dict]:
tools = list(tools)
return self.storage.tool_add(tools)
@swh_retry
def metadata_provider_add(
self, provider_name: str, provider_type: str, provider_url: str, metadata: Dict
) -> Union[str, int]:
return self.storage.metadata_provider_add(
provider_name, provider_type, provider_url, metadata
)
@swh_retry
def origin_metadata_add(
self,
origin_url: str,
ts: Union[str, datetime],
provider_id: int,
tool_id: int,
metadata: Dict,
) -> None:
return self.storage.origin_metadata_add(
origin_url, ts, provider_id, tool_id, metadata
)
@swh_retry
def directory_add(self, directories: Iterable[Directory]) -> Dict:
return self.storage.directory_add(directories)
@swh_retry
def revision_add(self, revisions: Iterable[Revision]) -> Dict:
return self.storage.revision_add(revisions)
@swh_retry
def release_add(self, releases: Iterable[Release]) -> Dict:
return self.storage.release_add(releases)
@swh_retry
def snapshot_add(self, snapshots: Iterable[Snapshot]) -> Dict:
return self.storage.snapshot_add(snapshots)
def clear_buffers(self, object_types: Optional[Iterable[str]] = None) -> None:
return self.storage.clear_buffers(object_types)
def flush(self, object_types: Optional[Iterable[str]] = None) -> Dict:
"""Specific case for buffer proxy storage failing to flush data
"""
return self.storage.flush(object_types)