Merge branch '4.3.5'

PowerJob · Aug 14, 2023 · 9ab2e92 · 9ab2e92
2 parents 58e542c + 0d359b8
commit 9ab2e92
Show file tree

Hide file tree

Showing 33 changed files with 98 additions and 87 deletions.
diff --git a/README_zhCN.md b/README_zhCN.md
@@ -20,7 +20,7 @@ PowerJob（原OhMyScheduler）是全新一代分布式调度与计算框架，
 * DAG工作流支持：支持在线配置任务依赖关系，可视化得对任务进行编排，同时还支持上下游任务间的数据传递
 * 执行器支持广泛：支持Spring Bean、内置/外置Java类、Shell、Python等处理器，应用范围广。
 * 运维便捷：支持在线日志功能，执行器产生的日志可以在前端控制台页面实时显示，降低debug成本，极大地提高开发效率。
-* 依赖精简：最小仅依赖关系型数据库（MySQL/Oracle/MS SQLServer...），扩展依赖为MongoDB（用于存储庞大的在线日志）。
+* 依赖精简：最小仅依赖关系型数据库（MySQL/Oracle/MS SQLServer...）。
 * 高可用&高性能：调度服务器经过精心设计，一改其他调度框架基于数据库锁的策略，实现了无锁化调度。部署多个调度服务器可以同时实现高可用和性能的提升（支持无限的水平扩展）。
 * 故障转移与恢复：任务执行失败后，可根据配置的重试策略完成重试，只要执行器集群有足够的计算节点，任务就能顺利完成。
 

diff --git a/others/dev/docker-compose.yml b/others/dev/docker-compose.yml
@@ -11,7 +11,7 @@ services:
  deploy:
  resources:
  limits:
- memory: 640M
+ memory: 768M
  restart: always
  container_name: powerjob-mysql
  image: powerjob/powerjob-mysql:test_env
@@ -20,38 +20,38 @@ services:
  volumes:
  - ~/powerjob-data/powerjob-mysql:/var/lib/mysql
  command: --lower_case_table_names=1
- powerjob-mongodb:
- image: mongo:latest
- container_name: powerjob-mongodb
- restart: always
- deploy:
- resources:
- limits:
- memory: 256M
- environment:
- MONGO_INITDB_ROOT_USERNAME: "root"
- MONGO_INITDB_ROOT_PASSWORD: "No1Bug2Please3!"
- MONGO_INITDB_DATABASE: "powerjob_daily"
- ports:
- - "27017:27017"
- volumes:
- - ./testenv/init_mongodb.js:/docker-entrypoint-initdb.d/mongo-init.js:ro
- - ~/powerjob-data/powerjob-mongodb:/data/db
+# powerjob-mongodb:
+# image: mongo:latest
+# container_name: powerjob-mongodb
+# restart: always
+# deploy:
+# resources:
+# limits:
+# memory: 256M
+# environment:
+# MONGO_INITDB_ROOT_USERNAME: "root"
+# MONGO_INITDB_ROOT_PASSWORD: "No1Bug2Please3!"
+# MONGO_INITDB_DATABASE: "powerjob_daily"
+# ports:
+# - "27017:27017"
+# volumes:
+# - ./testenv/init_mongodb.js:/docker-entrypoint-initdb.d/mongo-init.js:ro
+# - ~/powerjob-data/powerjob-mongodb:/data/db
  powerjob-server:
  build:
  context: ../../powerjob-server/docker
  deploy:
  resources:
  limits:
- memory: 768M
+ memory: 896M
  container_name: powerjob-server
  image: powerjob/powerjob-server:test_env
  restart: always
  depends_on:
  - powerjob-mysql
- - powerjob-mongodb
+# - powerjob-mongodb
  environment:
- PARAMS: "--spring.profiles.active=product --oms.mongodb.enable=true --spring.data.mongodb.uri=mongodb://zqq:No1Bug2Please3!@powerjob-mongodb/powerjob_daily?retryWrites=true&w=majority --spring.datasource.core.jdbc-url=jdbc:mysql://powerjob-mysql:3306/powerjob-daily?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai"
+ PARAMS: "--spring.profiles.active=daily --spring.datasource.core.jdbc-url=jdbc:mysql://powerjob-mysql:3306/powerjob-daily?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai --oms.storage.dfs.mysql_series.url=jdbc:mysql://powerjob-mysql:3306/powerjob-daily?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai"
  JVMOPTIONS: "-server -XX:+UseG1GC -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=7 -XX:GCLogFileSize=100M -Xloggc:/root/powerjob/server/gc.log"
  ports:
  - "7700:7700"

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
  <groupId>tech.powerjob</groupId>
  <artifactId>powerjob</artifactId>
