DCausse has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/364438 )
Change subject: Remove '/_msearch' from the es host definitions
......................................................................
Remove '/_msearch' from the es host definitions
Don't assume that all queries sent to elastic will be _msearch requests.
Change-Id: I493663dc8b3381fd3b3ac23aeb51a2c3268101a7
---
M mjolnir/cirrus.py
M mjolnir/kafka/daemon.py
M mjolnir/test/test_features.py
M mjolnir/test/test_norm_query.py
4 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/search/MjoLniR
refs/changes/38/364438/1
diff --git a/mjolnir/cirrus.py b/mjolnir/cirrus.py
index 41d9b9f..303467f 100644
--- a/mjolnir/cirrus.py
+++ b/mjolnir/cirrus.py
@@ -30,7 +30,7 @@
failures = 0
while True:
try:
- result = session.get(url, data=bulk_query)
+ result = session.get(url + '/_msearch', data=bulk_query)
if _bulk_success(result):
return url, result
last_ex = RuntimeError('Too many failures or no urls left')
diff --git a/mjolnir/kafka/daemon.py b/mjolnir/kafka/daemon.py
index 806fdb8..0beaca6 100644
--- a/mjolnir/kafka/daemon.py
+++ b/mjolnir/kafka/daemon.py
@@ -165,7 +165,7 @@
return False
# Standard execution of elasticsearch bulk query
- _, response = mjolnir.cirrus.make_request(session,
'http://localhost:9200/_msearch', [],
+ _, response = mjolnir.cirrus.make_request(session,
'http://localhost:9200', [],
record.value['request'],
reuse_url=True)
self.producer.send(self.topic_result, json.dumps({
'run_id': record.value['run_id'],
diff --git a/mjolnir/test/test_features.py b/mjolnir/test/test_features.py
index cabaae7..62ea7fe 100644
--- a/mjolnir/test/test_features.py
+++ b/mjolnir/test/test_features.py
@@ -15,7 +15,7 @@
df = spark_context.parallelize(rows).toDF()
accu = df._sc.accumulator({}, mjolnir.features.FeatureNamesAccumulator())
- df_result = mjolnir.features.collect_es(df,
['http://localhost:9200/_msearch'],
+ df_result = mjolnir.features.collect_es(df, ['http://localhost:9200'],
mjolnir.features.enwiki_features(),
accu,
{'enwiki': 'enwiki_content'},
diff --git a/mjolnir/test/test_norm_query.py b/mjolnir/test/test_norm_query.py
index 3f2d3b2..a6e8c0b 100644
--- a/mjolnir/test/test_norm_query.py
+++ b/mjolnir/test/test_norm_query.py
@@ -22,7 +22,7 @@
df_res = mjolnir.norm_query.transform(
df_love,
- url_list=['http://localhost:9200/_msearch'],
+ url_list=['http://localhost:9200'],
min_sessions_per_query=10,
session_factory=session_factory)
--
To view, visit https://gerrit.wikimedia.org/r/364438
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I493663dc8b3381fd3b3ac23aeb51a2c3268101a7
Gerrit-PatchSet: 1
Gerrit-Project: search/MjoLniR
Gerrit-Branch: master
Gerrit-Owner: DCausse <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
