move SKIP_PLUGIN_NAMES to IFlinkCluster

datavane · Apr 5, 2024 · 3378446 · 3378446
1 parent eb2488e
commit 3378446
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/tis-plugin/src/main/java/com/qlangtech/tis/config/flink/IFlinkCluster.java b/tis-plugin/src/main/java/com/qlangtech/tis/config/flink/IFlinkCluster.java
@@ -18,8 +18,12 @@
 
 package com.qlangtech.tis.config.flink;
 
+import com.google.common.collect.Sets;
 import com.qlangtech.tis.plugin.IdentityName;
 
+import java.util.Collections;
+import java.util.Set;
+
 /**
  * FlinkCluster Configuration
  *
@@ -31,4 +35,6 @@ public interface IFlinkCluster extends IdentityName, IFlinkClusterConfig {
  String PLUGIN_SKIP_FLINK_EXTENDS = "tis-flink-extends-plugin";
  String SKIP_CLASSLOADER_FACTORY_CREATION = "skip_classloader_factory_creation";
  String KEY_DISPLAY_NAME = "Flink-Cluster";
+ Set<String> SKIP_PLUGIN_NAMES = Collections.unmodifiableSet(
+ Sets.newHashSet(IFlinkCluster.PLUGIN_DEPENDENCY_FLINK_DEPENDENCY, IFlinkCluster.PLUGIN_SKIP_FLINK_EXTENDS));
 }
diff --git a/tis-plugin/src/main/java/com/qlangtech/tis/plugin/PluginAndCfgsSnapshot.java b/tis-plugin/src/main/java/com/qlangtech/tis/plugin/PluginAndCfgsSnapshot.java
@@ -24,6 +24,7 @@
 import com.google.common.collect.Sets;
 import com.qlangtech.tis.TIS;
 import com.qlangtech.tis.async.message.client.consumer.impl.MQListenerFactory;
+import com.qlangtech.tis.config.flink.IFlinkCluster;
 import com.qlangtech.tis.coredefine.module.action.TargetResName;
 import com.qlangtech.tis.datax.IDataxProcessor;
 import com.qlangtech.tis.datax.impl.DataxProcessor;
@@ -38,7 +39,6 @@
 import com.qlangtech.tis.manage.common.TisUTF8;
 import com.qlangtech.tis.maven.plugins.tpi.PluginClassifier;
 import com.qlangtech.tis.plugin.incr.TISSinkFactory;
-import com.qlangtech.tis.realtime.utils.NetUtils;
 import com.qlangtech.tis.trigger.util.JsonUtil;
 import com.qlangtech.tis.util.HeteroEnum;
 import com.qlangtech.tis.util.PluginMeta;
@@ -551,6 +551,9 @@ private Set<PluginMeta> getShallUpdatePluginMeta(PluginAndCfgsSnapshot localSnap
  localSnaphsot.pluginMetas.stream().collect(Collectors.toMap((m) -> m.getKey(), (m) -> m));
  PluginMeta m = null;
  for (PluginMeta meta : pluginMetas) {
+ if (IFlinkCluster.SKIP_PLUGIN_NAMES.contains(meta.getPluginName())) {
+ continue;
+ }
  m = locals.get(meta.getKey());
  if (m == null || meta.getLastModifyTimeStamp() > m.getLastModifyTimeStamp()) {
  result.add(meta);

diff --git a/tis-plugin/src/main/java/com/qlangtech/tis/util/RobustReflectionConverter2.java b/tis-plugin/src/main/java/com/qlangtech/tis/util/RobustReflectionConverter2.java
@@ -78,7 +78,7 @@ public static PluginMetas getUnCacheableThreadMetas() {
  }
 
  public static class PluginMetas implements IPluginMetasInfo {
- private final Set<PluginMeta> metas = new HashSet<>();
+ private final Set<PluginMeta> metas = new HashSet<PluginMeta>();
  private final Set<IRepositoryResource> repoRes = new HashSet<>();
  // 可以从pluginStore中取数据
  private boolean cacheable = true;

diff --git a/tis-web-config/config.properties b/tis-web-config/config.properties
@@ -30,8 +30,8 @@ tis.datasource.type=derby
 tis.datasource.dbname=tis_console_db
 
 
-assemble.host=192.168.28.127
-tis.host=192.168.28.127
+assemble.host=192.168.28.130
+tis.host=192.168.28.130