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

Use the workaround if we can't determine the server's version #581

Merged
merged 7 commits into from
Sep 15, 2023
Merged

Use the workaround if we can't determine the server's version #581

Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
14dde9b
Use the workaround if we can't determine the server's version
bartbroere Aug 30, 2023
39591a7
Import elasticsearch to be able to access the Exception
bartbroere Aug 30, 2023
d0ab4bc
Add a warning
bartbroere Sep 5, 2023
493ed7f
Merge branch 'main' into patch-1
davidkyle Sep 5, 2023
18fb6bd
Merge branch 'main' into patch-1
pquentin Sep 6, 2023
d768d05
Fix formatting with black
bartbroere Sep 6, 2023
d4919e2
Improve logging the original exception
bartbroere Sep 15, 2023
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
15 changes: 14 additions & 1 deletion eland/field_mappings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
Union,
)

import elasticsearch
import numpy as np
import pandas as pd # type: ignore
from pandas.core.dtypes.common import ( # type: ignore
Expand Down Expand Up @@ -942,7 +943,19 @@ def _compat_field_caps(client, fields, index=None):
# If the server version is 8.5.0 or later we don't need
# the query string work-around. Sending via any client
# version should be just fine.
if es_version(client) >= (8, 5, 0):
try:
elastic_version = es_version(client)
# If we lack sufficient permission to determine the Elasticsearch version,
# to be sure we use the workaround for versions smaller than 8.5.0
except elasticsearch.AuthorizationException as e:
raise RuntimeWarning(
"Couldn't determine Elasticsearch host's version. "
"Probably missing monitor/main permissions. "
"Continuing with the query string work-around. "
"Original exception: " + str(e)
bartbroere marked this conversation as resolved.
Show resolved Hide resolved
)
elastic_version = None
if elastic_version and elastic_version >= (8, 5, 0):
return client.field_caps(index=index, fields=fields)

# Otherwise we need to force sending via the query string.
Expand Down