moving timing data under detailed flag.

Signed-off-by: Rishikesh1159 <[email protected]>
opensearch-project · Feb 20, 2023 · e9b91d0 · e9b91d0
1 parent 043d886
commit e9b91d0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 17 deletions.
diff --git a/server/src/main/java/org/opensearch/rest/action/cat/RestCatSegmentReplicationAction.java b/server/src/main/java/org/opensearch/rest/action/cat/RestCatSegmentReplicationAction.java
@@ -92,10 +92,6 @@ protected Table getTableWithHeader(RestRequest request) {
         t.startHeaders()
             .addCell("index", "alias:i,idx;desc:index name")
             .addCell("shardId", "alias:s;desc: shard Id")
-            .addCell("start_time", "default:false;alias:start;desc:segment replication start time")
-            .addCell("start_time_millis", "default:false;alias:start_millis;desc:segment replication start time in epoch milliseconds")
-            .addCell("stop_time", "default:false;alias:stop;desc:segment replication stop time")
-            .addCell("stop_time_millis", "default:false;alias:stop_millis;desc:segment replication stop time in epoch milliseconds")
             .addCell("time", "alias:t,ti;desc:segment replication time")
             .addCell("stage", "alias:st;desc:segment replication stage")
             .addCell("source_description", "alias:sdesc;desc:source description")
@@ -106,7 +102,11 @@ protected Table getTableWithHeader(RestRequest request) {
             .addCell("bytes_fetched", "alias:bf;desc:bytes fetched")
             .addCell("bytes_percent", "alias:bp;desc:percent of bytes fetched");
         if (detailed) {
-            t.addCell("files", "alias:f;desc:number of files to fetch")
+            t.addCell("start_time", "alias:start;desc:segment replication start time")
+                .addCell("start_time_millis", "alias:start_millis;desc:segment replication start time in epoch milliseconds")
+                .addCell("stop_time", "alias:stop;desc:segment replication stop time")
+                .addCell("stop_time_millis", "alias:stop_millis;desc:segment replication stop time in epoch milliseconds")
+                .addCell("files", "alias:f;desc:number of files to fetch")
                 .addCell("files_total", "alias:tf;desc:total number of files")
                 .addCell("bytes", "alias:b;desc:number of bytes to fetch")
                 .addCell("bytes_total", "alias:tb;desc:total number of bytes")
@@ -162,10 +162,6 @@ public int compare(SegmentReplicationState o1, SegmentReplicationState o2) {
                 t.startRow();
                 t.addCell(index);
                 t.addCell(state.getShardRouting().shardId().id());
-                t.addCell(XContentOpenSearchExtension.DEFAULT_DATE_PRINTER.print(state.getTimer().startTime()));
-                t.addCell(state.getTimer().startTime());
-                t.addCell(XContentOpenSearchExtension.DEFAULT_DATE_PRINTER.print(state.getTimer().stopTime()));
-                t.addCell(state.getTimer().stopTime());
                 t.addCell(new TimeValue(state.getTimer().time()));
                 t.addCell(state.getStage().toString().toLowerCase(Locale.ROOT));
                 t.addCell(state.getSourceDescription());
@@ -176,6 +172,10 @@ public int compare(SegmentReplicationState o1, SegmentReplicationState o2) {
                 t.addCell(state.getIndex().recoveredBytes());
                 t.addCell(String.format(Locale.ROOT, "%1.1f%%", state.getIndex().recoveredBytesPercent()));
                 if (detailed) {
+                    t.addCell(XContentOpenSearchExtension.DEFAULT_DATE_PRINTER.print(state.getTimer().startTime()));
+                    t.addCell(state.getTimer().startTime());
+                    t.addCell(XContentOpenSearchExtension.DEFAULT_DATE_PRINTER.print(state.getTimer().stopTime()));
+                    t.addCell(state.getTimer().stopTime());
                     t.addCell(state.getIndex().totalRecoverFiles());
                     t.addCell(state.getIndex().totalFileCount());
                     t.addCell(state.getIndex().totalRecoverBytes());

diff --git a/...er/src/test/java/org/opensearch/rest/action/cat/RestCatSegmentReplicationActionTests.java b/...er/src/test/java/org/opensearch/rest/action/cat/RestCatSegmentReplicationActionTests.java
@@ -92,10 +92,6 @@ public void testSegmentReplicationAction() {
         final List<String> expectedHeaders = Arrays.asList(
             "index",
             "shardId",
-            "start_time",
-            "start_time_millis",
-            "stop_time",
-            "stop_time_millis",
             "time",
             "stage",
             "source_description",
@@ -118,10 +114,6 @@ public void testSegmentReplicationAction() {
             final List<Object> expectedValues = Arrays.asList(
                 "index",
                 i,
-                XContentOpenSearchExtension.DEFAULT_DATE_PRINTER.print(state.getTimer().startTime()),
-                state.getTimer().startTime(),
-                XContentOpenSearchExtension.DEFAULT_DATE_PRINTER.print(state.getTimer().stopTime()),
-                state.getTimer().stopTime(),
                 new TimeValue(state.getTimer().time()),
                 state.getStage().name().toLowerCase(Locale.ROOT),
                 state.getSourceDescription(),