tillrohrmann closed pull request #6485: [hotfix] [test] Wait CompletableFuture
complete
URL: https://github.com/apache/flink/pull/6485
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/JobMasterTest.java
b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/JobMasterTest.java
index 36da21a3479..891ff82c413 100644
---
a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/JobMasterTest.java
+++
b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/JobMasterTest.java
@@ -500,7 +500,7 @@ public void testSlotRequestTimeoutWhenNoSlotOffering()
throws Exception {
final long end = System.nanoTime();
// we rely on the slot request timeout to fail a stuck
scheduling operation
- assertThat((end-start) / 1_000_000L,
Matchers.greaterThanOrEqualTo(slotRequestTimeout));
+ assertThat((end - start) / 1_000_000L,
Matchers.greaterThanOrEqualTo(slotRequestTimeout));
assertThat(submittedTaskFuture.isDone(), is(false));
@@ -599,9 +599,11 @@ public void testReconnectionAfterDisconnect() throws
Exception {
final JobMasterGateway jobMasterGateway =
jobMaster.getSelfGateway(JobMasterGateway.class);
- jobMaster.start(jobMasterId, testingTimeout);
+ CompletableFuture<Acknowledge> startFuture =
jobMaster.start(jobMasterId, testingTimeout);
try {
+ // wait for the start to complete
+ startFuture.get(testingTimeout.toMilliseconds(),
TimeUnit.MILLISECONDS);
final TestingResourceManagerGateway
testingResourceManagerGateway = new TestingResourceManagerGateway();
final BlockingQueue<JobMasterId> registrationsQueue =
new ArrayBlockingQueue<>(1);
@@ -641,9 +643,12 @@ public void
testResourceManagerConnectionAfterRegainingLeadership() throws Excep
haServices,
new TestingJobManagerSharedServicesBuilder().build());
- jobMaster.start(jobMasterId, testingTimeout);
+ CompletableFuture<Acknowledge> startFuture =
jobMaster.start(jobMasterId, testingTimeout);
try {
+ // wait for the start to complete
+ startFuture.get(testingTimeout.toMilliseconds(),
TimeUnit.MILLISECONDS);
+
final TestingResourceManagerGateway
testingResourceManagerGateway = new TestingResourceManagerGateway();
final BlockingQueue<JobMasterId> registrationQueue =
new ArrayBlockingQueue<>(1);
@@ -687,9 +692,12 @@ public void testRequestPartitionState() throws Exception {
new TestingJobManagerSharedServicesBuilder().build(),
heartbeatServices);
- jobMaster.start(jobMasterId, testingTimeout);
+ CompletableFuture<Acknowledge> startFuture =
jobMaster.start(jobMasterId, testingTimeout);
try {
+ // wait for the start to complete
+ startFuture.get(testingTimeout.toMilliseconds(),
TimeUnit.MILLISECONDS);
+
final TestingResourceManagerGateway
testingResourceManagerGateway = new TestingResourceManagerGateway();
final CompletableFuture<AllocationID>
allocationIdFuture = new CompletableFuture<>();
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