- <version>4.3.4</version>
+ <version>4.3.5</version>
  <packaging>pom</packaging>
  <name>powerjob</name>
  <url>http://www.powerjob.tech</url>

diff --git a/powerjob-client/pom.xml b/powerjob-client/pom.xml
@@ -5,18 +5,18 @@
  <parent>
  <artifactId>powerjob</artifactId>
  <groupId>tech.powerjob</groupId>
- <version>4.3.4</version>
+ <version>4.3.5</version>
  </parent>
 
  <modelVersion>4.0.0</modelVersion>
  <artifactId>powerjob-client</artifactId>
- <version>4.3.4</version>
+ <version>4.3.5</version>
  <packaging>jar</packaging>
 
  <properties>
  <junit.version>5.9.1</junit.version>
  <fastjson.version>1.2.83</fastjson.version>
- <powerjob.common.version>4.3.4</powerjob.common.version>
+ <powerjob.common.version>4.3.5</powerjob.common.version>
 
  <mvn.shade.plugin.version>3.2.4</mvn.shade.plugin.version>
  </properties>

diff --git a/powerjob-common/pom.xml b/powerjob-common/pom.xml
@@ -5,12 +5,12 @@
  <parent>
  <artifactId>powerjob</artifactId>
  <groupId>tech.powerjob</groupId>
- <version>4.3.4</version>
+ <version>4.3.5</version>
  </parent>
 
  <modelVersion>4.0.0</modelVersion>
  <artifactId>powerjob-common</artifactId>
- <version>4.3.4</version>
+ <version>4.3.5</version>
  <packaging>jar</packaging>
 
  <properties>

diff --git a/powerjob-common/src/main/java/tech/powerjob/common/utils/NetUtils.java b/powerjob-common/src/main/java/tech/powerjob/common/utils/NetUtils.java
@@ -170,8 +170,8 @@ public static NetworkInterface findNetworkInterface() {
  log.warn("[Net] findNetworkInterface failed", e);
  }
 
