Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[hotfix][coordination] Wire ZooKeeperJobGraphStore to the new interface
We introduce three specific composition implementations for ZooKeeper, ZooKeeperJobGraphStoreWatcher, ZooKeeperJobGraphStoreEventHandler, ZooKeeperJobGraphStoreUtil. * ZooKeeperJobGraphStoreWatcher is a watcher on JobGraphStore. It could monitor all the changes on the job graph store and notify the DefaultJobGraphStore via JobGraphStore.JobGraphListener. * ZooKeeperJobGraphStoreUtil is a utility class which could convert a ZooKeeper path to JobId, or vice versa.
- Loading branch information
1 parent
90df930
commit c3a6b51
Showing
9 changed files
with
425 additions
and
605 deletions.
There are no files selected for viewing
452 changes: 0 additions & 452 deletions
452
flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/ZooKeeperJobGraphStore.java
This file was deleted.
Oops, something went wrong.
39 changes: 39 additions & 0 deletions
39
...runtime/src/main/java/org/apache/flink/runtime/jobmanager/ZooKeeperJobGraphStoreUtil.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.flink.runtime.jobmanager; | ||
|
|
||
| import org.apache.flink.api.common.JobID; | ||
| import org.apache.flink.runtime.util.ZooKeeperUtils; | ||
|
|
||
| /** | ||
| * Singleton {@link JobGraphStoreUtil} implementation for ZooKeeper. | ||
| */ | ||
| public enum ZooKeeperJobGraphStoreUtil implements JobGraphStoreUtil { | ||
| INSTANCE; | ||
|
|
||
| @Override | ||
| public String jobIDToName(JobID jobId) { | ||
| return ZooKeeperUtils.getPathForJob(jobId); | ||
| } | ||
|
|
||
| @Override | ||
| public JobID nameToJobID(String name) { | ||
| return JobID.fromHexString(name); | ||
| } | ||
| } |
164 changes: 164 additions & 0 deletions
164
...time/src/main/java/org/apache/flink/runtime/jobmanager/ZooKeeperJobGraphStoreWatcher.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,164 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.flink.runtime.jobmanager; | ||
|
|
||
| import org.apache.flink.api.common.JobID; | ||
|
|
||
| import org.apache.flink.shaded.curator4.org.apache.curator.framework.CuratorFramework; | ||
| import org.apache.flink.shaded.curator4.org.apache.curator.framework.recipes.cache.PathChildrenCache; | ||
| import org.apache.flink.shaded.curator4.org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent; | ||
| import org.apache.flink.shaded.curator4.org.apache.curator.framework.recipes.cache.PathChildrenCacheListener; | ||
| import org.apache.flink.shaded.curator4.org.apache.curator.utils.ZKPaths; | ||
|
|
||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| import static org.apache.flink.util.Preconditions.checkNotNull; | ||
|
|
||
| /** | ||
| * {@link JobGraphStoreWatcher} implementation for ZooKeeper. | ||
| * | ||
| * <p>Each job graph creates ZNode: | ||
| * <pre> | ||
| * +----O /flink/jobgraphs/<job-id> 1 [persistent] | ||
| * . | ||
| * . | ||
| * . | ||
| * +----O /flink/jobgraphs/<job-id> N [persistent] | ||
| * </pre> | ||
| * | ||
| * <p>The root path is watched to detect concurrent modifications in corner situations where | ||
| * multiple instances operate concurrently. The job manager acts as a {@link JobGraphStore.JobGraphListener} | ||
| * to react to such situations. | ||
| */ | ||
| public class ZooKeeperJobGraphStoreWatcher implements JobGraphStoreWatcher { | ||
|
|
||
| private static final Logger LOG = LoggerFactory.getLogger(ZooKeeperJobGraphStoreWatcher.class); | ||
|
|
||
| /** | ||
| * Cache to monitor all children. This is used to detect races with other instances working | ||
| * on the same state. | ||
| */ | ||
| private final PathChildrenCache pathCache; | ||
|
|
||
| private JobGraphStore.JobGraphListener jobGraphListener; | ||
|
|
||
| private volatile boolean running; | ||
|
|
||
| public ZooKeeperJobGraphStoreWatcher(PathChildrenCache pathCache) { | ||
| this.pathCache = checkNotNull(pathCache); | ||
| this.pathCache.getListenable().addListener(new JobGraphsPathCacheListener()); | ||
| running = false; | ||
| } | ||
|
|
||
| @Override | ||
| public void start(JobGraphStore.JobGraphListener jobGraphListener) throws Exception { | ||
| this.jobGraphListener = checkNotNull(jobGraphListener); | ||
| running = true; | ||
| pathCache.start(); | ||
| } | ||
|
|
||
| @Override | ||
| public void stop() throws Exception { | ||
| if (!running) { | ||
| return; | ||
| } | ||
| running = false; | ||
|
|
||
| LOG.info("Stopping ZooKeeperJobGraphStoreWatcher "); | ||
| pathCache.close(); | ||
| } | ||
|
|
||
| /** | ||
| * Monitors ZooKeeper for changes. | ||
| * | ||
| * <p>Detects modifications from other job managers in corner situations. The event | ||
| * notifications fire for changes from this job manager as well. | ||
| */ | ||
| private final class JobGraphsPathCacheListener implements PathChildrenCacheListener { | ||
|
|
||
| @Override | ||
| public void childEvent(CuratorFramework client, PathChildrenCacheEvent event) { | ||
|
|
||
| if (LOG.isDebugEnabled()) { | ||
| if (event.getData() != null) { | ||
| LOG.debug("Received {} event (path: {})", event.getType(), event.getData().getPath()); | ||
| } | ||
| else { | ||
| LOG.debug("Received {} event", event.getType()); | ||
| } | ||
| } | ||
|
|
||
| switch (event.getType()) { | ||
| case CHILD_ADDED: { | ||
| JobID jobId = fromEvent(event); | ||
|
|
||
| LOG.debug("Received CHILD_ADDED event notification for job {}", jobId); | ||
|
|
||
| jobGraphListener.onAddedJobGraph(jobId); | ||
| } | ||
| break; | ||
|
|
||
| case CHILD_UPDATED: { | ||
| // Nothing to do | ||
| } | ||
| break; | ||
|
|
||
| case CHILD_REMOVED: { | ||
| JobID jobId = fromEvent(event); | ||
|
|
||
| LOG.debug("Received CHILD_REMOVED event notification for job {}", jobId); | ||
|
|
||
| jobGraphListener.onRemovedJobGraph(jobId); | ||
| } | ||
| break; | ||
|
|
||
| case CONNECTION_SUSPENDED: { | ||
| LOG.warn("ZooKeeper connection SUSPENDING. Changes to the submitted job " + | ||
| "graphs are not monitored (temporarily)."); | ||
| } | ||
| break; | ||
|
|
||
| case CONNECTION_LOST: { | ||
| LOG.warn("ZooKeeper connection LOST. Changes to the submitted job " + | ||
| "graphs are not monitored (permanently)."); | ||
| } | ||
| break; | ||
|
|
||
| case CONNECTION_RECONNECTED: { | ||
| LOG.info("ZooKeeper connection RECONNECTED. Changes to the submitted job " + | ||
| "graphs are monitored again."); | ||
| } | ||
| break; | ||
|
|
||
| case INITIALIZED: { | ||
| LOG.info("JobGraphsPathCacheListener initialized"); | ||
| } | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Returns a JobID for the event's path. | ||
| */ | ||
| private JobID fromEvent(PathChildrenCacheEvent event) { | ||
| return JobID.fromHexString(ZKPaths.getNodeFromPath(event.getData().getPath())); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.