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

Return null index name for expired data #322

Merged
merged 1 commit into from
May 25, 2023
Merged

Return null index name for expired data #322

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
2 changes: 1 addition & 1 deletion src/main/java/org/opensearch/geospatial/ip2geo/jobscheduler/Datasource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ public void disable() {
* @return Current index name of a datasource
*/
public String currentIndexName() {
return indexNameFor(database.updatedAt.toEpochMilli());
return isExpired() ? null : indexNameFor(database.updatedAt.toEpochMilli());
}

/**
Expand Down
43 changes: 20 additions & 23 deletions src/main/java/org/opensearch/geospatial/ip2geo/processor/Ip2GeoProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,11 +153,19 @@ protected void executeInternal(
datasourceFacade.getDatasource(datasourceName, new ActionListener<>() {
@Override
public void onResponse(final Datasource datasource) {
if (handleInvalidDatasource(ingestDocument, datasource, handler)) {
if (datasource == null) {
handler.accept(null, new IllegalStateException("datasource does not exist"));
return;
}

geoIpDataFacade.getGeoIpData(datasource.currentIndexName(), ip, new ActionListener<>() {
String indexName = datasource.currentIndexName();
if (indexName == null) {
ingestDocument.setFieldValue(targetField, DATA_EXPIRED);
handler.accept(ingestDocument, null);
return;
}

geoIpDataFacade.getGeoIpData(indexName, ip, new ActionListener<>() {
@Override
public void onResponse(final Map<String, Object> ipToGeoData) {
handleSingleIp(ip, ipToGeoData, ingestDocument, handler);
Expand Down Expand Up @@ -229,12 +237,20 @@ protected void executeInternal(
datasourceFacade.getDatasource(datasourceName, new ActionListener<>() {
@Override
public void onResponse(final Datasource datasource) {
if (handleInvalidDatasource(ingestDocument, datasource, handler)) {
if (datasource == null) {
handler.accept(null, new IllegalStateException("datasource does not exist"));
return;
}

String indexName = datasource.currentIndexName();
if (indexName == null) {
ingestDocument.setFieldValue(targetField, DATA_EXPIRED);
handler.accept(ingestDocument, null);
return;
}

geoIpDataFacade.getGeoIpData(
datasource.currentIndexName(),
indexName,
ipList.iterator(),
clusterSettings.get(Ip2GeoSettings.MAX_BUNDLE_SIZE),
clusterSettings.get(Ip2GeoSettings.MAX_CONCURRENT_SEARCHES),
Expand Down Expand Up @@ -298,25 +314,6 @@ public void onFailure(final Exception e) {
};
}

@VisibleForTesting
protected boolean handleInvalidDatasource(
final IngestDocument ingestDocument,
final Datasource datasource,
final BiConsumer<IngestDocument, Exception> handler
) {
if (datasource == null) {
handler.accept(null, new IllegalStateException("datasource does not exist"));
return true;
}

if (datasource.isExpired()) {
ingestDocument.setFieldValue(targetField, DATA_EXPIRED);
handler.accept(ingestDocument, null);
return true;
}
return false;
}

@Override
public String getType() {
return TYPE;
Expand Down
20 changes: 18 additions & 2 deletions src/test/java/org/opensearch/geospatial/ip2geo/jobscheduler/DatasourceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,22 +46,38 @@ public void testParser() throws Exception {
assertTrue(datasource.equals(anotherDatasource));
}

public void testCurrentIndexName() {
public void testCurrentIndexName_whenNotExpired_thenReturnName() {
String id = GeospatialTestHelper.randomLowerCaseString();
Instant now = Instant.now();
Datasource datasource = new Datasource();
datasource.setName(id);
datasource.getDatabase().setProvider("provider");
datasource.getDatabase().setSha256Hash("sha256Hash");
datasource.getDatabase().setUpdatedAt(now);
datasource.getDatabase().setValidForInDays(10l);
datasource.getDatabase().setFields(new ArrayList<>());

assertEquals(
String.format(Locale.ROOT, "%s.%s.%d", IP2GEO_DATA_INDEX_NAME_PREFIX, id, now.toEpochMilli()),
datasource.currentIndexName()
);
}

public void testCurrentIndexName_whenExpired_thenReturnNull() {
String id = GeospatialTestHelper.randomLowerCaseString();
Instant now = Instant.now();
Datasource datasource = new Datasource();
datasource.setName(id);
datasource.getDatabase().setProvider("provider");
datasource.getDatabase().setSha256Hash("sha256Hash");
datasource.getDatabase().setUpdatedAt(now);
datasource.getDatabase().setValidForInDays(1l);
datasource.getUpdateStats().setLastSucceededAt(Instant.now().minus(25, ChronoUnit.HOURS));
datasource.getDatabase().setFields(new ArrayList<>());

assertTrue(datasource.isExpired());
assertNull(datasource.currentIndexName());
}

public void testGetIndexNameFor() {
long updatedAt = randomPositiveLong();
DatasourceManifest manifest = mock(DatasourceManifest.class);
Expand Down