You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by zh...@apache.org on 2021/06/29 12:29:14 UTC

[flink-benchmarks] 02/02: [FLINK-23078]Add teardown method for all scheduler benchmarks

This is an automated email from the ASF dual-hosted git repository.

zhuzh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink-benchmarks.git

commit 6090943d792333f82609db362215c678468d4b67
Author: Thesharing <cy...@outlook.com>
AuthorDate: Tue Jun 29 11:30:44 2021 +0800

    [FLINK-23078]Add teardown method for all scheduler benchmarks
---
 .../DeployingDownstreamTasksInBatchJobBenchmarkExecutor.java       | 6 ++++++
 .../deploying/DeployingTasksInStreamingJobBenchmarkExecutor.java   | 6 ++++++
 .../scheduler/benchmark/e2e/CreateSchedulerBenchmarkExecutor.java  | 2 +-
 .../benchmark/e2e/SchedulingAndDeployingBenchmarkExecutor.java     | 2 +-
 .../failover/RegionToRestartInBatchJobBenchmarkExecutor.java       | 6 ++++++
 .../failover/RegionToRestartInStreamingJobBenchmarkExecutor.java   | 6 ++++++
 .../PartitionReleaseInBatchJobBenchmarkExecutor.java               | 7 +++++++
 .../scheduling/InitSchedulingStrategyBenchmarkExecutor.java        | 7 +++++++
 .../SchedulingDownstreamTasksInBatchJobBenchmarkExecutor.java      | 7 +++++++
 .../benchmark/topology/BuildExecutionGraphBenchmarkExecutor.java   | 7 +++++++
 10 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/flink/scheduler/benchmark/deploying/DeployingDownstreamTasksInBatchJobBenchmarkExecutor.java b/src/main/java/org/apache/flink/scheduler/benchmark/deploying/DeployingDownstreamTasksInBatchJobBenchmarkExecutor.java
