Skip to content

fix retry_on_conflict causing errors on document update for elasticsearch-dsl 6.x #1472

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

Closed
wants to merge 1 commit into from
Closed

fix retry_on_conflict causing errors on document update for elasticsearch-dsl 6.x #1472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion elasticsearch_dsl/document.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,8 +391,9 @@ def update(self, using=None, index=None, detect_noop=True,
if k in self.meta
}

if retry_on_conflict is not None:
if retry_on_conflict not in (0, None):
doc_meta['retry_on_conflict'] = retry_on_conflict
doc_meta['version'] = None

meta = self._get_connection(using).update(
index=self._get_index(index),
Expand Down
32 changes: 32 additions & 0 deletions test_elasticsearch_dsl/test_integration/test_document.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
Object, Nested, MetaField, Q, Long, Boolean, Double, Binary, Ip, analyzer
from elasticsearch_dsl.utils import AttrList

import pytest
from pytest import raises, fixture

snowball = analyzer('my_snow',
Expand Down Expand Up @@ -169,6 +170,37 @@ def test_update_script(write_client):
w = Wiki.get(id='elasticsearch-py')
assert w.views == 47

def test_update_script_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')
w1.update(script="ctx._source.views += params.inc", inc=5, retry_on_conflict=1)

w2 = Wiki.get(id='elasticsearch-py')
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_init(write_client):
Repository.init(index='test-git')

Expand Down