You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tr...@apache.org on 2021/02/22 08:16:53 UTC
[flink] branch master updated (b813926 -> 50eca31)
This is an automated email from the ASF dual-hosted git repository.
trohrmann pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git.
from b813926 Revert FLINK-21417 due to performance regression.
add 0fc05a1 [FLINK-21402] Introduce SlotPoolServiceSchedulerFactory to bundle SlotPoolService and Scheduler factories
add 50eca31 [FLINK-21390] Rename DeclarativeScheduler to AdaptiveScheduler
No new revisions were added by this update.
Summary of changes:
.../apache/flink/configuration/ClusterOptions.java | 10 +-
.../flink/configuration/JobManagerOptions.java | 4 +-
.../dispatcher/DefaultJobManagerRunnerFactory.java | 14 +-
.../dispatcher/SchedulerNGFactoryFactory.java | 66 -------
.../DefaultSlotPoolServiceSchedulerFactory.java | 192 +++++++++++++++++++++
.../apache/flink/runtime/jobmaster/JobMaster.java | 19 +-
.../jobmaster/SlotPoolServiceSchedulerFactory.java | 78 +++++++++
.../factories/DefaultJobMasterServiceFactory.java | 16 +-
.../jobmaster/slotpool/SlotPoolServiceFactory.java | 29 ----
.../AdaptiveScheduler.java} | 24 +--
.../AdaptiveSchedulerFactory.java} | 10 +-
.../{declarative => adaptive}/Canceling.java | 2 +-
.../{declarative => adaptive}/Created.java | 4 +-
.../{declarative => adaptive}/Executing.java | 2 +-
.../{declarative => adaptive}/Failing.java | 2 +-
.../{declarative => adaptive}/Finished.java | 2 +-
.../JobGraphJobInformation.java | 4 +-
.../ParallelismAndResourceAssignments.java | 2 +-
.../ResourceConsumer.java | 2 +-
.../{declarative => adaptive}/Restarting.java | 2 +-
.../scheduler/{declarative => adaptive}/State.java | 4 +-
.../StateWithExecutionGraph.java | 2 +-
.../WaitingForResources.java | 2 +-
.../allocator/FreeSlotFunction.java | 2 +-
.../allocator/JobInformation.java | 2 +-
.../allocator/ReserveSlotFunction.java | 2 +-
.../allocator/SharedSlot.java | 5 +-
.../allocator/SlotAllocator.java | 2 +-
.../allocator/SlotSharingSlotAllocator.java | 2 +-
.../allocator/VertexParallelism.java | 2 +-
.../VertexParallelismWithSlotSharing.java | 2 +-
.../scalingpolicy/ReactiveScaleUpController.java | 2 +-
.../scalingpolicy/ScaleUpController.java | 8 +-
.../dispatcher/SchedulerNGFactoryFactoryTest.java | 85 ---------
...DefaultSlotPoolServiceSchedulerFactoryTest.java | 51 ++++++
.../runtime/jobmaster/JobMasterSchedulerTest.java | 6 +-
.../flink/runtime/jobmaster/JobMasterTest.java | 21 +--
.../jobmaster/slotpool/TestingSlotPoolService.java | 164 ++++++++++++++++++
.../slotpool/TestingSlotPoolServiceBuilder.java | 90 ++++++++++
.../runtime/jobmaster/utils/JobMasterBuilder.java | 31 +---
.../AdaptiveSchedulerBuilder.java} | 40 ++---
.../AdaptiveSchedulerClusterITCase.java} | 8 +-
.../AdaptiveSchedulerSimpleITCase.java} | 8 +-
.../AdaptiveSchedulerSlotSharingITCase.java} | 8 +-
.../AdaptiveSchedulerTest.java} | 122 ++++++-------
.../{declarative => adaptive}/CancelingTest.java | 4 +-
.../{declarative => adaptive}/CreatedTest.java | 4 +-
.../{declarative => adaptive}/ExecutingTest.java | 6 +-
.../{declarative => adaptive}/FailingTest.java | 6 +-
.../{declarative => adaptive}/FinishedTest.java | 4 +-
.../MockExecutionGraph.java | 2 +-
.../MockStateWithExecutionGraphContext.java | 2 +-
.../{declarative => adaptive}/RestartingTest.java | 6 +-
.../{declarative => adaptive}/StateTest.java | 2 +-
.../{declarative => adaptive}/StateValidator.java | 2 +-
.../WaitingForResourcesTest.java | 2 +-
.../allocator/SharedSlotTest.java | 2 +-
.../allocator/SlotSharingSlotAllocatorTest.java | 2 +-
.../allocator/TestSlotInfo.java | 2 +-
.../scalingpolicy/ScaleUpControllerTest.java | 2 +-
.../flink/test/runtime/BlockingShuffleITCase.java | 2 +-
...lerITCase.java => AdaptiveSchedulerITCase.java} | 8 +-
62 files changed, 795 insertions(+), 418 deletions(-)
delete mode 100644 flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/SchedulerNGFactoryFactory.java
create mode 100644 flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/DefaultSlotPoolServiceSchedulerFactory.java
create mode 100644 flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/SlotPoolServiceSchedulerFactory.java
rename flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/{declarative/DeclarativeScheduler.java => adaptive/AdaptiveScheduler.java} (97%)
rename flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/{declarative/DeclarativeSchedulerFactory.java => adaptive/AdaptiveSchedulerFactory.java} (93%)
rename flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/{declarative => adaptive}/Canceling.java (97%)
rename flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/{declarative => adaptive}/Created.java (96%)
rename flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/{declarative => adaptive}/Executing.java (99%)
rename flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/{declarative => adaptive}/Failing.java (98%)
rename flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/{declarative => adaptive}/Finished.java (97%)
rename flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/{declarative => adaptive}/JobGraphJobInformation.java (96%)
rename flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/{declarative => adaptive}/ParallelismAndResourceAssignments.java (97%)
rename flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/{declarative => adaptive}/ResourceConsumer.java (94%)
rename flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/{declarative => adaptive}/Restarting.java (98%)
rename flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/{declarative => adaptive}/State.java (97%)
rename flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/{declarative => adaptive}/StateWithExecutionGraph.java (99%)
rename flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/{declarative => adaptive}/WaitingForResources.java (99%)
rename flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/{declarative => adaptive}/allocator/FreeSlotFunction.java (95%)
rename flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/{declarative => adaptive}/allocator/JobInformation.java (96%)
rename flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/{declarative => adaptive}/allocator/ReserveSlotFunction.java (95%)
rename flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/{declarative => adaptive}/allocator/SharedSlot.java (96%)
rename flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/{declarative => adaptive}/allocator/SlotAllocator.java (97%)
rename flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/{declarative => adaptive}/allocator/SlotSharingSlotAllocator.java (99%)
rename flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/{declarative => adaptive}/allocator/VertexParallelism.java (95%)
rename flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/{declarative => adaptive}/allocator/VertexParallelismWithSlotSharing.java (96%)
rename flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/{declarative => adaptive}/scalingpolicy/ReactiveScaleUpController.java (95%)
rename flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/{declarative => adaptive}/scalingpolicy/ScaleUpController.java (86%)
delete mode 100644 flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/SchedulerNGFactoryFactoryTest.java
create mode 100644 flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/DefaultSlotPoolServiceSchedulerFactoryTest.java
create mode 100644 flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/TestingSlotPoolService.java
create mode 100644 flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/slotpool/TestingSlotPoolServiceBuilder.java
rename flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/{declarative/DeclarativeSchedulerBuilder.java => adaptive/AdaptiveSchedulerBuilder.java} (83%)
rename flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/{declarative/DeclarativeSchedulerClusterITCase.java => adaptive/AdaptiveSchedulerClusterITCase.java} (95%)
rename flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/{declarative/DeclarativeSchedulerSimpleITCase.java => adaptive/AdaptiveSchedulerSimpleITCase.java} (96%)
rename flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/{declarative/DeclarativeSchedulerSlotSharingITCase.java => adaptive/AdaptiveSchedulerSlotSharingITCase.java} (95%)
rename flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/{declarative/DeclarativeSchedulerTest.java => adaptive/AdaptiveSchedulerTest.java} (84%)
rename flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/{declarative => adaptive}/CancelingTest.java (98%)
rename flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/{declarative => adaptive}/CreatedTest.java (96%)
rename flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/{declarative => adaptive}/ExecutingTest.java (99%)
rename flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/{declarative => adaptive}/FailingTest.java (97%)
rename flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/{declarative => adaptive}/FinishedTest.java (96%)
rename flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/{declarative => adaptive}/MockExecutionGraph.java (98%)
rename flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/{declarative => adaptive}/MockStateWithExecutionGraphContext.java (98%)
rename flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/{declarative => adaptive}/RestartingTest.java (97%)
rename flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/{declarative => adaptive}/StateTest.java (98%)
rename flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/{declarative => adaptive}/StateValidator.java (98%)
rename flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/{declarative => adaptive}/WaitingForResourcesTest.java (99%)
rename flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/{declarative => adaptive}/allocator/SharedSlotTest.java (99%)
rename flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/{declarative => adaptive}/allocator/SlotSharingSlotAllocatorTest.java (99%)
rename flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/{declarative => adaptive}/allocator/TestSlotInfo.java (96%)
rename flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/{declarative => adaptive}/scalingpolicy/ScaleUpControllerTest.java (96%)
rename flink-tests/src/test/java/org/apache/flink/test/scheduling/{DeclarativeSchedulerITCase.java => AdaptiveSchedulerITCase.java} (96%)