index c54cdcd..89a46f7 100644
--- a/src/main/java/org/apache/flink/scheduler/benchmark/deploying/DeployingDownstreamTasksInBatchJobBenchmarkExecutor.java
+++ b/src/main/java/org/apache/flink/scheduler/benchmark/deploying/DeployingDownstreamTasksInBatchJobBenchmarkExecutor.java
@@ -29,6 +29,7 @@ import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.Param;
 import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.TearDown;
 import org.openjdk.jmh.runner.RunnerException;
 
 /**
@@ -57,4 +58,9 @@ public class DeployingDownstreamTasksInBatchJobBenchmarkExecutor extends Schedul
 	public void deployDownstreamTasks() throws Exception {
 		benchmark.deployDownstreamTasks();
 	}
+
+	@TearDown(Level.Trial)
+	public void teardown() {
+		benchmark.teardown();
+	}
 }
diff --git a/src/main/java/org/apache/flink/scheduler/benchmark/deploying/DeployingTasksInStreamingJobBenchmarkExecutor.java b/src/main/java/org/apache/flink/scheduler/benchmark/deploying/DeployingTasksInStreamingJobBenchmarkExecutor.java
index 61434e8..bbabaf4 100644
--- a/src/main/java/org/apache/flink/scheduler/benchmark/deploying/DeployingTasksInStreamingJobBenchmarkExecutor.java
+++ b/src/main/java/org/apache/flink/scheduler/benchmark/deploying/DeployingTasksInStreamingJobBenchmarkExecutor.java
@@ -29,6 +29,7 @@ import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.Param;
 import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.TearDown;
 import org.openjdk.jmh.runner.RunnerException;
 
 /**
@@ -57,4 +58,9 @@ public class DeployingTasksInStreamingJobBenchmarkExecutor extends SchedulerBenc
 	public void deployAllTasks() throws Exception {
 		benchmark.deployAllTasks();
 	}
+
+	@TearDown(Level.Trial)
+	public void teardown() {
+		benchmark.teardown();
+	}
 }
diff --git a/src/main/java/org/apache/flink/scheduler/benchmark/e2e/CreateSchedulerBenchmarkExecutor.java b/src/main/java/org/apache/flink/scheduler/benchmark/e2e/CreateSchedulerBenchmarkExecutor.java
index abdf50e..b14a6df 100644
--- a/src/main/java/org/apache/flink/scheduler/benchmark/e2e/CreateSchedulerBenchmarkExecutor.java
+++ b/src/main/java/org/apache/flink/scheduler/benchmark/e2e/CreateSchedulerBenchmarkExecutor.java
@@ -59,7 +59,7 @@ public class CreateSchedulerBenchmarkExecutor extends SchedulerBenchmarkExecutor
 	}
 
 	@TearDown(Level.Trial)
-	public void teardownTrial() throws Exception {
+	public void teardown() {
 		benchmark.teardown();
 	}
 }
diff --git a/src/main/java/org/apache/flink/scheduler/benchmark/e2e/SchedulingAndDeployingBenchmarkExecutor.java b/src/main/java/org/apache/flink/scheduler/benchmark/e2e/SchedulingAndDeployingBenchmarkExecutor.java
index 00b3899..153c3d8 100644
--- a/src/main/java/org/apache/flink/scheduler/benchmark/e2e/SchedulingAndDeployingBenchmarkExecutor.java
+++ b/src/main/java/org/apache/flink/scheduler/benchmark/e2e/SchedulingAndDeployingBenchmarkExecutor.java
@@ -58,7 +58,7 @@ public class SchedulingAndDeployingBenchmarkExecutor extends SchedulerBenchmarkE
 	}
 
 	@TearDown(Level.Trial)
-	public void teardownTrial() throws Exception {
+	public void teardown() {
 		benchmark.teardown();
 	}
 }
diff --git a/src/main/java/org/apache/flink/scheduler/benchmark/failover/RegionToRestartInBatchJobBenchmarkExecutor.java b/src/main/java/org/apache/flink/scheduler/benchmark/failover/RegionToRestartInBatchJobBenchmarkExecutor.java
index 9815968..c8504b9 100644
--- a/src/main/java/org/apache/flink/scheduler/benchmark/failover/RegionToRestartInBatchJobBenchmarkExecutor.java
+++ b/src/main/java/org/apache/flink/scheduler/benchmark/failover/RegionToRestartInBatchJobBenchmarkExecutor.java
@@ -28,6 +28,7 @@ import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.Param;
 import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.TearDown;
 import org.openjdk.jmh.infra.Blackhole;
 import org.openjdk.jmh.runner.RunnerException;
 
@@ -56,4 +57,9 @@ public class RegionToRestartInBatchJobBenchmarkExecutor extends SchedulerBenchma
 	public void calculateRegionToRestart(Blackhole blackhole) {
 		blackhole.consume(benchmark.calculateRegionToRestart());
 	}
+
+	@TearDown(Level.Trial)
+	public void teardown() {
+		benchmark.teardown();
+	}
 }
diff --git a/src/main/java/org/apache/flink/scheduler/benchmark/failover/RegionToRestartInStreamingJobBenchmarkExecutor.java b/src/main/java/org/apache/flink/scheduler/benchmark/failover/RegionToRestartInStreamingJobBenchmarkExecutor.java
index f7f6d5d..2b1543e 100644
--- a/src/main/java/org/apache/flink/scheduler/benchmark/failover/RegionToRestartInStreamingJobBenchmarkExecutor.java
+++ b/src/main/java/org/apache/flink/scheduler/benchmark/failover/RegionToRestartInStreamingJobBenchmarkExecutor.java
@@ -28,6 +28,7 @@ import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.Param;
 import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.TearDown;
 import org.openjdk.jmh.infra.Blackhole;
 import org.openjdk.jmh.runner.RunnerException;
 
@@ -56,4 +57,9 @@ public class RegionToRestartInStreamingJobBenchmarkExecutor extends SchedulerBen
 	public void calculateRegionToRestart(Blackhole blackhole) {
 		blackhole.consume(benchmark.calculateRegionToRestart());
 	}
+
+	@TearDown(Level.Trial)
+	public void teardown() {
+		benchmark.teardown();
+	}
 }
diff --git a/src/main/java/org/apache/flink/scheduler/benchmark/partitionrelease/PartitionReleaseInBatchJobBenchmarkExecutor.java b/src/main/java/org/apache/flink/scheduler/benchmark/partitionrelease/PartitionReleaseInBatchJobBenchmarkExecutor.java
index 3568548..3657874 100644
--- a/src/main/java/org/apache/flink/scheduler/benchmark/partitionrelease/PartitionReleaseInBatchJobBenchmarkExecutor.java
+++ b/src/main/java/org/apache/flink/scheduler/benchmark/partitionrelease/PartitionReleaseInBatchJobBenchmarkExecutor.java
@@ -19,6 +19,7 @@
 package org.apache.flink.scheduler.benchmark.partitionrelease;
 
 import org.apache.flink.runtime.scheduler.benchmark.JobConfiguration;
+import org.apache.flink.runtime.scheduler.benchmark.SchedulerBenchmarkUtils;
 import org.apache.flink.runtime.scheduler.benchmark.partitionrelease.PartitionReleaseInBatchJobBenchmark;
 import org.apache.flink.scheduler.benchmark.SchedulerBenchmarkExecutorBase;
 
@@ -28,6 +29,7 @@ import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.Param;
 import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.TearDown;
 import org.openjdk.jmh.runner.RunnerException;
 
 /**
@@ -55,4 +57,9 @@ public class PartitionReleaseInBatchJobBenchmarkExecutor extends SchedulerBenchm
 	public void partitionRelease() {
 		benchmark.partitionRelease();
 	}
+
+	@TearDown(Level.Trial)
+	public void teardown() {
+		benchmark.teardown();
+	}
 }
diff --git a/src/main/java/org/apache/flink/scheduler/benchmark/scheduling/InitSchedulingStrategyBenchmarkExecutor.java b/src/main/java/org/apache/flink/scheduler/benchmark/scheduling/InitSchedulingStrategyBenchmarkExecutor.java
index 8e4ce3d..21c66d8 100644
--- a/src/main/java/org/apache/flink/scheduler/benchmark/scheduling/InitSchedulingStrategyBenchmarkExecutor.java
+++ b/src/main/java/org/apache/flink/scheduler/benchmark/scheduling/InitSchedulingStrategyBenchmarkExecutor.java
@@ -19,6 +19,7 @@
 package org.apache.flink.scheduler.benchmark.scheduling;
 
 import org.apache.flink.runtime.scheduler.benchmark.JobConfiguration;
+import org.apache.flink.runtime.scheduler.benchmark.SchedulerBenchmarkUtils;
 import org.apache.flink.runtime.scheduler.benchmark.scheduling.InitSchedulingStrategyBenchmark;
 import org.apache.flink.scheduler.benchmark.SchedulerBenchmarkExecutorBase;
 
@@ -28,6 +29,7 @@ import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.Param;
 import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.TearDown;
 import org.openjdk.jmh.infra.Blackhole;
 import org.openjdk.jmh.runner.RunnerException;
 
@@ -56,4 +58,9 @@ public class InitSchedulingStrategyBenchmarkExecutor extends SchedulerBenchmarkE
 	public void initSchedulingStrategy(Blackhole blackhole) {
 		blackhole.consume(benchmark.initSchedulingStrategy());
 	}
+
+	@TearDown(Level.Trial)
+	public void teardown() {
+		benchmark.teardown();
+	}
 }
diff --git a/src/main/java/org/apache/flink/scheduler/benchmark/scheduling/SchedulingDownstreamTasksInBatchJobBenchmarkExecutor.java b/src/main/java/org/apache/flink/scheduler/benchmark/scheduling/SchedulingDownstreamTasksInBatchJobBenchmarkExecutor.java
index bd3b7ef..7968ff9 100644
--- a/src/main/java/org/apache/flink/scheduler/benchmark/scheduling/SchedulingDownstreamTasksInBatchJobBenchmarkExecutor.java
+++ b/src/main/java/org/apache/flink/scheduler/benchmark/scheduling/SchedulingDownstreamTasksInBatchJobBenchmarkExecutor.java
@@ -19,6 +19,7 @@
 package org.apache.flink.scheduler.benchmark.scheduling;
 
 import org.apache.flink.runtime.scheduler.benchmark.JobConfiguration;
+import org.apache.flink.runtime.scheduler.benchmark.SchedulerBenchmarkUtils;
 import org.apache.flink.runtime.scheduler.benchmark.scheduling.SchedulingDownstreamTasksInBatchJobBenchmark;
 import org.apache.flink.scheduler.benchmark.SchedulerBenchmarkExecutorBase;
 
@@ -28,6 +29,7 @@ import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.Param;
 import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.TearDown;
 import org.openjdk.jmh.runner.RunnerException;
 
 /**
@@ -55,4 +57,9 @@ public class SchedulingDownstreamTasksInBatchJobBenchmarkExecutor extends Schedu
 	public void schedulingDownstreamTasks() {
 		benchmark.schedulingDownstreamTasks();
 	}
+
+	@TearDown(Level.Trial)
+	public void teardown() {
+		benchmark.teardown();
+	}
 }
diff --git a/src/main/java/org/apache/flink/scheduler/benchmark/topology/BuildExecutionGraphBenchmarkExecutor.java b/src/main/java/org/apache/flink/scheduler/benchmark/topology/BuildExecutionGraphBenchmarkExecutor.java
index 5f193a7..cf97809 100644
--- a/src/main/java/org/apache/flink/scheduler/benchmark/topology/BuildExecutionGraphBenchmarkExecutor.java
+++ b/src/main/java/org/apache/flink/scheduler/benchmark/topology/BuildExecutionGraphBenchmarkExecutor.java
@@ -19,6 +19,7 @@
 package org.apache.flink.scheduler.benchmark.topology;
 
 import org.apache.flink.runtime.scheduler.benchmark.JobConfiguration;
+import org.apache.flink.runtime.scheduler.benchmark.SchedulerBenchmarkUtils;
 import org.apache.flink.runtime.scheduler.benchmark.topology.BuildExecutionGraphBenchmark;
 import org.apache.flink.scheduler.benchmark.SchedulerBenchmarkExecutorBase;
 
@@ -28,6 +29,7 @@ import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.Param;
 import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.TearDown;
 import org.openjdk.jmh.runner.RunnerException;
 
 /**
@@ -55,4 +57,9 @@ public class BuildExecutionGraphBenchmarkExecutor extends SchedulerBenchmarkExec
 	public void buildTopology() throws Exception {
 		benchmark.buildTopology();
 	}
+
+	@TearDown(Level.Trial)
+	public void teardown() {
+		benchmark.teardown();
+	}
 }