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

Reflect upstream changes to o.e.c.m.IndexMetaData 

This commit reflects some upstream method removals from
o.e.c.m.IndexMetaData.

Original commit: elastic/x-pack-elasticsearch@74b25628dc
This commit is contained in:
Jason Tedor 2015-10-14 21:05:35 -04:00
parent 05befa5ebb
commit a0b9d424e6
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shield/src/main/java/org/elasticsearch/shield/authz/indicesresolver/DefaultIndicesAndAliasesResolver.java
View File

@ -239,10 +239,10 @@ public class DefaultIndicesAndAliasesResolver implements IndicesAndAliasesResolv
//complicated to support those options with aliases pointing to multiple indices...
return true;
}
if (indexMetaData.state() == IndexMetaData.State.CLOSE && indicesOptions.expandWildcardsClosed()) {
if (indexMetaData.getState() == IndexMetaData.State.CLOSE && indicesOptions.expandWildcardsClosed()) {
return true;
}
if (indexMetaData.state() == IndexMetaData.State.OPEN && indicesOptions.expandWildcardsOpen()) {
if (indexMetaData.getState() == IndexMetaData.State.OPEN && indicesOptions.expandWildcardsOpen()) {
return true;
}
}

2
watcher/src/main/java/org/elasticsearch/watcher/execution/TriggeredWatchStore.java
View File

@ -236,7 +236,7 @@ public class TriggeredWatchStore extends AbstractComponent {
if (!state.routingTable().index(INDEX_NAME).allPrimaryShardsActive()) {
throw illegalState("not all primary shards of the [{}] index are started.", INDEX_NAME);
} else {
numPrimaryShards = indexMetaData.numberOfShards();
numPrimaryShards = indexMetaData.getNumberOfShards();
}
RefreshResponse refreshResponse = client.refresh(new RefreshRequest(INDEX_NAME));
if (refreshResponse.getSuccessfulShards() < numPrimaryShards) {

2
watcher/src/main/java/org/elasticsearch/watcher/watch/WatchStore.java
View File

@ -79,7 +79,7 @@ public class WatchStore extends AbstractComponent {
IndexMetaData watchesIndexMetaData = state.getMetaData().index(INDEX);
if (watchesIndexMetaData != null) {
try {
int count = loadWatches(watchesIndexMetaData.numberOfShards());
int count = loadWatches(watchesIndexMetaData.getNumberOfShards());
logger.debug("loaded [{}] watches from the watches index [{}]", count, INDEX);
started.set(true);
} catch (Exception e) {