Skip to content

Commit bc37f34

Browse files
committed
Fix: replace Elasticsearch client with OpenSearch
1 parent 8d242fc commit bc37f34

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

src/DIRAC/Core/Utilities/ElasticSearchDB.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,6 @@
33
It is used to query Elasticsearch instances.
44
"""
55

6-
from __future__ import absolute_import
7-
from __future__ import division
8-
from __future__ import print_function
9-
10-
__RCSID__ = "$Id$"
11-
126
from datetime import datetime
137
from datetime import timedelta
148

@@ -17,10 +11,16 @@
1711
import functools
1812
import json
1913

20-
from elasticsearch import Elasticsearch
21-
from elasticsearch_dsl import Search, Q, A
22-
from elasticsearch.exceptions import ConnectionError, TransportError, NotFoundError, RequestError
23-
from elasticsearch.helpers import BulkIndexError, bulk
14+
try:
15+
from opensearchpy import OpenSearch as Elasticsearch
16+
from opensearch_dsl import Search, Q, A
17+
from opensearchpy.exceptions import ConnectionError, TransportError, NotFoundError, RequestError
18+
from opensearchpy.helpers import BulkIndexError, bulk
19+
except ImportError:
20+
from elasticsearch import Elasticsearch
21+
from elasticsearch_dsl import Search, Q, A
22+
from elasticsearch.exceptions import ConnectionError, TransportError, NotFoundError, RequestError
23+
from elasticsearch.helpers import BulkIndexError, bulk
2424

2525
from DIRAC import gLogger, S_OK, S_ERROR
2626
from DIRAC.Core.Utilities import Time, DErrno

0 commit comments

Comments
 (0)