[FLINK-22636][zk] Group job specific zNodes under /jobs zNode

In order to better clean up job specific HA services, this commit changes the layout of the zNode structure so that the JobMaster leader, checkpoints and checkpoint counter is now grouped below the jobs/ zNode. Moreover, this commit groups the leaders of the cluster components (Dispatcher, ResourceManager, RestServer) under /leader/process/latch and /leader/process/connection-info.
apache · May 11, 2021 · dec4d6b · dec4d6b
1 parent 35ca4cf
commit dec4d6b
Show file tree

Hide file tree

Showing 23 changed files with 313 additions and 342 deletions.
diff --git a/docs/layouts/shortcodes/generated/expert_high_availability_zk_section.html b/docs/layouts/shortcodes/generated/expert_high_availability_zk_section.html
@@ -38,36 +38,12 @@
             <td>Integer</td>
             <td>Defines the session timeout for the ZooKeeper session in ms.</td>
         </tr>
-        <tr>
-            <td><h5>high-availability.zookeeper.path.checkpoint-counter</h5></td>
-            <td style="word-wrap: break-word;">"/checkpoint-counter"</td>
-            <td>String</td>
-            <td>ZooKeeper root path (ZNode) for checkpoint counters.</td>
-        </tr>
-        <tr>
-            <td><h5>high-availability.zookeeper.path.checkpoints</h5></td>
-            <td style="word-wrap: break-word;">"/checkpoints"</td>
-            <td>String</td>
-            <td>ZooKeeper root path (ZNode) for completed checkpoints.</td>
-        </tr>
         <tr>
             <td><h5>high-availability.zookeeper.path.jobgraphs</h5></td>
             <td style="word-wrap: break-word;">"/jobgraphs"</td>
             <td>String</td>
             <td>ZooKeeper root path (ZNode) for job graphs</td>
         </tr>
-        <tr>
-            <td><h5>high-availability.zookeeper.path.latch</h5></td>
-            <td style="word-wrap: break-word;">"/leaderlatch"</td>
-            <td>String</td>
-            <td>Defines the znode of the leader latch which is used to elect the leader.</td>
-        </tr>
-        <tr>
-            <td><h5>high-availability.zookeeper.path.leader</h5></td>
-            <td style="word-wrap: break-word;">"/leader"</td>
-            <td>String</td>
-            <td>Defines the znode of the leader which contains the URL to the leader and the current leader session ID.</td>
-        </tr>
         <tr>
             <td><h5>high-availability.zookeeper.path.mesos-workers</h5></td>
             <td style="word-wrap: break-word;">"/mesos-workers"</td>

diff --git a/docs/layouts/shortcodes/generated/high_availability_configuration.html b/docs/layouts/shortcodes/generated/high_availability_configuration.html
@@ -62,36 +62,12 @@
             <td>Integer</td>
             <td>Defines the session timeout for the ZooKeeper session in ms.</td>
         </tr>
-        <tr>
-            <td><h5>high-availability.zookeeper.path.checkpoint-counter</h5></td>
-            <td style="word-wrap: break-word;">"/checkpoint-counter"</td>
-            <td>String</td>
-            <td>ZooKeeper root path (ZNode) for checkpoint counters.</td>
-        </tr>
-        <tr>
-            <td><h5>high-availability.zookeeper.path.checkpoints</h5></td>
-            <td style="word-wrap: break-word;">"/checkpoints"</td>
-            <td>String</td>
-            <td>ZooKeeper root path (ZNode) for completed checkpoints.</td>
-        </tr>
         <tr>
             <td><h5>high-availability.zookeeper.path.jobgraphs</h5></td>
             <td style="word-wrap: break-word;">"/jobgraphs"</td>
             <td>String</td>
             <td>ZooKeeper root path (ZNode) for job graphs</td>
         </tr>
-        <tr>
-            <td><h5>high-availability.zookeeper.path.latch</h5></td>
-            <td style="word-wrap: break-word;">"/leaderlatch"</td>
-            <td>String</td>
-            <td>Defines the znode of the leader latch which is used to elect the leader.</td>
-        </tr>
-        <tr>
-            <td><h5>high-availability.zookeeper.path.leader</h5></td>
-            <td style="word-wrap: break-word;">"/leader"</td>
-            <td>String</td>
-            <td>Defines the znode of the leader which contains the URL to the leader and the current leader session ID.</td>
-        </tr>
         <tr>
             <td><h5>high-availability.zookeeper.path.mesos-workers</h5></td>
             <td style="word-wrap: break-word;">"/mesos-workers"</td>