- // sort by interface index, the smaller is preferred.
- validNetworkInterfaces.sort(Comparator.comparingInt(NetworkInterface::getIndex));
+ // sort by interface index, the smaller is preferred. （部分用户反馈 IP 获取逻辑反而劣化了，先注释）
+ // validNetworkInterfaces.sort(Comparator.comparingInt(NetworkInterface::getIndex));
 
  // Try to find the preferred one
  for (NetworkInterface networkInterface : validNetworkInterfaces) {

diff --git a/powerjob-official-processors/pom.xml b/powerjob-official-processors/pom.xml
@@ -5,12 +5,12 @@
  <parent>
  <artifactId>powerjob</artifactId>
  <groupId>tech.powerjob</groupId>
- <version>4.3.4</version>
+ <version>4.3.5</version>
  </parent>
 
  <modelVersion>4.0.0</modelVersion>
  <artifactId>powerjob-official-processors</artifactId>
- <version>4.3.4</version>
+ <version>4.3.5</version>
  <packaging>jar</packaging>
 
  <properties>
@@ -20,7 +20,7 @@
  <!-- 不会被打包的部分，scope 只能是 test 或 provide -->
  <junit.version>5.9.1</junit.version>
  <logback.version>1.2.9</logback.version>
- <powerjob.worker.version>4.3.4</powerjob.worker.version>
+ <powerjob.worker.version>4.3.5</powerjob.worker.version>
  <spring.jdbc.version>5.2.9.RELEASE</spring.jdbc.version>
  <h2.db.version>2.1.214</h2.db.version>
  <mysql.version>8.0.28</mysql.version>

diff --git a/powerjob-remote/pom.xml b/powerjob-remote/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>powerjob</artifactId>
  <groupId>tech.powerjob</groupId>
- <version>4.3.4</version>
+ <version>4.3.5</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <packaging>pom</packaging>

diff --git a/powerjob-remote/powerjob-remote-benchmark/pom.xml b/powerjob-remote/powerjob-remote-benchmark/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>powerjob-remote</artifactId>
  <groupId>tech.powerjob</groupId>
- <version>4.3.4</version>
+ <version>4.3.5</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
@@ -21,8 +21,8 @@
 
  <logback.version>1.2.9</logback.version>
  <springboot.version>2.7.4</springboot.version>
- <powerjob-remote-impl-http.version>4.3.4</powerjob-remote-impl-http.version>
- <powerjob-remote-impl-akka.version>4.3.4</powerjob-remote-impl-akka.version>
+ <powerjob-remote-impl-http.version>4.3.5</powerjob-remote-impl-http.version>
+ <powerjob-remote-impl-akka.version>4.3.5</powerjob-remote-impl-akka.version>
 
  <gatling.version>3.9.0</gatling.version>
  <gatling-maven-plugin.version>4.2.9</gatling-maven-plugin.version>

diff --git a/powerjob-remote/powerjob-remote-framework/pom.xml b/powerjob-remote/powerjob-remote-framework/pom.xml
@@ -5,19 +5,19 @@
  <parent>
  <artifactId>powerjob-remote</artifactId>
  <groupId>tech.powerjob</groupId>
- <version>4.3.4</version>
+ <version>4.3.5</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
- <version>4.3.4</version>
+ <version>4.3.5</version>
  <artifactId>powerjob-remote-framework</artifactId>
 
  <properties>
  <maven.compiler.source>8</maven.compiler.source>
  <maven.compiler.target>8</maven.compiler.target>
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
- <powerjob-common.version>4.3.4</powerjob-common.version>
+ <powerjob-common.version>4.3.5</powerjob-common.version>
  <reflections.version>0.10.2</reflections.version>
 
 

diff --git a/powerjob-remote/powerjob-remote-impl-akka/pom.xml b/powerjob-remote/powerjob-remote-impl-akka/pom.xml
@@ -5,19 +5,19 @@
  <parent>
  <artifactId>powerjob-remote</artifactId>
  <groupId>tech.powerjob</groupId>
- <version>4.3.4</version>
+ <version>4.3.5</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
  <artifactId>powerjob-remote-impl-akka</artifactId>
- <version>4.3.4</version>
+ <version>4.3.5</version>
 
  <properties>
  <maven.compiler.source>8</maven.compiler.source>
  <maven.compiler.target>8</maven.compiler.target>
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
- <powerjob-remote-framework.version>4.3.4</powerjob-remote-framework.version>
+ <powerjob-remote-framework.version>4.3.5</powerjob-remote-framework.version>
 
  <akka.version>2.6.13</akka.version>
  </properties>

diff --git a/powerjob-remote/powerjob-remote-impl-http/pom.xml b/powerjob-remote/powerjob-remote-impl-http/pom.xml
@@ -5,20 +5,20 @@
  <parent>
  <artifactId>powerjob-remote</artifactId>
  <groupId>tech.powerjob</groupId>
- <version>4.3.4</version>
+ <version>4.3.5</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
  <artifactId>powerjob-remote-impl-http</artifactId>
- <version>4.3.4</version>
+ <version>4.3.5</version>
 
  <properties>
  <maven.compiler.source>8</maven.compiler.source>
  <maven.compiler.target>8</maven.compiler.target>
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
  <vertx.version>4.3.7</vertx.version>
- <powerjob-remote-framework.version>4.3.4</powerjob-remote-framework.version>
+ <powerjob-remote-framework.version>4.3.5</powerjob-remote-framework.version>
  </properties>
 
  <dependencies>

diff --git a/powerjob-server/pom.xml b/powerjob-server/pom.xml
@@ -5,12 +5,12 @@
  <parent>
  <artifactId>powerjob</artifactId>
  <groupId>tech.powerjob</groupId>
- <version>4.3.4</version>
+ <version>4.3.5</version>
  </parent>
 
  <modelVersion>4.0.0</modelVersion>
  <artifactId>powerjob-server</artifactId>
- <version>4.3.4</version>
+ <version>4.3.5</version>
  <packaging>pom</packaging>
 
  <modules>
@@ -50,9 +50,9 @@
  <groovy.version>3.0.10</groovy.version>
  <cron-utils.version>9.1.6</cron-utils.version>
 
- <powerjob-common.version>4.3.4</powerjob-common.version>
- <powerjob-remote-impl-http.version>4.3.4</powerjob-remote-impl-http.version>
- <powerjob-remote-impl-akka.version>4.3.4</powerjob-remote-impl-akka.version>
+ <powerjob-common.version>4.3.5</powerjob-common.version>
+ <powerjob-remote-impl-http.version>4.3.5</powerjob-remote-impl-http.version>
+ <powerjob-remote-impl-akka.version>4.3.5</powerjob-remote-impl-akka.version>
  <springdoc-openapi-ui.version>1.6.14</springdoc-openapi-ui.version>
  <aliyun-sdk-oss.version>3.17.1</aliyun-sdk-oss.version>
  <commons-collections4.version>4.4</commons-collections4.version>

diff --git a/powerjob-server/powerjob-server-common/pom.xml b/powerjob-server/powerjob-server-common/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>powerjob-server</artifactId>
  <groupId>tech.powerjob</groupId>
- <version>4.3.4</version>
+ <version>4.3.5</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
  <modelVersion>4.0.0</modelVersion>

diff --git a/powerjob-server/powerjob-server-core/pom.xml b/powerjob-server/powerjob-server-core/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>powerjob-server</artifactId>
  <groupId>tech.powerjob</groupId>
- <version>4.3.4</version>
+ <version>4.3.5</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
  <modelVersion>4.0.0</modelVersion>

diff --git a/powerjob-server/powerjob-server-extension/pom.xml b/powerjob-server/powerjob-server-extension/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>powerjob-server</artifactId>
  <groupId>tech.powerjob</groupId>
- <version>4.3.4</version>
+ <version>4.3.5</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
  <modelVersion>4.0.0</modelVersion>

diff --git a/powerjob-server/powerjob-server-migrate/pom.xml b/powerjob-server/powerjob-server-migrate/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>powerjob-server</artifactId>
  <groupId>tech.powerjob</groupId>
- <version>4.3.4</version>
+ <version>4.3.5</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
  <modelVersion>4.0.0</modelVersion>

diff --git a/powerjob-server/powerjob-server-monitor/pom.xml b/powerjob-server/powerjob-server-monitor/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>powerjob-server</artifactId>
  <groupId>tech.powerjob</groupId>
- <version>4.3.4</version>
+ <version>4.3.5</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
  <modelVersion>4.0.0</modelVersion>

diff --git a/powerjob-server/powerjob-server-persistence/pom.xml b/powerjob-server/powerjob-server-persistence/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>powerjob-server</artifactId>
  <groupId>tech.powerjob</groupId>
- <version>4.3.4</version>
+ <version>4.3.5</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
  <modelVersion>4.0.0</modelVersion>

diff --git a/...ersistence/src/main/java/tech/powerjob/server/persistence/storage/impl/AliOssService.java b/...ersistence/src/main/java/tech/powerjob/server/persistence/storage/impl/AliOssService.java
@@ -142,7 +142,7 @@ void initOssClient(String endpoint, String bucket, String mode, String ak, Strin
  }
 
  this.oss = new OSSClientBuilder().build(endpoint, credentialsProvider);
- log.info("[AliOssService] initialize OSS successfully!");
+ log.info("[AliOssService] initialize successfully, THIS_WILL_BE_THE_STORAGE_LAYER.");
  }
 
  @Override

