[flink] branch master updated (48e1385 -> 2b9410e)

[tr...@apache.org]

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 48e1385  [FLINK-13831] Correct Free Slots / All Slots display error
     add 2b9410e  [FLINK-13573][coordination] Merge SubmittedJobGraph into JobGraph

No new revisions were added by this update.

Summary of changes:
 .../flink/runtime/dispatcher/Dispatcher.java       | 45 +++++-----
 .../flink/runtime/dispatcher/MiniDispatcher.java   |  2 +-
 ...GraphStore.java => SingleJobJobGraphStore.java} | 20 ++---
 .../runtime/dispatcher/StandaloneDispatcher.java   |  2 +-
 .../highavailability/HighAvailabilityServices.java | 16 ++--
 .../nonha/AbstractNonHaServices.java               |  8 +-
 .../zookeeper/ZooKeeperHaServices.java             |  6 +-
 ...mittedJobGraphStore.java => JobGraphStore.java} | 34 ++++----
 ...raphStore.java => StandaloneJobGraphStore.java} | 10 +--
 .../runtime/jobmanager/SubmittedJobGraph.java      | 65 --------------
 ...GraphStore.java => ZooKeeperJobGraphStore.java} | 51 +++++------
 .../apache/flink/runtime/util/ZooKeeperUtils.java  | 30 +++----
 .../flink/runtime/dispatcher/DispatcherHATest.java | 44 +++++-----
 .../dispatcher/DispatcherResourceCleanupTest.java  |  6 +-
 .../flink/runtime/dispatcher/DispatcherTest.java   | 39 ++++-----
 ...JobGraphStore.java => FaultyJobGraphStore.java} | 10 +--
 ...raphListener.java => NoOpJobGraphListener.java} |  6 +-
 .../runtime/dispatcher/TestingDispatcher.java      |  2 +-
 .../dispatcher/ZooKeeperHADispatcherTest.java      | 33 ++++----
 .../TestingHighAvailabilityServices.java           | 14 +--
 .../TestingHighAvailabilityServicesBuilder.java    | 12 +--
 .../TestingManualHighAvailabilityServices.java     |  8 +-
 ...eTest.java => StandaloneJobGraphStoreTest.java} |  8 +-
 ...reTest.java => ZooKeeperJobGraphStoreTest.java} | 32 +++----
 ...ase.java => ZooKeeperJobGraphsStoreITCase.java} | 99 ++++++++++------------
 ...bGraphStore.java => InMemoryJobGraphStore.java} | 24 +++---
 .../AbstractYarnNonHaServices.java                 |  4 +-
 .../YarnPreConfiguredMasterHaServicesTest.java     |  2 +-
 28 files changed, 273 insertions(+), 359 deletions(-)
 rename flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/{SingleJobSubmittedJobGraphStore.java => SingleJobJobGraphStore.java} (72%)
 rename flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/{SubmittedJobGraphStore.java => JobGraphStore.java} (66%)
 rename flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/{StandaloneSubmittedJobGraphStore.java => StandaloneJobGraphStore.java} (80%)
 delete mode 100644 flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/SubmittedJobGraph.java
 rename flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/{ZooKeeperSubmittedJobGraphStore.java => ZooKeeperJobGraphStore.java} (87%)
 rename flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/{FaultySubmittedJobGraphStore.java => FaultyJobGraphStore.java} (80%)
 rename flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/{NoOpSubmittedJobGraphListener.java => NoOpJobGraphListener.java} (79%)
 rename flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/{StandaloneSubmittedJobGraphStoreTest.java => StandaloneJobGraphStoreTest.java} (83%)
 rename flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/{ZooKeeperSubmittedJobGraphStoreTest.java => ZooKeeperJobGraphStoreTest.java} (74%)
 rename flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/{ZooKeeperSubmittedJobGraphsStoreITCase.java => ZooKeeperJobGraphsStoreITCase.java} (63%)
 rename flink-runtime/src/test/java/org/apache/flink/runtime/testutils/{InMemorySubmittedJobGraphStore.java => InMemoryJobGraphStore.java} (75%)