From 75581b7543cfb2560090d349f9879a3d6fda142c Mon Sep 17 00:00:00 2001 From: wjf Date: Wed, 29 Jun 2022 11:20:52 +0800 Subject: [PATCH] [Improvement]Delete the getSession in the Registry interface (#10633) --- .../org/apache/dolphinscheduler/registry/api/Registry.java | 2 -- .../plugin/registry/mysql/MysqlRegistry.java | 4 ---- .../plugin/registry/zookeeper/ZookeeperRegistry.java | 5 ----- .../dolphinscheduler/service/registry/RegistryClient.java | 4 ---- 4 files changed, 15 deletions(-) diff --git a/dolphinscheduler-registry/dolphinscheduler-registry-api/src/main/java/org/apache/dolphinscheduler/registry/api/Registry.java b/dolphinscheduler-registry/dolphinscheduler-registry-api/src/main/java/org/apache/dolphinscheduler/registry/api/Registry.java index 1eb6f93baf..7dfa478ea3 100644 --- a/dolphinscheduler-registry/dolphinscheduler-registry-api/src/main/java/org/apache/dolphinscheduler/registry/api/Registry.java +++ b/dolphinscheduler-registry/dolphinscheduler-registry-api/src/main/java/org/apache/dolphinscheduler/registry/api/Registry.java @@ -43,6 +43,4 @@ public interface Registry extends Closeable { boolean acquireLock(String key); boolean releaseLock(String key); - - Duration getSessionTimeout(); } diff --git a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-mysql/src/main/java/org/apache/dolphinscheduler/plugin/registry/mysql/MysqlRegistry.java b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-mysql/src/main/java/org/apache/dolphinscheduler/plugin/registry/mysql/MysqlRegistry.java index fa81471898..dee884a12d 100644 --- a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-mysql/src/main/java/org/apache/dolphinscheduler/plugin/registry/mysql/MysqlRegistry.java +++ b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-mysql/src/main/java/org/apache/dolphinscheduler/plugin/registry/mysql/MysqlRegistry.java @@ -156,10 +156,6 @@ public class MysqlRegistry implements Registry { return true; } - @Override - public Duration getSessionTimeout() { - throw new UnsupportedOperationException("Not support session timeout at Mysql Registry"); - } @Override public void close() { diff --git a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-zookeeper/src/main/java/org/apache/dolphinscheduler/plugin/registry/zookeeper/ZookeeperRegistry.java b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-zookeeper/src/main/java/org/apache/dolphinscheduler/plugin/registry/zookeeper/ZookeeperRegistry.java index ba4131401b..643ab8e707 100644 --- a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-zookeeper/src/main/java/org/apache/dolphinscheduler/plugin/registry/zookeeper/ZookeeperRegistry.java +++ b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-zookeeper/src/main/java/org/apache/dolphinscheduler/plugin/registry/zookeeper/ZookeeperRegistry.java @@ -232,11 +232,6 @@ public final class ZookeeperRegistry implements Registry { return true; } - @Override - public Duration getSessionTimeout() { - return properties.getSessionTimeout(); - } - @Override public void close() { treeCacheMap.values().forEach(CloseableUtils::closeQuietly); diff --git a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/registry/RegistryClient.java b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/registry/RegistryClient.java index c606007e88..46c10c15d5 100644 --- a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/registry/RegistryClient.java +++ b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/registry/RegistryClient.java @@ -310,8 +310,4 @@ public class RegistryClient { } } } - - public Duration getSessionTimeout() { - return registry.getSessionTimeout(); - } }