From 3c79d57b6ac6cd04eead407996693939b032d5d6 Mon Sep 17 00:00:00 2001
From: Boaz Leskes <b.leskes@gmail.com>
Date: Wed, 18 Jul 2018 09:23:22 +0200
Subject: [PATCH] fix test and add assertion

---
 .../main/java/org/elasticsearch/index/shard/IndexShard.java  | 5 +++++
 .../cluster/AbstractIndicesClusterStateServiceTestCase.java  | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java b/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java
index 632af305de710..6e27914f1ce0f 100644
--- a/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java
+++ b/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java
@@ -525,6 +525,11 @@ public void onFailure(Exception e) {
             }
             // set this last, once we finished updating all internal state.
             this.shardRouting = newRouting;
+
+            assert this.shardRouting.primary() == false ||
+                this.shardRouting.started() == false || // note that we use started and not active to avoid relocating shards
+                this.replicationTracker.isPrimaryMode()
+                : "an started primary must be in primary mode " + this.shardRouting;
             shardStateUpdated.countDown();
         }
         if (currentRouting != null && currentRouting.active() == false && newRouting.active()) {
diff --git a/server/src/test/java/org/elasticsearch/indices/cluster/AbstractIndicesClusterStateServiceTestCase.java b/server/src/test/java/org/elasticsearch/indices/cluster/AbstractIndicesClusterStateServiceTestCase.java
index 942b7dea1034c..5c6b000f7e519 100644
--- a/server/src/test/java/org/elasticsearch/indices/cluster/AbstractIndicesClusterStateServiceTestCase.java
+++ b/server/src/test/java/org/elasticsearch/indices/cluster/AbstractIndicesClusterStateServiceTestCase.java
@@ -362,7 +362,8 @@ public void updateShardState(ShardRouting shardRouting,
             } else if (shardRouting.primary()) {
                 // note: it's ok for a replica in post recovery to be started and promoted at once
                 // this can happen when the primary failed after we sent the start shard message
-                assertTrue("a replica can only be promoted when started", shardRouting.started());
+                assertTrue("a replica can only be promoted when active. current: " + this.shardRouting + " new: " + shardRouting,
+                    shardRouting.active());
             }
             this.shardRouting = shardRouting;
             if (shardRouting.primary()) {