ProactiveStorageIT fix and debug info (#67094)

Fix simple bug and add a bit more debug info to help diagnosing if this fails again. Closes #66864
elastic · Jan 12, 2021 · a3a0a9d · a3a0a9d
1 parent 60ae51f
commit a3a0a9d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/...ernalClusterTest/java/org/elasticsearch/xpack/autoscaling/storage/ProactiveStorageIT.java b/...ernalClusterTest/java/org/elasticsearch/xpack/autoscaling/storage/ProactiveStorageIT.java
@@ -83,7 +83,7 @@ public void testScaleUp() throws IOException, InterruptedException {
                     )
                     .toArray(IndexRequestBuilder[]::new)
             );
-            client().admin().indices().rolloverIndex(new RolloverRequest(dsName, null));
+            assertAcked(client().admin().indices().rolloverIndex(new RolloverRequest(dsName, null)).actionGet());
         }
         forceMerge();
         refresh();
@@ -104,6 +104,7 @@ public void testScaleUp() throws IOException, InterruptedException {
         assertThat(response.results().get(policyName).currentCapacity().total().storage().getBytes(), Matchers.equalTo(enoughSpace));
         // ideally, we would count replicas too, but we leave this for follow-up work
         assertThat(
+            response.getResults().get(policyName).toString(),
             response.results().get(policyName).requiredCapacity().total().storage().getBytes(),
             Matchers.greaterThanOrEqualTo(enoughSpace + used)
         );

diff --git a/...src/main/java/org/elasticsearch/xpack/autoscaling/capacity/AutoscalingDeciderResults.java b/...src/main/java/org/elasticsearch/xpack/autoscaling/capacity/AutoscalingDeciderResults.java
@@ -7,6 +7,7 @@
 package org.elasticsearch.xpack.autoscaling.capacity;
 
 import org.elasticsearch.cluster.node.DiscoveryNode;
+import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
@@ -139,4 +140,9 @@ public boolean equals(Object o) {
     public int hashCode() {
         return Objects.hash(currentCapacity, results);
     }
+
+    @Override
+    public String toString() {
+        return Strings.toString(this);
+    }
 }