[hotfix] [runtime] Fix tests for JobManager metrics
Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/5ca06400 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/5ca06400 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/5ca06400 Branch: refs/heads/master Commit: 5ca06400151ab18227b576a28a266aafe8c954ef Parents: 0efa644 Author: Greg Hogan <[email protected]> Authored: Fri Jul 1 12:29:32 2016 -0400 Committer: Greg Hogan <[email protected]> Committed: Fri Jul 1 14:35:42 2016 -0400 ---------------------------------------------------------------------- .../flink/runtime/jobmanager/JobManagerHARecoveryTest.java | 3 ++- .../apache/flink/runtime/jobmanager/JobManagerMetricTest.java | 3 +-- .../runtime/leaderelection/JobManagerLeaderElectionTest.java | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/5ca06400/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerHARecoveryTest.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerHARecoveryTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerHARecoveryTest.java index 8ee4973..6064899 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerHARecoveryTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerHARecoveryTest.java @@ -148,7 +148,8 @@ public class JobManagerHARecoveryTest { mySubmittedJobGraphStore, new StandaloneCheckpointRecoveryFactory(), new SavepointStore(new HeapStateStore()), - jobRecoveryTimeout); + jobRecoveryTimeout, + Option.apply(null)); jobManager = system.actorOf(jobManagerProps, "jobmanager"); ActorGateway gateway = new AkkaActorGateway(jobManager, leaderSessionID); http://git-wip-us.apache.org/repos/asf/flink/blob/5ca06400/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerMetricTest.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerMetricTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerMetricTest.java index 5759888..077f3dc 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerMetricTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerMetricTest.java @@ -19,7 +19,6 @@ package org.apache.flink.runtime.jobmanager; import org.apache.flink.configuration.Configuration; import org.apache.flink.runtime.jobgraph.JobGraph; -import org.apache.flink.runtime.jobgraph.JobStatus; import org.apache.flink.runtime.jobgraph.JobVertex; import org.apache.flink.runtime.jobgraph.JobVertexID; import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable; @@ -74,7 +73,7 @@ public class JobManagerMetricTest { flink.submitJobDetached(jobGraph); Future<Object> jobRunning = flink.getLeaderGateway(deadline.timeLeft()) - .ask(new TestingJobManagerMessages.NotifyWhenJobStatus(jobGraph.getJobID(), JobStatus.RUNNING), deadline.timeLeft()); + .ask(new TestingJobManagerMessages.WaitForAllVerticesToBeRunning(jobGraph.getJobID()), deadline.timeLeft()); Await.ready(jobRunning, deadline.timeLeft()); MBeanServer mBeanServer = ManagementFactory.getPlatformMBeanServer(); http://git-wip-us.apache.org/repos/asf/flink/blob/5ca06400/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/JobManagerLeaderElectionTest.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/JobManagerLeaderElectionTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/JobManagerLeaderElectionTest.java index afc46a7..6b64d6f 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/JobManagerLeaderElectionTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/leaderelection/JobManagerLeaderElectionTest.java @@ -52,6 +52,7 @@ import org.junit.BeforeClass; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import scala.Option; import scala.concurrent.Await; import scala.concurrent.Future; import scala.concurrent.duration.FiniteDuration; @@ -198,7 +199,8 @@ public class JobManagerLeaderElectionTest extends TestLogger { submittedJobGraphStore, checkpointRecoveryFactory, savepointStore, - AkkaUtils.getDefaultTimeout() + AkkaUtils.getDefaultTimeout(), + Option.apply(null) ); } }
