Skip to content

Commit

Permalink
issue two purges for fastly surrogate keys
Browse files Browse the repository at this point in the history
https://developer.fastly.com/learning/concepts/purging/#race-conditions states there are some race conditions we may be running into with shielding enabled.

ref: #12214
  • Loading branch information
ewdurbin committed Jan 6, 2023
1 parent e56b3fb commit ab81951
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 1 deletion.
10 changes: 9 additions & 1 deletion tests/unit/cache/origin/test_fastly.py
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,14 @@ def test_purge_key_ok(self, monkeypatch):
cacher.purge_key("one")

assert requests_post.calls == [
pretend.call(
"https://api.fastly.com/service/the-service-id/purge/one",
headers={
"Accept": "application/json",
"Fastly-Key": "an api key",
"Fastly-Soft-Purge": "1",
},
),
pretend.call(
"https://api.fastly.com/service/the-service-id/purge/one",
headers={
Expand All @@ -190,7 +198,7 @@ def test_purge_key_ok(self, monkeypatch):
},
)
]
assert response.raise_for_status.calls == [pretend.call()]
assert response.raise_for_status.calls == [pretend.call(), pretend.call()]

@pytest.mark.parametrize("result", [{"status": "fail"}, {}])
def test_purge_key_unsuccessful(self, monkeypatch, result):
Expand Down
9 changes: 9 additions & 0 deletions warehouse/cache/origin/fastly.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import time
import urllib.parse

import requests
Expand Down Expand Up @@ -106,3 +107,11 @@ def purge_key(self, key):

if resp.json().get("status") != "ok":
raise UnsuccessfulPurgeError(f"Could not purge {key!r}")

time.sleep(2)

resp = requests.post(url, headers=headers)
resp.raise_for_status()

if resp.json().get("status") != "ok":
raise UnsuccessfulPurgeError(f"Could not double purge {key!r}")

0 comments on commit ab81951

Please sign in to comment.