Skip to content

Commit 66c3320

Browse files
authored
Remove _primary preference from get/mget requests (opensearch-project#391)
Signed-off-by: Suraj Singh <surajrider@gmail.com>
1 parent 446fb23 commit 66c3320

2 files changed

Lines changed: 2 additions & 5 deletions

File tree

src/main/java/org/opensearch/geospatial/ip2geo/dao/DatasourceDao.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ public void deleteDatasource(final Datasource datasource) {
217217
* @throws IOException exception
218218
*/
219219
public Datasource getDatasource(final String name) throws IOException {
220-
GetRequest request = new GetRequest(DatasourceExtension.JOB_INDEX_NAME, name).preference(Preference.PRIMARY.type());
220+
GetRequest request = new GetRequest(DatasourceExtension.JOB_INDEX_NAME, name);
221221
GetResponse response;
222222
try {
223223
response = StashedThreadContext.run(client, () -> client.get(request).actionGet(clusterSettings.get(Ip2GeoSettings.TIMEOUT)));
@@ -244,7 +244,7 @@ public Datasource getDatasource(final String name) throws IOException {
244244
* @param actionListener the action listener
245245
*/
246246
public void getDatasource(final String name, final ActionListener<Datasource> actionListener) {
247-
GetRequest request = new GetRequest(DatasourceExtension.JOB_INDEX_NAME, name).preference(Preference.PRIMARY.type());
247+
GetRequest request = new GetRequest(DatasourceExtension.JOB_INDEX_NAME, name);
248248
StashedThreadContext.run(client, () -> client.get(request, new ActionListener<>() {
249249
@Override
250250
public void onResponse(final GetResponse response) {
@@ -282,7 +282,6 @@ public void getDatasources(final String[] names, final ActionListener<List<Datas
282282
client,
283283
() -> client.prepareMultiGet()
284284
.add(DatasourceExtension.JOB_INDEX_NAME, names)
285-
.setPreference(Preference.PRIMARY.type())
286285
.execute(createGetDataSourceQueryActionLister(MultiGetResponse.class, actionListener))
287286
);
288287
}

src/test/java/org/opensearch/geospatial/ip2geo/dao/DatasourceDaoTests.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,6 @@ private Datasource setupClientForGetRequest(final boolean isExist, final Runtime
206206
GetRequest request = (GetRequest) actionRequest;
207207
assertEquals(datasource.getName(), request.id());
208208
assertEquals(DatasourceExtension.JOB_INDEX_NAME, request.index());
209-
assertEquals(Preference.PRIMARY.type(), request.preference());
210209
GetResponse response = getMockedGetResponse(isExist ? datasource : null);
211210
if (exception != null) {
212211
throw exception;
@@ -264,7 +263,6 @@ public void testGetDatasources_whenValidInput_thenSucceed() {
264263
assertTrue(actionRequest instanceof MultiGetRequest);
265264
MultiGetRequest request = (MultiGetRequest) actionRequest;
266265
assertEquals(2, request.getItems().size());
267-
assertEquals(Preference.PRIMARY.type(), request.preference());
268266
for (MultiGetRequest.Item item : request.getItems()) {
269267
assertEquals(DatasourceExtension.JOB_INDEX_NAME, item.index());
270268
assertTrue(datasources.stream().filter(datasource -> datasource.getName().equals(item.id())).findAny().isPresent());

0 commit comments

Comments
 (0)