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

Fixed close index when the index is already closed 

Closes #3601
This commit is contained in:
Luca Cavanna 2013-09-02 10:58:09 +02:00
parent 206ab3a6d4
commit 38be478c46
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexStateService.java
View File

@ -96,14 +96,14 @@ public class MetaDataIndexStateService extends AbstractComponent {
if (indexMetaData == null) {
throw new IndexMissingException(new Index(index));
}
IndexRoutingTable indexRoutingTable = currentState.routingTable().index(index);
for (IndexShardRoutingTable shard : indexRoutingTable) {
if (!shard.primaryAllocatedPostApi()) {
throw new IndexPrimaryShardNotAllocatedException(new Index(index));
}
}
if (indexMetaData.state() != IndexMetaData.State.CLOSE) {
IndexRoutingTable indexRoutingTable = currentState.routingTable().index(index);
for (IndexShardRoutingTable shard : indexRoutingTable) {
if (!shard.primaryAllocatedPostApi()) {
throw new IndexPrimaryShardNotAllocatedException(new Index(index));
}
}
indicesToClose.add(index);
}
}

6
src/test/java/org/elasticsearch/test/integration/indices/state/OpenCloseIndexTests.java
View File

@ -227,9 +227,9 @@ public class OpenCloseIndexTests extends AbstractSharedClusterTest {
assertIndexIsClosed("test1");
//no problem if we try to close an index that's already in close state
OpenIndexResponse openIndexResponse1 = client.admin().indices().prepareOpen("test1").execute().actionGet();
assertThat(openIndexResponse1.isAcknowledged(), equalTo(true));
assertIndexIsOpened("test1");
closeIndexResponse = client.admin().indices().prepareClose("test1").execute().actionGet();
assertThat(closeIndexResponse.isAcknowledged(), equalTo(true));
assertIndexIsClosed("test1");
}
@Test