honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

no need to check if an index exists (and then fail) prior to removing, 

the delete index api will return an index not found error if that index has already been removed

Original commit: elastic/x-pack-elasticsearch@52000532be
This commit is contained in:
Martijn van Groningen 2016-11-22 12:08:52 +01:00
parent fe7d0d32ff
commit f8569ca353
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
elasticsearch/src/main/java/org/elasticsearch/xpack/prelert/job/persistence/ElasticsearchJobProvider.java
View File

@ -18,7 +18,6 @@ import org.elasticsearch.action.admin.indices.create.CreateIndexResponse;
import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest; import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest;
import org.elasticsearch.action.admin.indices.delete.DeleteIndexResponse; import org.elasticsearch.action.admin.indices.delete.DeleteIndexResponse;
import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsRequest; import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsRequest;
import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsResponse;
import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.action.get.GetResponse;
import org.elasticsearch.action.search.SearchRequestBuilder; import org.elasticsearch.action.search.SearchRequestBuilder;
import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchResponse;
@ -186,16 +185,6 @@ public class ElasticsearchJobProvider implements JobProvider
} }
} }
private boolean indexExists(String jobId)
{
String indexName = ElasticsearchPersister.getJobIndexName(jobId);
LOGGER.trace("ES API CALL: index exists? " + indexName);
IndicesExistsResponse res =
client.admin().indices().exists(new IndicesExistsRequest(indexName)).actionGet();
return res.isExists();
}
/** /**
* Build the Elasticsearch index settings that we want to apply to Prelert * Build the Elasticsearch index settings that we want to apply to Prelert
* indexes. It's better to do this in code rather than in elasticsearch.yml * indexes. It's better to do this in code rather than in elasticsearch.yml
@ -283,10 +272,6 @@ public class ElasticsearchJobProvider implements JobProvider
@Override @Override
public void deleteJobRelatedIndices(String jobId, ActionListener<DeleteJobAction.Response> listener) { public void deleteJobRelatedIndices(String jobId, ActionListener<DeleteJobAction.Response> listener) {
if (indexExists(jobId) == false) {
listener.onFailure(ExceptionsHelper.missingJobException(jobId));
return;
}
String indexName = ElasticsearchPersister.getJobIndexName(jobId); String indexName = ElasticsearchPersister.getJobIndexName(jobId);
LOGGER.trace("ES API CALL: delete index " + indexName); LOGGER.trace("ES API CALL: delete index " + indexName);