Rename method refreshCacheVersion to updateCacheVersion

afoucret · Apr 22, 2024 · f05700a · f05700a
1 parent 492b2a5
commit f05700a
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 11 deletions.
diff --git a/...usterTest/java/org/elasticsearch/xpack/ml/integration/ChunkedTrainedModelPersisterIT.java b/...usterTest/java/org/elasticsearch/xpack/ml/integration/ChunkedTrainedModelPersisterIT.java
@@ -75,7 +75,7 @@ public void createComponents() throws Exception {
         doAnswer(invocationOnMock -> {
             invocationOnMock.getArgument(0, ActionListener.class).onResponse(AcknowledgedResponse.TRUE);
             return Void.TYPE;
-        }).when(modelCacheMetadataService).refreshCacheVersion(any(ActionListener.class));
+        }).when(modelCacheMetadataService).updateCacheVersion(any(ActionListener.class));
         trainedModelProvider = new TrainedModelProvider(client(), modelCacheMetadataService, xContentRegistry());
         waitForMlTemplates();
     }

diff --git a/...ternalClusterTest/java/org/elasticsearch/xpack/ml/integration/ModelInferenceActionIT.java b/...ternalClusterTest/java/org/elasticsearch/xpack/ml/integration/ModelInferenceActionIT.java
@@ -70,7 +70,7 @@ public void createComponents() throws Exception {
         doAnswer(invocationOnMock -> {
             invocationOnMock.getArgument(0, ActionListener.class).onResponse(AcknowledgedResponse.TRUE);
             return Void.TYPE;
-        }).when(modelCacheMetadataService).refreshCacheVersion(any(ActionListener.class));
+        }).when(modelCacheMetadataService).updateCacheVersion(any(ActionListener.class));
         trainedModelProvider = new TrainedModelProvider(client(), modelCacheMetadataService, xContentRegistry());
         waitForMlTemplates();
     }

diff --git a/...ternalClusterTest/java/org/elasticsearch/xpack/ml/integration/TrainedModelProviderIT.java b/...ternalClusterTest/java/org/elasticsearch/xpack/ml/integration/TrainedModelProviderIT.java
@@ -66,7 +66,7 @@ public void createComponents() throws Exception {
         doAnswer(invocationOnMock -> {
             invocationOnMock.getArgument(0, ActionListener.class).onResponse(AcknowledgedResponse.TRUE);
             return Void.TYPE;
-        }).when(modelCacheMetadataService).refreshCacheVersion(any(ActionListener.class));
+        }).when(modelCacheMetadataService).updateCacheVersion(any(ActionListener.class));
         trainedModelProvider = new TrainedModelProvider(client(), modelCacheMetadataService, xContentRegistry());
         waitForMlTemplates();
     }

diff --git a/...rc/main/java/org/elasticsearch/xpack/ml/action/TransportFlushTrainedModelCacheAction.java b/...rc/main/java/org/elasticsearch/xpack/ml/action/TransportFlushTrainedModelCacheAction.java
@@ -57,7 +57,7 @@ protected void masterOperation(
         ClusterState state,
         ActionListener<AcknowledgedResponse> listener
     ) {
-        modelCacheMetadataService.refreshCacheVersion(listener);
+        modelCacheMetadataService.updateCacheVersion(listener);
     }
 
     @Override

diff --git a/...va/org/elasticsearch/xpack/ml/inference/persistence/TrainedModelCacheMetadataService.java b/...va/org/elasticsearch/xpack/ml/inference/persistence/TrainedModelCacheMetadataService.java
@@ -44,7 +44,7 @@ public TrainedModelCacheMetadataService(ClusterService clusterService, Client cl
         clusterService.addListener(this);
     }
 
