Test was not updated with #18187

core/src/test/java/org/elasticsearch/rest/action/cat/RestRecoveryActionTests.java

@@ -127,26 +127,29 @@ public class RestRecoveryActionTests extends ESTestCase {
         assertNotNull(table);
 
         List<Table.Cell> headers = table.getHeaders();
+
         assertThat(headers.get(0).value, equalTo("index"));
         assertThat(headers.get(1).value, equalTo("shard"));
         assertThat(headers.get(2).value, equalTo("time"));
         assertThat(headers.get(3).value, equalTo("type"));
         assertThat(headers.get(4).value, equalTo("stage"));
         assertThat(headers.get(5).value, equalTo("source_host"));
-        assertThat(headers.get(6).value, equalTo("target_host"));
-        assertThat(headers.get(7).value, equalTo("repository"));
-        assertThat(headers.get(8).value, equalTo("snapshot"));
-        assertThat(headers.get(9).value, equalTo("files"));
-        assertThat(headers.get(10).value, equalTo("files_recovered"));
-        assertThat(headers.get(11).value, equalTo("files_percent"));
-        assertThat(headers.get(12).value, equalTo("files_total"));
-        assertThat(headers.get(13).value, equalTo("bytes"));
-        assertThat(headers.get(14).value, equalTo("bytes_recovered"));
-        assertThat(headers.get(15).value, equalTo("bytes_percent"));
-        assertThat(headers.get(16).value, equalTo("bytes_total"));
-        assertThat(headers.get(17).value, equalTo("translog_ops"));
-        assertThat(headers.get(18).value, equalTo("translog_ops_recovered"));
-        assertThat(headers.get(19).value, equalTo("translog_ops_percent"));
+        assertThat(headers.get(6).value, equalTo("source_node"));
+        assertThat(headers.get(7).value, equalTo("target_host"));
+        assertThat(headers.get(8).value, equalTo("target_node"));
+        assertThat(headers.get(9).value, equalTo("repository"));
+        assertThat(headers.get(10).value, equalTo("snapshot"));
+        assertThat(headers.get(11).value, equalTo("files"));
+        assertThat(headers.get(12).value, equalTo("files_recovered"));
+        assertThat(headers.get(13).value, equalTo("files_percent"));
+        assertThat(headers.get(14).value, equalTo("files_total"));
+        assertThat(headers.get(15).value, equalTo("bytes"));
+        assertThat(headers.get(16).value, equalTo("bytes_recovered"));
+        assertThat(headers.get(17).value, equalTo("bytes_percent"));
+        assertThat(headers.get(18).value, equalTo("bytes_total"));
+        assertThat(headers.get(19).value, equalTo("translog_ops"));
+        assertThat(headers.get(20).value, equalTo("translog_ops_recovered"));
+        assertThat(headers.get(21).value, equalTo("translog_ops_percent"));
 
         assertThat(table.getRows().size(), equalTo(successfulShards));
         for (int i = 0; i < successfulShards; i++) {
@@ -158,24 +161,26 @@ public class RestRecoveryActionTests extends ESTestCase {
             assertThat(cells.get(3).value, equalTo(state.getType().name().toLowerCase(Locale.ROOT)));
             assertThat(cells.get(4).value, equalTo(state.getStage().name().toLowerCase(Locale.ROOT)));
             assertThat(cells.get(5).value, equalTo(state.getSourceNode() == null ? "n/a" : state.getSourceNode().getHostName()));
-            assertThat(cells.get(6).value, equalTo(state.getTargetNode().getHostName()));
+            assertThat(cells.get(6).value, equalTo(state.getSourceNode() == null ? "n/a" : state.getSourceNode().getName()));
+            assertThat(cells.get(7).value, equalTo(state.getTargetNode().getHostName()));
+            assertThat(cells.get(8).value, equalTo(state.getTargetNode().getName()));
             assertThat(
-                    cells.get(7).value,
+                    cells.get(9).value,
                     equalTo(state.getRestoreSource() == null ? "n/a" : state.getRestoreSource().snapshotId().getRepository()));
             assertThat(
-                    cells.get(8).value,
+                    cells.get(10).value,
                     equalTo(state.getRestoreSource() == null ? "n/a" : state.getRestoreSource().snapshotId().getSnapshot()));
-            assertThat(cells.get(9).value, equalTo(state.getIndex().totalRecoverFiles()));
-            assertThat(cells.get(10).value, equalTo(state.getIndex().recoveredFileCount()));
-            assertThat(cells.get(11).value, equalTo(percent(state.getIndex().recoveredFilesPercent())));
-            assertThat(cells.get(12).value, equalTo(state.getIndex().totalFileCount()));
-            assertThat(cells.get(13).value, equalTo(state.getIndex().totalRecoverBytes()));
-            assertThat(cells.get(14).value, equalTo(state.getIndex().recoveredBytes()));
-            assertThat(cells.get(15).value, equalTo(percent(state.getIndex().recoveredBytesPercent())));
-            assertThat(cells.get(16).value, equalTo(state.getIndex().totalBytes()));
-            assertThat(cells.get(17).value, equalTo(state.getTranslog().totalOperations()));
-            assertThat(cells.get(18).value, equalTo(state.getTranslog().recoveredOperations()));
-            assertThat(cells.get(19).value, equalTo(percent(state.getTranslog().recoveredPercent())));
+            assertThat(cells.get(11).value, equalTo(state.getIndex().totalRecoverFiles()));
+            assertThat(cells.get(12).value, equalTo(state.getIndex().recoveredFileCount()));
+            assertThat(cells.get(13).value, equalTo(percent(state.getIndex().recoveredFilesPercent())));
+            assertThat(cells.get(14).value, equalTo(state.getIndex().totalFileCount()));
+            assertThat(cells.get(15).value, equalTo(state.getIndex().totalRecoverBytes()));
+            assertThat(cells.get(16).value, equalTo(state.getIndex().recoveredBytes()));
+            assertThat(cells.get(17).value, equalTo(percent(state.getIndex().recoveredBytesPercent())));
+            assertThat(cells.get(18).value, equalTo(state.getIndex().totalBytes()));
+            assertThat(cells.get(19).value, equalTo(state.getTranslog().totalOperations()));
+            assertThat(cells.get(20).value, equalTo(state.getTranslog().recoveredOperations()));
+            assertThat(cells.get(21).value, equalTo(percent(state.getTranslog().recoveredPercent())));
         }
     }