diff --git a/...sistence/src/main/java/tech/powerjob/server/persistence/storage/impl/EmptyDFsService.java b/...sistence/src/main/java/tech/powerjob/server/persistence/storage/impl/EmptyDFsService.java
@@ -1,5 +1,6 @@
 package tech.powerjob.server.persistence.storage.impl;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Conditional;
 import tech.powerjob.server.extension.dfs.*;
@@ -17,6 +18,7 @@
  * @author tjq
  * @since 2023/7/30
  */
+@Slf4j
 @Priority(value = Integer.MAX_VALUE)
 @Conditional(EmptyDFsService.EmptyCondition.class)
 public class EmptyDFsService extends AbstractDFsService {
@@ -41,7 +43,7 @@ public void destroy() throws Exception {
 
  @Override
  protected void init(ApplicationContext applicationContext) {
-
+ log.info("[EmptyDFsService] initialize successfully, THIS_WILL_BE_THE_STORAGE_LAYER.");
  }
 
 

diff --git a/...ersistence/src/main/java/tech/powerjob/server/persistence/storage/impl/GridFsService.java b/...ersistence/src/main/java/tech/powerjob/server/persistence/storage/impl/GridFsService.java
@@ -158,6 +158,8 @@ public void destroy() throws Exception {
  protected void init(ApplicationContext applicationContext) {
  String uri = parseMongoUri(applicationContext.getEnvironment());
  initMongo(uri);
+
+ log.info("[GridFsService] initialize successfully, THIS_WILL_BE_THE_STORAGE_LAYER.");
  }
 
  public static class GridFsCondition extends PropertyAndOneBeanCondition {