From 33bb2ecfa8c144c529ac356f31b8c7562abb3370 Mon Sep 17 00:00:00 2001
From: Boaz Leskes <b.leskes@gmail.com>
Date: Tue, 17 Dec 2013 16:04:55 +0100
Subject: [PATCH] Added a time stamp to the cluster stats response

Making it consistent with NodeStats
---
 .../admin/cluster/stats/ClusterStatsResponse.java    | 12 ++++++++++--
 .../cluster/stats/TransportClusterStatsAction.java   |  3 ++-
 .../admin/cluster/stats/ClusterStatsTests.java       |  1 +
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsResponse.java b/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsResponse.java
index 53399f2f3b5..be74ffc48ec 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsResponse.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsResponse.java
@@ -37,22 +37,27 @@ import java.util.Map;
  */
 public class ClusterStatsResponse extends NodesOperationResponse<ClusterStatsNodeResponse> implements ToXContent {
 
-
     ClusterStatsNodes nodesStats;
     ClusterStatsIndices indicesStats;
     String clusterUUID;
+    long timestamp;
 
 
     ClusterStatsResponse() {
     }
 
-    public ClusterStatsResponse(ClusterName clusterName, String clusterUUID, ClusterStatsNodeResponse[] nodes) {
+    public ClusterStatsResponse(long timestamp, ClusterName clusterName, String clusterUUID, ClusterStatsNodeResponse[] nodes) {
         super(clusterName, null);
+        this.timestamp = timestamp;
         this.clusterUUID = clusterUUID;
         nodesStats = new ClusterStatsNodes(nodes);
         indicesStats = new ClusterStatsIndices(nodes);
     }
 
+    public long getTimestamp() {
+        return this.timestamp;
+    }
+
     public ClusterStatsNodes getNodesStats() {
         return nodesStats;
     }
@@ -84,6 +89,7 @@ public class ClusterStatsResponse extends NodesOperationResponse<ClusterStatsNod
     @Override
     public void readFrom(StreamInput in) throws IOException {
         super.readFrom(in);
+        timestamp = in.readVLong();
         clusterUUID = in.readString();
         nodesStats = ClusterStatsNodes.readNodeStats(in);
         indicesStats = ClusterStatsIndices.readIndicesStats(in);
@@ -92,6 +98,7 @@ public class ClusterStatsResponse extends NodesOperationResponse<ClusterStatsNod
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
+        out.writeVLong(timestamp);
         out.writeString(clusterUUID);
         nodesStats.writeTo(out);
         indicesStats.writeTo(out);
@@ -106,6 +113,7 @@ public class ClusterStatsResponse extends NodesOperationResponse<ClusterStatsNod
 
     @Override
     public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
+        builder.field("timestamp", getTimestamp());
         builder.field(Fields.CLUSTER_NAME, getClusterName().value());
         if (params.paramAsBoolean("output_uuid", false)) {
             builder.field(Fields.UUID, clusterUUID);
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java
index c5fd5af3939..7eaf14a21c1 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java
@@ -86,7 +86,8 @@ public class TransportClusterStatsAction extends TransportNodesOperationAction<C
                 nodeStats.add((ClusterStatsNodeResponse) resp);
             }
         }
-        return new ClusterStatsResponse(clusterName, clusterService.state().metaData().uuid(), nodeStats.toArray(new ClusterStatsNodeResponse[nodeStats.size()]));
+        return new ClusterStatsResponse(System.currentTimeMillis(), clusterName,
+                clusterService.state().metaData().uuid(), nodeStats.toArray(new ClusterStatsNodeResponse[nodeStats.size()]));
     }
 
     @Override
diff --git a/src/test/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsTests.java b/src/test/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsTests.java
index d338445dd27..6d5d5d51a7a 100644
--- a/src/test/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsTests.java
+++ b/src/test/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsTests.java
@@ -112,6 +112,7 @@ public class ClusterStatsTests extends ElasticsearchIntegrationTest {
         index("test1", "type", "1", "f", "f");
 
         ClusterStatsResponse response = client().admin().cluster().prepareClusterStats().get();
+        assertThat(response.getTimestamp(), Matchers.greaterThan(946681200000l)); // 1 Jan 2000
         assertThat(response.indicesStats.getStore().getSizeInBytes(), Matchers.greaterThan(0l));
 
         assertThat(response.nodesStats.getFs().getTotal().bytes(), Matchers.greaterThan(0l));