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

Remove unneeded null checks from IndicesClusterStateService

This commit is contained in:
Lee Hinman 2015-02-01 12:13:57 -07:00
parent 42bb5deca2
commit 25f944009c
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java
View File

@ -220,10 +220,6 @@ public class IndicesClusterStateService extends AbstractLifecycleComponent<Indic
// handle closed indices, since they are not allocated on a node once they are closed // handle closed indices, since they are not allocated on a node once they are closed
// so applyDeletedIndices might not take them into account // so applyDeletedIndices might not take them into account
for (IndexService indexService : indicesService) { for (IndexService indexService : indicesService) {
if (indexService == null) {
// already deleted on us, ignore it
continue;
}
String index = indexService.index().getName(); String index = indexService.index().getName();
IndexMetaData indexMetaData = event.state().metaData().index(index); IndexMetaData indexMetaData = event.state().metaData().index(index);
if (indexMetaData != null && indexMetaData.state() == IndexMetaData.State.CLOSE) { if (indexMetaData != null && indexMetaData.state() == IndexMetaData.State.CLOSE) {
@ -251,10 +247,6 @@ public class IndicesClusterStateService extends AbstractLifecycleComponent<Indic
private void applyDeletedIndices(final ClusterChangedEvent event) { private void applyDeletedIndices(final ClusterChangedEvent event) {
for (IndexService indexService : indicesService) { for (IndexService indexService : indicesService) {
if (indexService == null) {
// got deleted already on us, skip
continue;
}
final String index = indexService.index().name(); final String index = indexService.index().name();
if (!event.state().metaData().hasIndex(index)) { if (!event.state().metaData().hasIndex(index)) {
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
@ -272,10 +264,6 @@ public class IndicesClusterStateService extends AbstractLifecycleComponent<Indic
} }
IntOpenHashSet newShardIds = new IntOpenHashSet(); IntOpenHashSet newShardIds = new IntOpenHashSet();
for (IndexService indexService : indicesService) { for (IndexService indexService : indicesService) {
if (indexService == null) {
// already deleted on us
continue;
}
String index = indexService.index().name(); String index = indexService.index().name();
IndexMetaData indexMetaData = event.state().metaData().index(index); IndexMetaData indexMetaData = event.state().metaData().index(index);
if (indexMetaData == null) { if (indexMetaData == null) {
@ -323,7 +311,7 @@ public class IndicesClusterStateService extends AbstractLifecycleComponent<Indic
try { try {
indicesService.createIndex(indexMetaData.index(), indexMetaData.settings(), event.state().nodes().localNode().id()); indicesService.createIndex(indexMetaData.index(), indexMetaData.settings(), event.state().nodes().localNode().id());
} catch (Exception e) { } catch (Exception e) {
logger.warn("failed to create index [{}]", e, indexMetaData.index()); logger.warn("[{}] failed to create index", e, indexMetaData.index());
} }
} }
} }
@ -343,7 +331,7 @@ public class IndicesClusterStateService extends AbstractLifecycleComponent<Indic
continue; continue;
} }
String index = indexMetaData.index(); String index = indexMetaData.index();
IndexService indexService = indicesService.indexServiceSafe(index); IndexService indexService = indicesService.indexService(index);
if (indexService == null) { if (indexService == null) {
// already deleted on us, ignore it // already deleted on us, ignore it
continue; continue;