From 513ed58d177466052efd278d3fed401d30cc3afa Mon Sep 17 00:00:00 2001
From: Ali Beyad <ali@elastic.co>
Date: Tue, 13 Sep 2016 12:36:20 -0400
Subject: [PATCH] Added a indices flush to the rolling upgrades rest tests to
 ensure they are on disk for the upgraded nodes to pick up.

---
 qa/rolling-upgrade/build.gradle                               | 4 ++--
 .../resources/rest-api-spec/test/mixed_cluster/10_basic.yaml  | 4 ++++
 .../resources/rest-api-spec/test/old_cluster/10_basic.yaml    | 4 ++++
 .../rest-api-spec/test/upgraded_cluster/10_basic.yaml         | 4 ++++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/qa/rolling-upgrade/build.gradle b/qa/rolling-upgrade/build.gradle
index 456db46d666..acc59bb3bed 100644
--- a/qa/rolling-upgrade/build.gradle
+++ b/qa/rolling-upgrade/build.gradle
@@ -39,7 +39,7 @@ task mixedClusterTest(type: RestIntegTestTask) {
     distribution = 'zip'
     clusterName = 'rolling-upgrade'
     unicastTransportUri = { seedNode, node, ant -> oldClusterTest.nodes.get(0).transportUri() }
-    dataDir = "${-> oldClusterTest.nodes[1].getDataDir()}"
+    dataDir = "${-> oldClusterTest.nodes[1].dataDir}"
   }
   systemProperty 'tests.rest.suite', 'mixed_cluster'
 
@@ -51,7 +51,7 @@ task upgradedClusterTest(type: RestIntegTestTask) {
     distribution = 'zip'
     clusterName = 'rolling-upgrade'
     unicastTransportUri = { seedNode, node, ant -> mixedClusterTest.nodes.get(0).transportUri() }
-    dataDir = "${-> oldClusterTest.nodes[0].getDataDir()}"
+    dataDir = "${-> oldClusterTest.nodes[0].dataDir}"
   }
   systemProperty 'tests.rest.suite', 'upgraded_cluster'
 }
diff --git a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/10_basic.yaml b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/10_basic.yaml
index dcfa946ed64..7caca10911f 100644
--- a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/10_basic.yaml
+++ b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/10_basic.yaml
@@ -21,6 +21,10 @@
           - '{"index": {"_index": "test_index", "_type": "test_type"}}'
           - '{"f1": "v5_mixed", "f2": 9}'
 
+ - do:
+     indices.flush:
+        index: test_index
+
  - do:
      search:
         index: test_index
diff --git a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/10_basic.yaml b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/10_basic.yaml
index 76c6adda21e..7230c67e3d2 100644
--- a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/10_basic.yaml
+++ b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/10_basic.yaml
@@ -15,6 +15,10 @@
           - '{"index": {"_index": "test_index", "_type": "test_type"}}'
           - '{"f1": "v5_old", "f2": 4}'
 
+ - do:
+     indices.flush:
+        index: test_index
+
  - do:
      search:
         index: test_index
diff --git a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/10_basic.yaml b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/10_basic.yaml
index f6606c758a0..a0a68b00987 100644
--- a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/10_basic.yaml
+++ b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/10_basic.yaml
@@ -21,6 +21,10 @@
           - '{"index": {"_index": "test_index", "_type": "test_type"}}'
           - '{"f1": "v5_upgraded", "f2": 14}'
 
+ - do:
+     indices.flush:
+        index: test_index
+
  - do:
      search:
         index: test_index