Merge pull request #38 from overture-stack/rc/2.3.0

Rc/2.3.0

Author: jaserud

pom.xml

@@ -23,7 +23,7 @@
 
     <groupId>bio.overture</groupId>
     <artifactId>rollcall</artifactId>
-    <version>2.2.0</version>
+    <version>2.3.0</version>
     <packaging>jar</packaging>
 
     <name>rollcall</name>

src/main/java/bio/overture/rollcall/repository/IndexRepository.java

@@ -37,6 +37,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
+import java.util.Collections;
 import java.util.List;
 
 import static java.util.stream.Collectors.toUnmodifiableList;
@@ -76,27 +77,35 @@ public ImmutableOpenMap<String, List<AliasMetaData>> getAliasState() {
 
   @SneakyThrows
   public boolean removeAlias(@NonNull String alias, @NonNull List<String> indices) {
+    return updateIndicesAliases(alias, Collections.emptyList(), indices);
+  }
+
+  @SneakyThrows
+  public boolean addAlias(@NonNull String alias, @NonNull List<String> indices) {
+    return updateIndicesAliases(alias, indices, Collections.emptyList());
+  }
+
+  @SneakyThrows
+  public boolean updateIndicesAliases(@NonNull String alias, @NonNull List<String> indicesToAddToAlias, @NonNull List<String> indicesToRemoveFromAlias) {
     val req = new IndicesAliasesRequest();
-    indices.forEach(i -> req.addAliasAction(remove().alias(alias).index(i)));
+
+    indicesToRemoveFromAlias.forEach(i -> req.addAliasAction(remove().alias(alias).index(i)));
+
+    indicesToAddToAlias.forEach(i -> req.addAliasAction(add().alias(alias).index(i)));
 
     if (req.getAliasActions().isEmpty()) {
       return true;
     }
+
     return client.indices().updateAliases(req, RequestOptions.DEFAULT).isAcknowledged();
   }
 
   @SneakyThrows
-  public boolean makeReadonlyThenAddAlias(@NonNull String alias, @NonNull List<String> indices) {
-    // make indices readonly
+  public boolean makeIndicesReadOnly(@NonNull List<String> indices) {
     final String disableWriteSetting = "{ \"index.blocks.write\": true }";
-    val updateSettingsReq = new UpdateSettingsRequest(indices.toArray(String[]::new)).settings(disableWriteSetting, XContentType.JSON);
-    val updatedSettings = client.indices().putSettings(updateSettingsReq, RequestOptions.DEFAULT).isAcknowledged();
-
-    if (!updatedSettings) return false;
-
-    val req = new IndicesAliasesRequest();
-    indices.forEach(i -> req.addAliasAction(add().alias(alias).index(i)));
-    return client.indices().updateAliases(req, RequestOptions.DEFAULT).isAcknowledged();
+    val updateSettingsReq = new UpdateSettingsRequest(indices.toArray(String[]::new))
+                                    .settings(disableWriteSetting, XContentType.JSON);
+    return client.indices().putSettings(updateSettingsReq, RequestOptions.DEFAULT).isAcknowledged();
   }
 
   @SneakyThrows

src/main/java/bio/overture/rollcall/service/AliasService.java

@@ -87,25 +87,25 @@ public AliasCandidates getRelevantCandidates(String alias) {
 
   public boolean release(@NonNull AliasRequest aliasRequest) {
     val alias = aliasRequest.getAlias();
+    val releases = getReleasesFromRequest(aliasRequest);
+    val shards = getShardsFromRequest(aliasRequest);
 
     // First identify candidates and check existence of at least one.
-    val candidates = this.getRelevantCandidates(alias);
+    val candidates = getRelevantCandidates(alias);
 
     // Now do a pre-flight check to see if target indices exist and resolve correctly before continuing.
-    val indicesToRelease = getIndicesForRelease(candidates, aliasRequest.getRelease().toLowerCase().split("_"), getShardsFromRequest(aliasRequest));
+    val indicesToRelease = getIndicesForRelease(candidates, releases, shards);
     if (indicesToRelease.size() != aliasRequest.getShards().size()) {
       throw new ReleaseIntegrityException(aliasRequest.getRelease(), aliasRequest.getShards(), indicesToRelease);
     }
 
-    val removed = remove(aliasRequest);
-    if (!removed) {
-      throw new IllegalStateException("Failed to remove alias");
-    }
+    val indicesToRemoveFromAlias = getIndicesToRemoveFromAlias(aliasRequest);
 
-    return addAliasToIndices(aliasRequest, candidates);
+    repository.makeIndicesReadOnly(indicesToRelease);
+    return repository.updateIndicesAliases(alias, indicesToRelease, indicesToRemoveFromAlias);
   }
 
-  public boolean remove(@NonNull AliasRequest aliasRequest) {
+  public List<String> getIndicesToRemoveFromAlias(@NonNull AliasRequest aliasRequest) {
     val alias = aliasRequest.getAlias();
     val shards = getShardsFromRequest(aliasRequest);
 
@@ -120,6 +120,12 @@ public boolean remove(@NonNull AliasRequest aliasRequest) {
       .map(ResolvedIndex::getIndexName)
       .collect(toList());
 
+    return indices;
+  }
+
+  public boolean remove(@NonNull AliasRequest aliasRequest) {
+    val alias = aliasRequest.getAlias();
+    val indices = getIndicesToRemoveFromAlias(aliasRequest);
     return repository.removeAlias(alias, indices);
   }
 
@@ -128,15 +134,6 @@ public boolean removeAliasFromAllIndices(@NonNull String alias) {
     return repository.removeAlias(alias, existing);
   }
 
-  private boolean addAliasToIndices(AliasRequest aliasRequest, AliasCandidates candidates) {
-    val release = aliasRequest.getRelease().toLowerCase().split("_");
-    val shards = getShardsFromRequest(aliasRequest);
-
-    val indices = getIndicesForRelease(candidates, release, shards);
-
-    return repository.makeReadonlyThenAddAlias(aliasRequest.getAlias(), indices);
-  }
-
   private static List<Shard> getShardsFromRequest(AliasRequest aliasRequest) {
     return aliasRequest.getShards().stream()
       .map(String::toLowerCase)
@@ -145,6 +142,10 @@ private static List<Shard> getShardsFromRequest(AliasRequest aliasRequest) {
       .collect(toList());
   }
 
+  private static String[] getReleasesFromRequest(AliasRequest aliasRequest) {
+    return aliasRequest.getRelease().toLowerCase().split("_");
+  }
+
   private List<String> getIndicesWithAlias(String alias) {
     val state = repository.getAliasState();
 

src/test/java/bio/overture/rollcall/repository/IndexRepositoryTest.java

@@ -92,7 +92,7 @@ public void getStateTestNoAlias() {
   public void releaseAndRemoveTest() {
     val list = Lists.list(INDEX1,INDEX2,INDEX3);
 
-    val added = repository.makeReadonlyThenAddAlias("file_centric", list);
+    val added = repository.addAlias("file_centric", list);
 
     assertThat(added).isTrue();
 
@@ -110,10 +110,10 @@ public void releaseAndRemoveTest() {
 
   @Test
   @SneakyThrows
-  public void readonlyAfterRelease() {
+  public void makeReadonly() {
     val indices = Lists.list(INDEX1,INDEX2,INDEX3);
 
-    val added = repository.makeReadonlyThenAddAlias("file_centric", indices);
+    val added = repository.makeIndicesReadOnly(indices);
     assertThat(added).isTrue();
 
     // check indices are now readonly