Skip to content

Commit 4262297

Browse files
committed
Merge pull request deis#795 from helgi/retrying_removal
ref(docker): change retry library to backoff
2 parents 3d081aa + 9afef74 commit 4262297

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

rootfs/registry/dockerclient.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
import logging
55
import os
66

7+
import backoff
78
from django.conf import settings
89
from rest_framework.exceptions import PermissionDenied
910
from simpleflock import SimpleFlock
10-
from retrying import retry
1111

1212
import docker
1313
import docker.constants
@@ -144,7 +144,7 @@ def tag(self, image, repo, tag):
144144
if not self.client.tag(image, repo, tag=tag, force=True):
145145
raise RegistryException('Tagging {} as {}:{} failed'.format(image, repo, tag))
146146

147-
@retry(stop_max_attempt_number=3, wait_fixed=1000)
147+
@backoff.on_exception(backoff.expo, Exception, max_tries=3)
148148
def inspect_image(self, target, insecure_registry=True):
149149
"""
150150
Inspect docker image to gather information from it

rootfs/requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,3 @@ PyYAML==3.11
1616
requests==2.10.0
1717
requests-toolbelt==0.6.2
1818
simpleflock==0.0.3
19-
retrying==1.3.3

0 commit comments

Comments
 (0)