diff --git a/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java b/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java
@@ -1013,7 +1013,7 @@ public final class ConfigConstants {
     public static final String HA_ZOOKEEPER_NAMESPACE_KEY =
             "high-availability.zookeeper.path.namespace";
 
-    /** @deprecated in favor of {@link HighAvailabilityOptions#HA_ZOOKEEPER_LATCH_PATH}. */
+    /** @deprecated no longer used. */
     @PublicEvolving @Deprecated
     public static final String HA_ZOOKEEPER_LATCH_PATH = "high-availability.zookeeper.path.latch";
 
@@ -1026,14 +1026,14 @@ public final class ConfigConstants {
     public static final String HA_ZOOKEEPER_JOBGRAPHS_PATH =
             "high-availability.zookeeper.path.jobgraphs";
 
-    /** @deprecated in favor of {@link HighAvailabilityOptions#HA_ZOOKEEPER_LEADER_PATH}. */
+    /** @deprecated no longer used. */
     @PublicEvolving @Deprecated
     public static final String HA_ZOOKEEPER_LEADER_PATH = "high-availability.zookeeper.path.leader";
 
     /**
      * ZooKeeper root path (ZNode) for completed checkpoints.
      *
-     * @deprecated in favor of {@link HighAvailabilityOptions#HA_ZOOKEEPER_CHECKPOINTS_PATH}.
+     * @deprecated no longer used.
      */
     @PublicEvolving @Deprecated
     public static final String HA_ZOOKEEPER_CHECKPOINTS_PATH =
@@ -1042,7 +1042,7 @@ public final class ConfigConstants {
     /**
      * ZooKeeper root path (ZNode) for checkpoint counters.
      *
-     * @deprecated in favor of {@link HighAvailabilityOptions#HA_ZOOKEEPER_CHECKPOINT_COUNTER_PATH}.
+     * @deprecated no longer used.
      */
     @PublicEvolving @Deprecated
     public static final String HA_ZOOKEEPER_CHECKPOINT_COUNTER_PATH =
@@ -1691,21 +1691,19 @@ public final class ConfigConstants {
     /** @deprecated in favor of {@link HighAvailabilityOptions#HA_CLUSTER_ID}. */
     @Deprecated public static final String DEFAULT_ZOOKEEPER_NAMESPACE_KEY = "/default";
 
-    /** @deprecated in favor of {@link HighAvailabilityOptions#HA_ZOOKEEPER_LATCH_PATH}. */
+    /** @deprecated no longer used. */
     @Deprecated public static final String DEFAULT_ZOOKEEPER_LATCH_PATH = "/leaderlatch";
 
-    /** @deprecated in favor of {@link HighAvailabilityOptions#HA_ZOOKEEPER_LEADER_PATH}. */
+    /** @deprecated no longer used. */
     @Deprecated public static final String DEFAULT_ZOOKEEPER_LEADER_PATH = "/leader";
 
     /** @deprecated in favor of {@link HighAvailabilityOptions#HA_ZOOKEEPER_JOBGRAPHS_PATH}. */
     @Deprecated public static final String DEFAULT_ZOOKEEPER_JOBGRAPHS_PATH = "/jobgraphs";
 
-    /** @deprecated in favor of {@link HighAvailabilityOptions#HA_ZOOKEEPER_CHECKPOINTS_PATH}. */
+    /** @deprecated no longer used. */
     @Deprecated public static final String DEFAULT_ZOOKEEPER_CHECKPOINTS_PATH = "/checkpoints";
 
-    /**
-     * @deprecated in favor of {@link HighAvailabilityOptions#HA_ZOOKEEPER_CHECKPOINT_COUNTER_PATH}
-     */
+    /** @deprecated no longer used. */
     @Deprecated
     public static final String DEFAULT_ZOOKEEPER_CHECKPOINT_COUNTER_PATH = "/checkpoint-counter";
 

diff --git a/flink-core/src/main/java/org/apache/flink/configuration/HighAvailabilityOptions.java b/flink-core/src/main/java/org/apache/flink/configuration/HighAvailabilityOptions.java
@@ -115,14 +115,6 @@ public class HighAvailabilityOptions {
                     .withDescription(
                             "The root path under which Flink stores its entries in ZooKeeper.");
 
-    @Documentation.Section(Documentation.Sections.EXPERT_ZOOKEEPER_HIGH_AVAILABILITY)
-    public static final ConfigOption<String> HA_ZOOKEEPER_LATCH_PATH =
-            key("high-availability.zookeeper.path.latch")
-                    .defaultValue("/leaderlatch")
-                    .withDeprecatedKeys("recovery.zookeeper.path.latch")
-                    .withDescription(
-                            "Defines the znode of the leader latch which is used to elect the leader.");
-
     /** ZooKeeper root path (ZNode) for job graphs. */
     @Documentation.Section(Documentation.Sections.EXPERT_ZOOKEEPER_HIGH_AVAILABILITY)
     public static final ConfigOption<String> HA_ZOOKEEPER_JOBGRAPHS_PATH =
@@ -131,31 +123,6 @@ public class HighAvailabilityOptions {
                     .withDeprecatedKeys("recovery.zookeeper.path.jobgraphs")
                     .withDescription("ZooKeeper root path (ZNode) for job graphs");
 
-    @Documentation.Section(Documentation.Sections.EXPERT_ZOOKEEPER_HIGH_AVAILABILITY)
-    public static final ConfigOption<String> HA_ZOOKEEPER_LEADER_PATH =
-            key("high-availability.zookeeper.path.leader")
-                    .defaultValue("/leader")
-                    .withDeprecatedKeys("recovery.zookeeper.path.leader")
-                    .withDescription(
-                            "Defines the znode of the leader which contains the URL to the leader and the current"
-                                    + " leader session ID.");
-
-    /** ZooKeeper root path (ZNode) for completed checkpoints. */
-    @Documentation.Section(Documentation.Sections.EXPERT_ZOOKEEPER_HIGH_AVAILABILITY)
-    public static final ConfigOption<String> HA_ZOOKEEPER_CHECKPOINTS_PATH =
-            key("high-availability.zookeeper.path.checkpoints")
-                    .defaultValue("/checkpoints")
-                    .withDeprecatedKeys("recovery.zookeeper.path.checkpoints")
-                    .withDescription("ZooKeeper root path (ZNode) for completed checkpoints.");
-
-    /** ZooKeeper root path (ZNode) for checkpoint counters. */
-    @Documentation.Section(Documentation.Sections.EXPERT_ZOOKEEPER_HIGH_AVAILABILITY)
-    public static final ConfigOption<String> HA_ZOOKEEPER_CHECKPOINT_COUNTER_PATH =
-            key("high-availability.zookeeper.path.checkpoint-counter")
-                    .defaultValue("/checkpoint-counter")
-                    .withDeprecatedKeys("recovery.zookeeper.path.checkpoint-counter")
-                    .withDescription("ZooKeeper root path (ZNode) for checkpoint counters.");
-
     /** ZooKeeper root path (ZNode) for Mesos workers. */
     @PublicEvolving
     @Documentation.Section(Documentation.Sections.EXPERT_ZOOKEEPER_HIGH_AVAILABILITY)

diff --git a/...etes/src/main/java/org/apache/flink/kubernetes/highavailability/KubernetesHaServices.java b/...etes/src/main/java/org/apache/flink/kubernetes/highavailability/KubernetesHaServices.java
@@ -112,20 +112,20 @@ public CheckpointRecoveryFactory createCheckpointRecoveryFactory() {
                 kubeClient,
                 configuration,
                 ioExecutor,
-                this::getLeaderNameForJobManager,
+                this::getLeaderPathForJobManager,
                 lockIdentity);
     }
 
     @Override
     public JobGraphStore createJobGraphStore() throws Exception {
         return KubernetesUtils.createJobGraphStore(
-                configuration, kubeClient, getLeaderNameForDispatcher(), lockIdentity);
+                configuration, kubeClient, getLeaderPathForDispatcher(), lockIdentity);
     }
 
     @Override
     public RunningJobsRegistry createRunningJobsRegistry() {
         return new KubernetesRunningJobsRegistry(
-                kubeClient, getLeaderNameForDispatcher(), lockIdentity);
+                kubeClient, getLeaderPathForDispatcher(), lockIdentity);
     }
 
     @Override
@@ -143,21 +143,21 @@ public void internalCleanup() throws Exception {
     }
 
     @Override
-    protected String getLeaderNameForResourceManager() {
+    protected String getLeaderPathForResourceManager() {
         return getLeaderName(RESOURCE_MANAGER_NAME);
     }
 
     @Override
-    protected String getLeaderNameForDispatcher() {
+    protected String getLeaderPathForDispatcher() {
         return getLeaderName(DISPATCHER_NAME);
     }
 
-    public String getLeaderNameForJobManager(final JobID jobID) {
+    public String getLeaderPathForJobManager(final JobID jobID) {
         return getLeaderName(jobID.toString() + NAME_SEPARATOR + JOB_MANAGER_NAME);
     }
 
     @Override
-    protected String getLeaderNameForRestServer() {
+    protected String getLeaderPathForRestServer() {
         return getLeaderName(REST_SERVER_NAME);
     }
 

diff --git a/...ntime/src/main/java/org/apache/flink/runtime/checkpoint/ZooKeeperCheckpointIDCounter.java b/...ntime/src/main/java/org/apache/flink/runtime/checkpoint/ZooKeeperCheckpointIDCounter.java
@@ -18,8 +18,10 @@
 
 package org.apache.flink.runtime.checkpoint;
 
+import org.apache.flink.annotation.VisibleForTesting;
 import org.apache.flink.api.common.JobStatus;
 import org.apache.flink.runtime.jobmanager.HighAvailabilityMode;
+import org.apache.flink.runtime.util.ZooKeeperUtils;
 
 import org.apache.flink.shaded.curator4.org.apache.curator.framework.CuratorFramework;
 import org.apache.flink.shaded.curator4.org.apache.curator.framework.recipes.shared.SharedCount;
@@ -76,14 +78,11 @@ public class ZooKeeperCheckpointIDCounter implements CheckpointIDCounter {
      * Creates a {@link ZooKeeperCheckpointIDCounter} instance.
      *
      * @param client Curator ZooKeeper client
-     * @param counterPath ZooKeeper path for the counter. It's sufficient to have a path per-job.
      */
     public ZooKeeperCheckpointIDCounter(
-            CuratorFramework client,
-            String counterPath,
-            LastStateConnectionStateListener connectionStateListener) {
+            CuratorFramework client, LastStateConnectionStateListener connectionStateListener) {
         this.client = checkNotNull(client, "Curator client");
-        this.counterPath = checkNotNull(counterPath, "Counter path");
+        this.counterPath = ZooKeeperUtils.getCheckpointIdCounterPath();
         this.sharedCount = new SharedCount(client, counterPath, 1);
         this.connectionStateListener = connectionStateListener;
     }
@@ -176,4 +175,9 @@ private void checkConnectionState() {
                     }
                 });
     }
+
+    @VisibleForTesting
+    String getPath() {
+        return counterPath;
+    }
 }
diff --git a/...src/main/java/org/apache/flink/runtime/checkpoint/ZooKeeperCheckpointRecoveryFactory.java b/...src/main/java/org/apache/flink/runtime/checkpoint/ZooKeeperCheckpointRecoveryFactory.java
@@ -51,11 +51,17 @@ public CompletedCheckpointStore createCheckpointStore(
             throws Exception {
 
         return ZooKeeperUtils.createCompletedCheckpoints(
-                client, config, jobId, maxNumberOfCheckpointsToRetain, executor);
+                ZooKeeperUtils.useNamespaceAndEnsurePath(
+                        client, ZooKeeperUtils.getPathForJob(jobId)),
+                config,
+                maxNumberOfCheckpointsToRetain,
+                executor);
     }
 
     @Override
     public CheckpointIDCounter createCheckpointIDCounter(JobID jobID) throws Exception {
-        return ZooKeeperUtils.createCheckpointIDCounter(client, config, jobID);
+        return ZooKeeperUtils.createCheckpointIDCounter(
+                ZooKeeperUtils.useNamespaceAndEnsurePath(
+                        client, ZooKeeperUtils.getPathForJob(jobID)));
     }
 }