-    public void refreshCacheVersion(ActionListener<AcknowledgedResponse> listener) {
+    public void updateCacheVersion(ActionListener<AcknowledgedResponse> listener) {
         if (this.isMasterNode == false) {
             client.execute(FlushTrainedModelCacheAction.INSTANCE, new FlushTrainedModelCacheAction.Request(), listener);
             return;

diff --git a/.../src/main/java/org/elasticsearch/xpack/ml/inference/persistence/TrainedModelProvider.java b/.../src/main/java/org/elasticsearch/xpack/ml/inference/persistence/TrainedModelProvider.java
@@ -108,7 +108,6 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import static org.elasticsearch.core.Strings.format;
 import static org.elasticsearch.xpack.core.ClientHelper.ML_ORIGIN;
 import static org.elasticsearch.xpack.core.ClientHelper.executeAsyncWithOrigin;
 import static org.elasticsearch.xpack.core.ml.job.messages.Messages.INFERENCE_FAILED_TO_DESERIALIZE;
@@ -1387,7 +1386,7 @@ private static IndexRequest createRequest(IndexRequest request, String docId, To
     }
 
     private void refreshCacheVersion(ActionListener<Boolean> listener) {
-        modelCacheMetadataService.refreshCacheVersion(ActionListener.wrap(resp -> {
+        modelCacheMetadataService.updateCacheVersion(ActionListener.wrap(resp -> {
             // Checking the response is always AcknowledgedResponse.TRUE because AcknowledgedResponse.FALSE does not make sense.
             // Errors should be reported through the onFailure method of the listener.
             assert resp.equals(AcknowledgedResponse.TRUE);

diff --git a/...st/java/org/elasticsearch/xpack/ml/action/TransportFlushTrainedModelCacheActionTests.java b/...st/java/org/elasticsearch/xpack/ml/action/TransportFlushTrainedModelCacheActionTests.java
@@ -45,7 +45,7 @@ private void setupMocks() {
             ActionListener listener = invocationOnMock.getArgument(0, ActionListener.class);
             listener.onResponse(AcknowledgedResponse.TRUE);
             return null;
-        }).when(modelCacheMetadataService).refreshCacheVersion(any(ActionListener.class));
+        }).when(modelCacheMetadataService).updateCacheVersion(any(ActionListener.class));
     }
 
     @After
@@ -69,7 +69,7 @@ public void testOperation() {
         action.masterOperation(null, request, clusterState, listener);
 
         assertTrue(ack.get().isAcknowledged());
-        verify(modelCacheMetadataService).refreshCacheVersion(listener);
+        verify(modelCacheMetadataService).updateCacheVersion(listener);
     }
 
     private TransportFlushTrainedModelCacheAction createAction(ClusterService clusterService) {

diff --git a/...g/elasticsearch/xpack/ml/inference/persistence/TrainedModelCacheMetadataServiceTests.java b/...g/elasticsearch/xpack/ml/inference/persistence/TrainedModelCacheMetadataServiceTests.java
@@ -79,7 +79,7 @@ public void testRefreshCacheVersionOnMasterNode() {
 
         @SuppressWarnings("unchecked")
         final ActionListener<AcknowledgedResponse> listener = mock(ActionListener.class);
-        modelCacheMetadataService.refreshCacheVersion(listener);
+        modelCacheMetadataService.updateCacheVersion(listener);
 
         // Verify a cluster state update task were submitted.
         ArgumentCaptor<CacheMetadataUpdateTask> updateTaskCaptor = ArgumentCaptor.forClass(RefreshCacheMetadataVersionTask.class);
@@ -103,7 +103,7 @@ public void testRefreshCacheVersionOnNonMasterNode() {
 
         @SuppressWarnings("unchecked")
         final ActionListener<AcknowledgedResponse> listener = mock(ActionListener.class);
-        modelCacheMetadataService.refreshCacheVersion(listener);
+        modelCacheMetadataService.updateCacheVersion(listener);
 
         // Check a FlushTrainedModelCacheAction request is emitted to the master node, that will flush the cache.
         verify(client).execute(