Moved initialisation of data node timing of request from NodeTermsEnu…

…mRequest constructor to TransportTermsEnumAction#asyncNodeOperation
elastic · May 6, 2021 · cf70053 · cf70053
1 parent 6d55f99
commit cf70053
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/...ore/src/main/java/org/elasticsearch/xpack/core/termsenum/action/NodeTermsEnumRequest.java b/...ore/src/main/java/org/elasticsearch/xpack/core/termsenum/action/NodeTermsEnumRequest.java
@@ -39,9 +39,6 @@ public class NodeTermsEnumRequest extends TransportRequest implements IndicesReq
 
     public NodeTermsEnumRequest(StreamInput in) throws IOException {
         super(in);
-        // Set the clock running as soon as we appear on a node.
-        nodeStartedTimeMillis = System.currentTimeMillis();
-
         field = in.readString();
         string = in.readString();
         caseInsensitive = in.readBoolean();
@@ -85,15 +82,19 @@ public long taskStartedTimeMillis() {
 
     /** 
      * The time this request was materialized on a node
-     * (defaults to "now" if serialization was not used e.g. a local request).
      */
-    public long nodeStartedTimeMillis() {
+    long nodeStartedTimeMillis() {
+        // In case startTimerOnDataNode has not been called (should never happen in normal circumstances?)
         if (nodeStartedTimeMillis == 0) {
             nodeStartedTimeMillis = System.currentTimeMillis();
         }
         return this.nodeStartedTimeMillis;
     }    
 
+    public void startTimerOnDataNode() {
+        nodeStartedTimeMillis = System.currentTimeMillis();
+    }
+
     public Set<ShardId> shardIds() {
         return Collections.unmodifiableSet(shardIds);
     }

diff --git a/...src/main/java/org/elasticsearch/xpack/core/termsenum/action/TransportTermsEnumAction.java b/...src/main/java/org/elasticsearch/xpack/core/termsenum/action/TransportTermsEnumAction.java
@@ -576,8 +576,11 @@ public void messageReceived(NodeTermsEnumRequest request, TransportChannel chann
 
     private void asyncNodeOperation(NodeTermsEnumRequest request, Task task, ActionListener<NodeTermsEnumResponse> listener)
         throws IOException {
+        // Start the clock ticking on the data node using the data node's local current time.
+        request.startTimerOnDataNode();
+
         // DLS/FLS check copied from ResizeRequestInterceptor - check permissions and
-        // any index_filter canMatch checks on network thread before allocating work
+        // any index_filter canMatch checks on network thread before allocating work        
         ThreadContext threadContext = transportService.getThreadPool().getThreadContext();
         final XPackLicenseState frozenLicenseState = licenseState.copyCurrentLicenseState();
         for (ShardId shardId : request.shardIds().toArray(new ShardId[0])) {