Merge branch 'apache:dev' into dev

Forus0322 · Dec 20, 2024 · b23e8fc · b23e8fc
2 parents a90ca2f + 13ac2c6
commit b23e8fc
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 18 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -134,24 +134,30 @@ jobs:
             class: org.apache.streampark.e2e.cases.ProjectsManagementTest
           - name: VariableManagementTest
             class: org.apache.streampark.e2e.cases.VariableManagementTest
-          - name: Flink118OnRemoteClusterDeployTest
+
+          - name: FlinkOnRemoteClusterDeployTest
             class: org.apache.streampark.e2e.cases.Flink118OnRemoteClusterDeployTest
-          - name: Flink117OnRemoteClusterDeployTest
-            class: org.apache.streampark.e2e.cases.Flink117OnRemoteClusterDeployTest
-          - name: Flink116OnRemoteClusterDeployTest
-            class: org.apache.streampark.e2e.cases.Flink116OnRemoteClusterDeployTest
-          - name: Flink116OnYarnClusterDeployTest
-            class: org.apache.streampark.e2e.cases.Flink116OnYarnClusterDeployTest
-          - name: Flink117OnYarnClusterDeployTest
-            class: org.apache.streampark.e2e.cases.Flink117OnYarnClusterDeployTest
-          - name: Flink118OnYarnClusterDeployTest
+
+          - name: FlinkOnYarnClusterDeployTest
             class: org.apache.streampark.e2e.cases.Flink118OnYarnClusterDeployTest
-          - name: FlinkSQL116OnYarnTest
-            class: org.apache.streampark.e2e.cases.FlinkSQL116OnYarnTest
-          - name: FlinkSQL117OnYarnTest
-            class: org.apache.streampark.e2e.cases.FlinkSQL117OnYarnTest
-          - name: FlinkSQL118OnYarnTest
+
+          - name: FlinkSQLOnYarnTest
             class: org.apache.streampark.e2e.cases.FlinkSQL118OnYarnTest
+
+          #- name: Flink117OnRemoteClusterDeployTest
+          #  class: org.apache.streampark.e2e.cases.Flink117OnRemoteClusterDeployTest
+          #- name: Flink116OnRemoteClusterDeployTest
+          #  class: org.apache.streampark.e2e.cases.Flink116OnRemoteClusterDeployTest
+
+          # - name: Flink116OnYarnClusterDeployTest
+          #  class: org.apache.streampark.e2e.cases.Flink116OnYarnClusterDeployTest
+          # - name: Flink117OnYarnClusterDeployTest
+          #  class: org.apache.streampark.e2e.cases.Flink117OnYarnClusterDeployTest
+
+          # - name: FlinkSQL116OnYarnTest
+          #  class: org.apache.streampark.e2e.cases.FlinkSQL116OnYarnTest
+          # - name: FlinkSQL117OnYarnTest
+          #  class: org.apache.streampark.e2e.cases.FlinkSQL117OnYarnTest
     env:
       RECORDING_PATH: /tmp/recording-${{ matrix.case.name }}
     steps:

diff --git a/...c/main/java/org/apache/streampark/console/core/controller/FlinkApplicationController.java b/...c/main/java/org/apache/streampark/console/core/controller/FlinkApplicationController.java
@@ -244,7 +244,7 @@ public RestResponse deleteBackup(FlinkApplicationBackup backUp) throws InternalE
     }
 
     @PostMapping("check/jar")
-    public RestResponse checkjar(String jar) throws IOException {
+    public RestResponse checkJar(String jar) throws IOException {
         Utils.requireCheckJarFile(new File(jar).toURI().toURL());
         return RestResponse.success(true);
     }

diff --git a/...s/src/main/scala/org/apache/streampark/flink/kubernetes/watcher/FlinkMetricsWatcher.scala b/...s/src/main/scala/org/apache/streampark/flink/kubernetes/watcher/FlinkMetricsWatcher.scala
@@ -89,14 +89,14 @@ class FlinkMetricWatcher(conf: MetricWatcherConfig = MetricWatcherConfig.default
         future.onComplete(_.getOrElse(None) match {
           case Some(metric) =>
             val clusterKey = id.toClusterKey
-            // update current flink cluster metrics on cache
-            watchController.flinkMetrics.put(clusterKey, metric)
             val isMetricChanged = {
               val preMetric = watchController.flinkMetrics.get(clusterKey)
               preMetric == null || !preMetric.equalsPayload(metric)
             }
             if (isMetricChanged) {
               eventBus.postAsync(FlinkClusterMetricChangeEvent(id, metric))
+              // update current flink cluster metrics on cache
+              watchController.flinkMetrics.put(clusterKey, metric)
             }
           case _ =>
         })