Skip to content

Commit d96ebe7

Browse files
samxbrsamxbr
committed
Revert cluster method changes
1 parent e9ebef4 commit d96ebe7

File tree

38 files changed

+141
-101
lines changed

38 files changed

+141
-101
lines changed

‎modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/EnterpriseGeoIpDownloaderIT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ private void deleteDatabaseConfiguration(String configurationName, ActionListene
173173

174174
private void startEnterpriseGeoIpDownloaderTask() {
175175
PersistentTasksService persistentTasksService = internalCluster().getInstance(PersistentTasksService.class);
176-
persistentTasksService.sendClusterStartRequest(
176+
persistentTasksService.sendStartRequest(
177177
ENTERPRISE_GEOIP_DOWNLOADER,
178178
ENTERPRISE_GEOIP_DOWNLOADER,
179179
new EnterpriseGeoIpTask.EnterpriseGeoIpTaskParams(),

‎modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderTaskExecutor.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ private static boolean isForeachProcessorWithGeoipProcessor(Map<String, Object>
367367
}
368368

369369
private void startTask(Runnable onFailure) {
370-
persistentTasksService.sendClusterStartRequest(
370+
persistentTasksService.sendStartRequest(
371371
GEOIP_DOWNLOADER,
372372
GEOIP_DOWNLOADER,
373373
new GeoIpTaskParams(),
@@ -393,7 +393,7 @@ private void stopTask(Runnable onFailure) {
393393
}
394394
}
395395
);
396-
persistentTasksService.sendClusterRemoveRequest(
396+
persistentTasksService.sendRemoveRequest(
397397
GEOIP_DOWNLOADER,
398398
MasterNodeRequest.INFINITE_MASTER_NODE_TIMEOUT,
399399
ActionListener.runAfter(listener, () -> {

‎server/src/internalClusterTest/java/org/elasticsearch/persistent/ClusterAndProjectPersistentTasksSmokeIT.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public void testCoexistenceOfClusterAndProjectPersistentTasks() throws Exception
5959
final PersistentTask<TestEmptyProjectParams> projectTask;
6060
{
6161
final PlainActionFuture<PersistentTask<TestEmptyProjectParams>> future = new PlainActionFuture<>();
62-
persistentTasksService.sendClusterStartRequest(
62+
persistentTasksService.sendStartRequest(
6363
randomUUID(),
6464
TestProjectPersistentTasksExecutor.NAME,
6565
TestEmptyProjectParams.INSTANCE,
@@ -73,7 +73,7 @@ public void testCoexistenceOfClusterAndProjectPersistentTasks() throws Exception
7373
final PersistentTask<TestEmptyClusterParams> clusterTask;
7474
{
7575
final PlainActionFuture<PersistentTask<TestEmptyClusterParams>> future = new PlainActionFuture<>();
76-
persistentTasksService.sendClusterStartRequest(
76+
persistentTasksService.sendStartRequest(
7777
randomUUID(),
7878
TestClusterPersistentTasksExecutor.NAME,
7979
TestEmptyClusterParams.INSTANCE,
@@ -108,7 +108,7 @@ public void testCoexistenceOfClusterAndProjectPersistentTasks() throws Exception
108108
if (randomBoolean()) {
109109
// Remove project task first
110110
final PlainActionFuture<PersistentTask<?>> future1 = new PlainActionFuture<>();
111-
persistentTasksService.sendClusterRemoveRequest(projectTask.getId(), TEST_REQUEST_TIMEOUT, future1);
111+
persistentTasksService.sendRemoveRequest(projectTask.getId(), TEST_REQUEST_TIMEOUT, future1);
112112
safeGet(future1);
113113

114114
assertBusy(() -> {
@@ -128,12 +128,12 @@ public void testCoexistenceOfClusterAndProjectPersistentTasks() throws Exception
128128
assertClusterStateHasTaskSize(clusterService, null, 1);
129129

130130
final PlainActionFuture<PersistentTask<?>> future2 = new PlainActionFuture<>();
131-
persistentTasksService.sendClusterRemoveRequest(clusterTask.getId(), TEST_REQUEST_TIMEOUT, future2);
131+
persistentTasksService.sendRemoveRequest(clusterTask.getId(), TEST_REQUEST_TIMEOUT, future2);
132132
safeGet(future2);
133133
} else {
134134
// Remove cluster task first
135135
final PlainActionFuture<PersistentTask<?>> future1 = new PlainActionFuture<>();
136-
persistentTasksService.sendClusterRemoveRequest(clusterTask.getId(), TEST_REQUEST_TIMEOUT, future1);
136+
persistentTasksService.sendRemoveRequest(clusterTask.getId(), TEST_REQUEST_TIMEOUT, future1);
137137
safeGet(future1);
138138

139139
assertBusy(() -> {
@@ -153,7 +153,7 @@ public void testCoexistenceOfClusterAndProjectPersistentTasks() throws Exception
153153
assertClusterStateHasTaskSize(clusterService, null, 0);
154154

155155
final PlainActionFuture<PersistentTask<?>> future2 = new PlainActionFuture<>();
156-
persistentTasksService.sendClusterRemoveRequest(projectTask.getId(), TEST_REQUEST_TIMEOUT, future2);
156+
persistentTasksService.sendRemoveRequest(projectTask.getId(), TEST_REQUEST_TIMEOUT, future2);
157157
safeGet(future2);
158158
}
159159

‎server/src/internalClusterTest/java/org/elasticsearch/persistent/PersistentTaskCreationFailureIT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public void onFailure(Exception e) {
111111

112112
safeAwait(
113113
l -> internalCluster().getInstance(PersistentTasksService.class)
114-
.sendClusterStartRequest(
114+
.sendStartRequest(
115115
UUIDs.base64UUID(),
116116
FailingCreationPersistentTaskExecutor.TASK_NAME,
117117
new FailingCreationTaskParams(),

‎server/src/internalClusterTest/java/org/elasticsearch/persistent/PersistentTaskInitializationFailureIT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public void testPersistentTasksThatFailDuringInitializationAreRemovedFromCluster
4646
PersistentTasksService persistentTasksService = internalCluster().getInstance(PersistentTasksService.class);
4747
PlainActionFuture<PersistentTasksCustomMetadata.PersistentTask<FailingInitializationTaskParams>> startPersistentTaskFuture =
4848
new PlainActionFuture<>();
49-
persistentTasksService.sendClusterStartRequest(
49+
persistentTasksService.sendStartRequest(
5050
UUIDs.base64UUID(),
5151
FailingInitializationPersistentTaskExecutor.TASK_NAME,
5252
new FailingInitializationTaskParams(),

‎server/src/internalClusterTest/java/org/elasticsearch/persistent/PersistentTasksExecutorFullRestartIT.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,7 @@ public void testFullClusterRestart() throws Exception {
4545
PlainActionFuture<PersistentTask<TestParams>> future = new PlainActionFuture<>();
4646
futures.add(future);
4747
taskIds[i] = UUIDs.base64UUID();
48-
service.sendClusterStartRequest(
49-
taskIds[i],
50-
TestPersistentTasksExecutor.NAME,
51-
new TestParams("Blah"),
52-
TEST_REQUEST_TIMEOUT,
53-
future
54-
);
48+
service.sendStartRequest(taskIds[i], TestPersistentTasksExecutor.NAME, new TestParams("Blah"), TEST_REQUEST_TIMEOUT, future);
5549
}
5650

5751
for (int i = 0; i < numberOfTasks; i++) {

‎server/src/internalClusterTest/java/org/elasticsearch/persistent/PersistentTasksExecutorIT.java‎

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public static class WaitForPersistentTaskFuture<Params extends PersistentTaskPar
9191
public void testPersistentActionFailure() throws Exception {
9292
PersistentTasksService persistentTasksService = internalCluster().getInstance(PersistentTasksService.class);
9393
PlainActionFuture<PersistentTask<TestParams>> future = new PlainActionFuture<>();
94-
persistentTasksService.sendClusterStartRequest(
94+
persistentTasksService.sendStartRequest(
9595
UUIDs.base64UUID(),
9696
TestPersistentTasksExecutor.NAME,
9797
new TestParams("Blah"),
@@ -128,7 +128,7 @@ public void testPersistentActionCompletion() throws Exception {
128128
PersistentTasksService persistentTasksService = internalCluster().getInstance(PersistentTasksService.class);
129129
PlainActionFuture<PersistentTask<TestParams>> future = new PlainActionFuture<>();
130130
String taskId = UUIDs.base64UUID();
131-
persistentTasksService.sendClusterStartRequest(
131+
persistentTasksService.sendStartRequest(
132132
taskId,
133133
TestPersistentTasksExecutor.NAME,
134134
new TestParams("Blah"),
@@ -153,7 +153,7 @@ public void testPersistentActionCompletion() throws Exception {
153153
logger.info("Simulating errant completion notification");
154154
// try sending completion request with incorrect allocation id
155155
PlainActionFuture<PersistentTask<?>> failedCompletionNotificationFuture = new PlainActionFuture<>();
156-
persistentTasksService.sendClusterCompletionRequest(
156+
persistentTasksService.sendCompletionRequest(
157157
taskId,
158158
Long.MAX_VALUE,
159159
null,
@@ -182,7 +182,7 @@ public void testPersistentActionWithNoAvailableNode() throws Exception {
182182
PlainActionFuture<PersistentTask<TestParams>> future = new PlainActionFuture<>();
183183
TestParams testParams = new TestParams("Blah");
184184
testParams.setExecutorNodeAttr("test");
185-
persistentTasksService.sendClusterStartRequest(
185+
persistentTasksService.sendStartRequest(
186186
UUIDs.base64UUID(),
187187
TestPersistentTasksExecutor.NAME,
188188
testParams,
@@ -212,7 +212,7 @@ public void testPersistentActionWithNoAvailableNode() throws Exception {
212212

213213
// Remove the persistent task
214214
PlainActionFuture<PersistentTask<?>> removeFuture = new PlainActionFuture<>();
215-
persistentTasksService.sendClusterRemoveRequest(taskId, TEST_REQUEST_TIMEOUT, removeFuture);
215+
persistentTasksService.sendRemoveRequest(taskId, TEST_REQUEST_TIMEOUT, removeFuture);
216216
assertEquals(removeFuture.get().getId(), taskId);
217217
}
218218

@@ -229,7 +229,7 @@ public void testPersistentActionWithNonClusterStateCondition() throws Exception
229229
PersistentTasksService persistentTasksService = internalCluster().getInstance(PersistentTasksService.class);
230230
PlainActionFuture<PersistentTask<TestParams>> future = new PlainActionFuture<>();
231231
TestParams testParams = new TestParams("Blah");
232-
persistentTasksService.sendClusterStartRequest(
232+
persistentTasksService.sendStartRequest(
233233
UUIDs.base64UUID(),
234234
TestPersistentTasksExecutor.NAME,
235235
testParams,
@@ -250,14 +250,14 @@ public void testPersistentActionWithNonClusterStateCondition() throws Exception
250250

251251
// Remove the persistent task
252252
PlainActionFuture<PersistentTask<?>> removeFuture = new PlainActionFuture<>();
253-
persistentTasksService.sendClusterRemoveRequest(taskId, TEST_REQUEST_TIMEOUT, removeFuture);
253+
persistentTasksService.sendRemoveRequest(taskId, TEST_REQUEST_TIMEOUT, removeFuture);
254254
assertEquals(removeFuture.get().getId(), taskId);
255255
}
256256

257257
public void testPersistentActionStatusUpdate() throws Exception {
258258
PersistentTasksService persistentTasksService = internalCluster().getInstance(PersistentTasksService.class);
259259
PlainActionFuture<PersistentTask<TestParams>> future = new PlainActionFuture<>();
260-
persistentTasksService.sendClusterStartRequest(
260+
persistentTasksService.sendStartRequest(
261261
UUIDs.base64UUID(),
262262
TestPersistentTasksExecutor.NAME,
263263
new TestParams("Blah"),
@@ -310,13 +310,7 @@ public void testPersistentActionStatusUpdate() throws Exception {
310310
assertFutureThrows(future1, IllegalStateException.class, "timed out after 10ms");
311311

312312
PlainActionFuture<PersistentTask<?>> failedUpdateFuture = new PlainActionFuture<>();
313-
persistentTasksService.sendClusterUpdateStateRequest(
314-
taskId,
315-
-2,
316-
new State("should fail"),
317-
TEST_REQUEST_TIMEOUT,
318-
failedUpdateFuture
319-
);
313+
persistentTasksService.sendUpdateStateRequest(taskId, -2, new State("should fail"), TEST_REQUEST_TIMEOUT, failedUpdateFuture);
320314
assertFutureThrows(
321315
failedUpdateFuture,
322316
ResourceNotFoundException.class,
@@ -341,7 +335,7 @@ public void testCreatePersistentTaskWithDuplicateId() throws Exception {
341335
PersistentTasksService persistentTasksService = internalCluster().getInstance(PersistentTasksService.class);
342336
PlainActionFuture<PersistentTask<TestParams>> future = new PlainActionFuture<>();
343337
String taskId = UUIDs.base64UUID();
344-
persistentTasksService.sendClusterStartRequest(
338+
persistentTasksService.sendStartRequest(
345339
taskId,
346340
TestPersistentTasksExecutor.NAME,
347341
new TestParams("Blah"),
@@ -351,7 +345,7 @@ public void testCreatePersistentTaskWithDuplicateId() throws Exception {
351345
future.get();
352346

353347
PlainActionFuture<PersistentTask<TestParams>> future2 = new PlainActionFuture<>();
354-
persistentTasksService.sendClusterStartRequest(
348+
persistentTasksService.sendStartRequest(
355349
taskId,
356350
TestPersistentTasksExecutor.NAME,
357351
new TestParams("Blah"),
@@ -393,7 +387,7 @@ public void testUnassignRunningPersistentTask() throws Exception {
393387
PlainActionFuture<PersistentTask<TestParams>> future = new PlainActionFuture<>();
394388
TestParams testParams = new TestParams("Blah");
395389
testParams.setExecutorNodeAttr("test");
396-
persistentTasksService.sendClusterStartRequest(
390+
persistentTasksService.sendStartRequest(
397391
UUIDs.base64UUID(),
398392
TestPersistentTasksExecutor.NAME,
399393
testParams,
@@ -456,7 +450,7 @@ public void testAbortLocally() throws Exception {
456450
persistentTasksClusterService.setRecheckInterval(TimeValue.timeValueMillis(1));
457451
PersistentTasksService persistentTasksService = internalCluster().getInstance(PersistentTasksService.class);
458452
PlainActionFuture<PersistentTask<TestParams>> future = new PlainActionFuture<>();
459-
persistentTasksService.sendClusterStartRequest(
453+
persistentTasksService.sendStartRequest(
460454
UUIDs.base64UUID(),
461455
TestPersistentTasksExecutor.NAME,
462456
new TestParams("Blah"),

‎server/src/internalClusterTest/java/org/elasticsearch/persistent/decider/EnableAssignmentDeciderIT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public void testEnableAssignmentAfterRestart() throws Exception {
4848
final CountDownLatch latch = new CountDownLatch(numberOfTasks);
4949
for (int i = 0; i < numberOfTasks; i++) {
5050
PersistentTasksService service = internalCluster().getInstance(PersistentTasksService.class);
51-
service.sendClusterStartRequest(
51+
service.sendStartRequest(
5252
"task_" + i,
5353
TestPersistentTasksExecutor.NAME,
5454
new TestParams(randomAlphaOfLength(10)),

‎server/src/main/java/org/elasticsearch/health/node/selection/HealthNodeTaskExecutor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ public PersistentTasksCustomMetadata.Assignment getAssignment(
150150
void startTask(ClusterChangedEvent event) {
151151
// Wait until master is stable before starting health task
152152
if (event.localNodeMaster() && event.state().clusterRecovered() && HealthNode.findTask(event.state()) == null) {
153-
persistentTasksService.sendClusterStartRequest(
153+
persistentTasksService.sendStartRequest(
154154
TASK_NAME,
155155
TASK_NAME,
156156
new HealthNodeTaskParams(),

‎server/src/main/java/org/elasticsearch/persistent/AllocatedPersistentTask.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public void updatePersistentTaskState(
6565
final PersistentTaskState state,
6666
final ActionListener<PersistentTasksCustomMetadata.PersistentTask<?>> listener
6767
) {
68-
persistentTasksService.sendClusterUpdateStateRequest(
68+
persistentTasksService.sendUpdateStateRequest(
6969
persistentTaskId,
7070
allocationId,
7171
state,
@@ -202,7 +202,7 @@ private void completeAndNotifyIfNeeded(@Nullable Exception failure, @Nullable St
202202
this.failure = failure;
203203
if (prevState == State.STARTED) {
204204
logger.trace("sending notification for completed task [{}] with id [{}]", getAction(), getPersistentTaskId());
205-
persistentTasksService.sendClusterCompletionRequest(
205+
persistentTasksService.sendCompletionRequest(
206206
getPersistentTaskId(),
207207
getAllocationId(),
208208
failure,

0 commit comments

Comments
 (0)