Skip to content
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

Jump to bottom

Fix retry_on_conflict raising errors on document update #1461

Merged
merged 2 commits into from
Dec 8, 2020
Merged

Fix retry_on_conflict raising errors on document update #1461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6809621
Do not pass if_seq_no and if_primary_term to request if retry_on_conf…
armando1793 Dec 8, 2020
d8f43fc
Update test_document.py
sethmlarson Dec 8, 2020
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
6 changes: 5 additions & 1 deletion elasticsearch_dsl/document.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,11 @@ def update(
doc_meta["retry_on_conflict"] = retry_on_conflict

# Optimistic concurrency control
if "seq_no" in self.meta and "primary_term" in self.meta:
if (
retry_on_conflict in (None, 0)
and "seq_no" in self.meta
and "primary_term" in self.meta
):
doc_meta["if_seq_no"] = self.meta["seq_no"]
doc_meta["if_primary_term"] = self.meta["primary_term"]

Expand Down
33 changes: 33 additions & 0 deletions tests/test_integration/test_document.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
from datetime import datetime
from ipaddress import ip_address

import pytest
from elasticsearch import ConflictError, NotFoundError
from pytest import raises
from pytz import timezone
Expand Down Expand Up @@ -234,6 +235,38 @@ def test_update_script(write_client):
assert w.views == 47


def test_update_retry_on_conflict(write_client):
Wiki.init()
w = Wiki(owner=User(name="Honza Kral"), _id="elasticsearch-py", views=42)
w.save()

w1 = Wiki.get(id="elasticsearch-py")
w2 = Wiki.get(id="elasticsearch-py")
w1.update(script="ctx._source.views += params.inc", inc=5, retry_on_conflict=1)
w2.update(script="ctx._source.views += params.inc", inc=5, retry_on_conflict=1)

w = Wiki.get(id="elasticsearch-py")
assert w.views == 52


@pytest.mark.parametrize("retry_on_conflict", [None, 0])
def test_update_conflicting_version(write_client, retry_on_conflict):
Wiki.init()
w = Wiki(owner=User(name="Honza Kral"), _id="elasticsearch-py", views=42)
w.save()

w1 = Wiki.get(id="elasticsearch-py")
w2 = Wiki.get(id="elasticsearch-py")
w1.update(script="ctx._source.views += params.inc", inc=5)

with raises(ConflictError):
w2.update(
script="ctx._source.views += params.inc",
inc=5,
retry_on_conflict=retry_on_conflict,
)


def test_save_and_update_return_doc_meta(write_client):
Wiki.init()
w = Wiki(owner=User(name="Honza Kral"), _id="elasticsearch-py", views=42)
Expand Down