Merge branch 'dev' of https://github.com/apache/incubator-dolphinsche…

…duler into dev
apache · Dec 11, 2020 · 3ae273c · 3ae273c
2 parents 5c43626 + a13e737
commit 3ae273c
Show file tree

Hide file tree

Showing 25 changed files with 870 additions and 2,922 deletions.
diff --git a/dolphinscheduler-api/src/main/resources/application-api.properties b/dolphinscheduler-api/src/main/resources/application-api.properties
@@ -35,7 +35,7 @@ server.compression.enabled=true
 server.compression.mime-types=text/html,text/xml,text/plain,text/css,text/javascript,application/javascript,application/json,application/xml
 
 #post content
-server.jetty.max-http-post-size=5000000
+server.jetty.max-http-form-post-size=5000000
 
 spring.messages.encoding=UTF-8
 

diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
@@ -604,12 +604,6 @@ private Constants() {
  public static final String SPARK_QUEUE = "--queue";
 
 
- /**
- * --queue --qu
- */
- public static final String FLINK_QUEUE = "--qu";
-
-
  /**
  * exit code success
  */
@@ -838,6 +832,7 @@ private Constants() {
  public static final String FLINK_RUN_MODE = "-m";
  public static final String FLINK_YARN_SLOT = "-ys";
  public static final String FLINK_APP_NAME = "-ynm";
+ public static final String FLINK_QUEUE = "-yqu";
  public static final String FLINK_TASK_MANAGE = "-yn";
 
  public static final String FLINK_JOB_MANAGE_MEM = "-yjm";