This is an automated email from the ASF dual-hosted git repository.
monster pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev by this push:
new a07c7e3f7 [Improve] Dynamic parameters changed to properties (#1886)
a07c7e3f7 is described below
commit a07c7e3f7a5bdd6f41fee4227e154284240284b1
Author: benjobs <[email protected]>
AuthorDate: Sat Oct 22 22:56:47 2022 +0800
[Improve] Dynamic parameters changed to properties (#1886)
---
.../src/api/flink/app/app.type.ts | 2 +-
.../api/flink/setting/types/flinkCluster.type.ts | 2 +-
.../src/views/flink/app/EditFlink.vue | 4 +-
.../src/views/flink/app/EditStreamPark.vue | 2 +-
.../flink/app/hooks/useCreateAndEditSchema.ts | 8 ++--
.../src/views/flink/app/hooks/useFlinkRender.tsx | 4 +-
.../src/views/flink/app/hooks/useFlinkSchema.ts | 8 ++--
.../src/views/flink/app/utils/index.ts | 2 +-
.../src/views/flink/setting/EditCluster.vue | 2 +-
.../views/flink/setting/hooks/useClusterSetting.ts | 12 ++---
.../src/assembly/script/schema/mysql-schema.sql | 4 +-
.../src/assembly/script/schema/pgsql-schema.sql | 6 +--
.../src/assembly/script/upgrade/mysql/1.2.4.sql | 54 +++++++++++-----------
.../core/controller/FlinkClusterController.java | 2 +-
.../console/core/entity/Application.java | 12 ++---
.../console/core/entity/FlinkCluster.java | 2 +-
.../core/service/impl/ApplicationServiceImpl.java | 18 ++++----
.../core/service/impl/FlinkClusterServiceImpl.java | 4 +-
.../src/main/resources/db/schema-h2.sql | 4 +-
.../resources/mapper/core/ApplicationMapper.xml | 2 +-
.../resources/mapper/core/FlinkClusterMapper.xml | 2 +-
.../src/views/flink/app/Add.vue | 10 ++--
.../src/views/flink/app/EditFlink.vue | 10 ++--
.../src/views/flink/app/EditStreamPark.vue | 14 +++---
.../src/views/flink/setting/AddCluster.vue | 10 ++--
.../src/views/flink/setting/EditCluster.vue | 12 ++---
.../streampark/flink/submit/FlinkSubmitter.scala | 15 +++---
.../flink/submit/bean/CancelRequest.scala | 2 +-
.../flink/submit/bean/DeployRequest.scala | 2 +-
.../flink/submit/bean/SubmitRequest.scala | 2 +-
.../impl/KubernetesNativeSessionSubmit.scala | 4 +-
.../flink/submit/impl/YarnSessionSubmit.scala | 4 +-
.../flink/submit/trait/FlinkSubmitTrait.scala | 13 +++---
33 files changed, 126 insertions(+), 128 deletions(-)
diff --git
a/streampark-console/streampark-console-newui/src/api/flink/app/app.type.ts
b/streampark-console/streampark-console-newui/src/api/flink/app/app.type.ts
index 93e58a861..126179344 100644
--- a/streampark-console/streampark-console-newui/src/api/flink/app/app.type.ts
+++ b/streampark-console/streampark-console-newui/src/api/flink/app/app.type.ts
@@ -69,7 +69,7 @@ export interface AppListRecord {
hotParams?: string;
resolveOrder: number;
executionMode: number;
- dynamicOptions?: string;
+ properties?: string;
appType: number;
flameGraph: boolean;
tracking: number;
diff --git
a/streampark-console/streampark-console-newui/src/api/flink/setting/types/flinkCluster.type.ts
b/streampark-console/streampark-console-newui/src/api/flink/setting/types/flinkCluster.type.ts
index 47b171df6..a1409bab8 100644
---
a/streampark-console/streampark-console-newui/src/api/flink/setting/types/flinkCluster.type.ts
+++
b/streampark-console/streampark-console-newui/src/api/flink/setting/types/flinkCluster.type.ts
@@ -29,7 +29,7 @@ export interface FlinkCluster {
options: string;
yarnQueue: string;
k8sHadoopIntegration: boolean;
- dynamicOptions: string;
+ properties: string;
k8sRestExposedType: number;
flameGraph: boolean;
?: any;
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/app/EditFlink.vue
b/streampark-console/streampark-console-newui/src/views/flink/app/EditFlink.vue
index 3a0067e07..d8803345f 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/app/EditFlink.vue
+++
b/streampark-console/streampark-console-newui/src/views/flink/app/EditFlink.vue
@@ -74,7 +74,7 @@
args: app.args,
jar: app.jar,
description: app.description,
- dynamicOptions: app.dynamicOptions,
+ properties: app.properties,
resolveOrder: app.resolveOrder,
executionMode: app.executionMode,
yarnQueue: app.yarnQueue,
@@ -137,7 +137,7 @@
cpMaxFailureInterval: values.cpMaxFailureInterval || null,
cpFailureRateInterval: values.cpFailureRateInterval || null,
cpFailureAction: values.cpFailureAction || null,
- dynamicOptions: values.dynamicOptions,
+ properties: values.properties,
restartSize: values.restartSize,
// alertEmail: values.alertEmail || null,
alertId: values.alertId,
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/app/EditStreamPark.vue
b/streampark-console/streampark-console-newui/src/views/flink/app/EditStreamPark.vue
index 2824f290b..da5ac19db 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/app/EditStreamPark.vue
+++
b/streampark-console/streampark-console-newui/src/views/flink/app/EditStreamPark.vue
@@ -92,7 +92,7 @@
tags: app.tags,
args: app.args,
description: app.description,
- dynamicOptions: app.dynamicOptions,
+ properties: app.properties,
resolveOrder: app.resolveOrder,
versionId: app.versionId || null,
k8sRestExposedType: app.k8sRestExposedType,
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useCreateAndEditSchema.ts
b/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useCreateAndEditSchema.ts
index 3c40ea81d..b844402d3 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useCreateAndEditSchema.ts
+++
b/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useCreateAndEditSchema.ts
@@ -20,7 +20,7 @@ import { k8sRestExposedType, resolveOrder } from '../data';
import optionData from '../data/option';
import {
getAlertSvgIcon,
- renderDynamicOption,
+ renderProperties,
renderInputDropdown,
renderInputGroup,
renderIsSetConfig,
@@ -467,10 +467,10 @@ export const useCreateAndEditSchema = (
ifShow: ({ values }) => values.executionMode == 6,
},
{
- field: 'dynamicOptions',
- label: 'Dynamic Option',
+ field: 'properties',
+ label: 'Properties',
component: 'Input',
- render: (renderCallbackParams) =>
renderDynamicOption(renderCallbackParams),
+ render: (renderCallbackParams) =>
renderProperties(renderCallbackParams),
},
{
field: 'args',
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useFlinkRender.tsx
b/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useFlinkRender.tsx
index 1cabb860f..e1d9791aa 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useFlinkRender.tsx
+++
b/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useFlinkRender.tsx
@@ -264,12 +264,12 @@ export const renderOptionsItems = (model: Recordable,
field: string, reg: string
};
/* render memory option */
-export const renderDynamicOption = ({ model, field }: RenderCallbackParams) =>
{
+export const renderProperties = ({ model, field }: RenderCallbackParams) => {
return (
<div>
<Input.TextArea
rows={8}
- name="dynamicOptions"
+ name="properties"
placeholder="$key=$value,If there are multiple parameters,you can new
line enter them (-D <arg>)"
value={model[field]}
onInput={(e) => (model[field] = e.target.value)}
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useFlinkSchema.ts
b/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useFlinkSchema.ts
index ccb35617f..6af44ae7c 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useFlinkSchema.ts
+++
b/streampark-console/streampark-console-newui/src/views/flink/app/hooks/useFlinkSchema.ts
@@ -30,7 +30,7 @@ import { fetchAlertSetting } from
'/@/api/flink/setting/alert';
import { AlertSetting } from '/@/api/flink/setting/types/alert.type';
import {
- renderDynamicOption,
+ renderProperties,
renderInputDropdown,
renderInputGroup,
renderTotalMemory,
@@ -337,10 +337,10 @@ export const useFlinkSchema = (editModel?: string) => {
ifShow: ({ values }) => values.executionMode == 6,
},
{
- field: 'dynamicOptions',
- label: 'Dynamic Option',
+ field: 'properties',
+ label: 'Properties',
component: 'Input',
- render: (renderCallbackParams) =>
renderDynamicOption(renderCallbackParams),
+ render: (renderCallbackParams) => renderProperties(renderCallbackParams),
},
{
field: 'args',
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/app/utils/index.ts
b/streampark-console/streampark-console-newui/src/views/flink/app/utils/index.ts
index d427ebe5c..c0d84d685 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/app/utils/index.ts
+++
b/streampark-console/streampark-console-newui/src/views/flink/app/utils/index.ts
@@ -260,7 +260,7 @@ export function handleSubmitParams(
cpMaxFailureInterval: values.cpMaxFailureInterval || null,
cpFailureRateInterval: values.cpFailureRateInterval || null,
cpFailureAction: values.cpFailureAction || null,
- dynamicOptions: values.dynamicOptions || null,
+ properties: values.properties || null,
resolveOrder: values.resolveOrder,
k8sRestExposedType: values.k8sRestExposedType,
restartSize: values.restartSize,
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/setting/EditCluster.vue
b/streampark-console/streampark-console-newui/src/views/flink/setting/EditCluster.vue
index fbee7a888..aa37b2354 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/setting/EditCluster.vue
+++
b/streampark-console/streampark-console-newui/src/views/flink/setting/EditCluster.vue
@@ -106,7 +106,7 @@
address: cluster.address,
clusterId: cluster.clusterId,
description: cluster.description,
- dynamicOptions: cluster.dynamicOptions,
+ properties: cluster.properties,
resolveOrder: cluster.resolveOrder,
yarnQueue: cluster.yarnQueue,
versionId: cluster.versionId || null,
diff --git
a/streampark-console/streampark-console-newui/src/views/flink/setting/hooks/useClusterSetting.ts
b/streampark-console/streampark-console-newui/src/views/flink/setting/hooks/useClusterSetting.ts
index 8f51e44a2..25df0605e 100644
---
a/streampark-console/streampark-console-newui/src/views/flink/setting/hooks/useClusterSetting.ts
+++
b/streampark-console/streampark-console-newui/src/views/flink/setting/hooks/useClusterSetting.ts
@@ -19,7 +19,7 @@ import { StoreValue } from
'ant-design-vue/lib/form/interface';
import { computed, onMounted, reactive, ref, unref } from 'vue';
import { executionModes, k8sRestExposedType, resolveOrder } from
'../../app/data';
import {
- renderDynamicOption,
+ renderProperties,
renderInputDropdown,
renderOptionsItems,
renderTotalMemory,
@@ -302,11 +302,11 @@ export const useClusterSetting = () => {
renderOptionsItems(model, 'tmOptions', 'taskmanager.memory.'),
},
{
- field: 'dynamicOptions',
- label: 'Dynamic Option',
+ field: 'properties',
+ label: 'Properties',
ifShow: ({ values }) => [3, 5].includes(values.executionMode),
component: 'Input',
- render: (renderCallbackParams) =>
renderDynamicOption(renderCallbackParams),
+ render: (renderCallbackParams) =>
renderProperties(renderCallbackParams),
},
{
field: 'description',
@@ -338,7 +338,7 @@ export const useClusterSetting = () => {
Object.assign(params, {
options: JSON.stringify(options),
yarnQueue: handleYarnQueue(values),
- dynamicOptions: values.dynamicOptions,
+ properties: values.properties,
resolveOrder: values.resolveOrder,
address: values.address,
flameGraph: values.flameGraph,
@@ -347,7 +347,7 @@ export const useClusterSetting = () => {
case 5:
Object.assign(params, {
options: JSON.stringify(options),
- dynamicOptions: values.dynamicOptions,
+ properties: values.properties,
resolveOrder: values.resolveOrder,
k8sRestExposedType: values.k8sRestExposedType,
k8sNamespace: values.k8sNamespace || null,
diff --git
a/streampark-console/streampark-console-service/src/assembly/script/schema/mysql-schema.sql
b/streampark-console/streampark-console-service/src/assembly/script/schema/mysql-schema.sql
index 0ccac576c..9a3b9e0a4 100644
---
a/streampark-console/streampark-console-service/src/assembly/script/schema/mysql-schema.sql
+++
b/streampark-console/streampark-console-service/src/assembly/script/schema/mysql-schema.sql
@@ -90,7 +90,7 @@ create table `t_flink_app` (
`cp_max_failure_interval` int default null,
`cp_failure_rate_interval` int default null,
`cp_failure_action` tinyint default null,
- `dynamic_options` text collate utf8mb4_general_ci,
+ `properties` text collate utf8mb4_general_ci,
`description` varchar(255) collate utf8mb4_general_ci default null,
`resolve_order` tinyint default null,
`k8s_rest_exposed_type` tinyint default null,
@@ -457,7 +457,7 @@ create table `t_flink_cluster` (
`description` varchar(255) default null,
`user_id` bigint default null,
`flink_image` varchar(255) default null comment 'flink image',
- `dynamic_options` text comment 'dynamic parameters',
+ `properties` text comment 'allows specifying multiple generic configuration
options',
`k8s_rest_exposed_type` tinyint default 2 comment 'k8s
export(0:loadbalancer,1:clusterip,2:nodeport)',
`k8s_hadoop_integration` tinyint default 0,
`flame_graph` tinyint default 0 comment 'flameGraph enable，default disable',
diff --git
a/streampark-console/streampark-console-service/src/assembly/script/schema/pgsql-schema.sql
b/streampark-console/streampark-console-service/src/assembly/script/schema/pgsql-schema.sql
index 635cc854e..898edc03f 100644
---
a/streampark-console/streampark-console-service/src/assembly/script/schema/pgsql-schema.sql
+++
b/streampark-console/streampark-console-service/src/assembly/script/schema/pgsql-schema.sql
@@ -243,7 +243,7 @@ create table "public"."t_flink_app" (
"cp_max_failure_interval" int4,
"cp_failure_rate_interval" int4,
"cp_failure_action" int2,
- "dynamic_options" text collate "pg_catalog"."default",
+ "properties" text collate "pg_catalog"."default",
"description" varchar(255) collate "pg_catalog"."default",
"resolve_order" int2,
"k8s_rest_exposed_type" int2,
@@ -308,7 +308,7 @@ create table "public"."t_flink_cluster" (
"description" varchar(255) collate "pg_catalog"."default",
"user_id" int8,
"flink_image" varchar(255) collate "pg_catalog"."default",
- "dynamic_options" text collate "pg_catalog"."default",
+ "properties" text collate "pg_catalog"."default",
"k8s_rest_exposed_type" int2 default 2,
"k8s_hadoop_integration" boolean default false,
"flame_graph" boolean default false,
@@ -329,7 +329,7 @@ comment on column "public"."t_flink_cluster"."version_id"
is 'flink version id';
comment on column "public"."t_flink_cluster"."k8s_namespace" is 'k8s
namespace';
comment on column "public"."t_flink_cluster"."service_account" is 'k8s service
account';
comment on column "public"."t_flink_cluster"."flink_image" is 'flink image';
-comment on column "public"."t_flink_cluster"."dynamic_options" is 'dynamic
parameters';
+comment on column "public"."t_flink_cluster"."properties" is 'allows
specifying multiple generic configuration options';
comment on column "public"."t_flink_cluster"."k8s_rest_exposed_type" is 'k8s
export(0:loadbalancer,1:clusterip,2:nodeport)';
comment on column "public"."t_flink_cluster"."flame_graph" is 'enable the
flame graph';
comment on column "public"."t_flink_cluster"."k8s_conf" is 'the path where the
k 8 s configuration file is located';
diff --git
a/streampark-console/streampark-console-service/src/assembly/script/upgrade/mysql/1.2.4.sql
b/streampark-console/streampark-console-service/src/assembly/script/upgrade/mysql/1.2.4.sql
index 5c94e37cc..971be7927 100644
---
a/streampark-console/streampark-console-service/src/assembly/script/upgrade/mysql/1.2.4.sql
+++
b/streampark-console/streampark-console-service/src/assembly/script/upgrade/mysql/1.2.4.sql
@@ -58,25 +58,26 @@ set email_params = concat('{"contacts":"', email_params,
'"}'),
we_com_params='{}',
lark_params='{}'
where alert_type = 1;
--- remove the original alert_email field
-alter table t_flink_app drop column alert_email;
-alter table `t_flink_app` add column `option_time` datetime default null after
`create_time`;
-alter table t_setting modify column `value` text ;
-insert into `t_setting` values (14, 'docker.register.namespace', null, 'Docker
Register Image namespace', 'Docker命名空间', 1);
-alter table `t_flink_app` add column `ingress_template` text collate
utf8mb4_general_ci comment 'ingress模版文件';
-alter table `t_flink_app` add column `default_mode_ingress` text collate
utf8mb4_general_ci comment '配置ingress的域名';
-alter table `t_flink_app` add column `modify_time` datetime not null default
current_timestamp on update current_timestamp after `create_time`;
--- add tags field
-alter table `t_flink_app` add column `tags` varchar(500) default null;
--- add job_manager_url field
-alter table `t_flink_app` add column `job_manager_url` varchar(255) default
null after `job_id`;
--- add job_manager_url field
+-- t_flink_app
+alter table `t_flink_app`
+ drop column alert_email,
+ change column dynamic_option properties text comment 'allows specifying
multiple generic configuration options',
+ add column `job_manager_url` varchar(255) default null after `job_id`,
+ add column `option_time` datetime default null after `create_time`,
+ add column `ingress_template` text collate utf8mb4_general_ci comment
'ingress模版文件',
+ add column `default_mode_ingress` text collate utf8mb4_general_ci comment
'配置ingress的域名',
+ add column `modify_time` datetime not null default current_timestamp on
update current_timestamp after `create_time`,
+ add column `tags` varchar(500) default null;
+
alter table `t_flink_log` add column `job_manager_url` varchar(255) default
null after `yarn_app_id`;
+-- t_flink_project
alter table `t_flink_project`
-change column `date` `create_time` datetime default current_timestamp not null,
-add column `modify_time` datetime not null default current_timestamp on update
current_timestamp after `create_time`;
+ change column `date` `create_time` datetime default current_timestamp not
null,
+ add column `team_id` bigint not null comment 'team id' default 100000
after `id`,
+ add column `modify_time` datetime not null default current_timestamp on
update current_timestamp after `create_time`,
+ add index `inx_team` (`team_id`) using btree;
-- change `update_time` to `modify_time`
@@ -152,9 +153,6 @@ alter table `t_flink_app`
add column `team_id` bigint not null comment 'team id' default 100000 after
`id`,
add index `inx_team` (`team_id`) using btree;
-alter table `t_flink_project`
-add column `team_id` bigint not null comment 'team id' default 100000 after
`id`,
-add index `inx_team` (`team_id`) using btree;
-- Update user
alter table `t_user`
@@ -209,10 +207,10 @@ alter table `t_user_role` rename `t_member`;
alter table `t_member`
add column `team_id` bigint not null comment 'team id' default 100000 after
`id`,
-modify `user_id` bigint not null comment 'user id',
-modify `role_id` bigint not null comment 'role id',
-add column `create_time` datetime not null default current_timestamp comment
'create time',
-add column `modify_time` datetime not null default current_timestamp on
update current_timestamp comment 'modify time',
+modify column `user_id` bigint not null comment 'user id',
+modify column `role_id` bigint not null comment 'role id',
+add column `create_time` datetime not null default current_timestamp comment
'create time',
+add column `modify_time` datetime not null default current_timestamp on
update current_timestamp comment 'modify time',
drop index `UN_INX`,
add unique key `un_user_team_role_inx` (`user_id`,`team_id`,`role_id`) using
btree;
@@ -225,6 +223,7 @@ where `menu_id` = 100021;
update `t_menu` set `menu_name` = 'StreamPark' where `menu_id` = 100013;
+-- t_setting
alter table `t_setting` drop primary key;
alter table `t_setting`
change column `NUM` `order_num` int default null,
@@ -234,14 +233,15 @@ change column `TITLE` `setting_name` varchar(255) collate
utf8mb4_general_ci def
change column `DESCRIPTION` `description` varchar(255) collate
utf8mb4_general_ci default null,
change column `TYPE` `type` tinyint not null comment '1: input 2: boolean 3:
number',
add primary key (`setting_key`);
-
+insert into `t_setting` values (14, 'docker.register.namespace', null, 'Docker
Register Image namespace', 'Docker命名空间', 1);
insert into `t_setting` values (15, 'streampark.maven.settings', null, 'Maven
Settings File Path', 'Maven Settings.xml 完整路径', 1);
--- update the index field for t_user;
-alter table `t_user` drop index `un_username`;
+
+-- t_user
alter table `t_user`
-modify `username` varchar(255) collate utf8mb4_general_ci not null comment
'user name',
-add unique key `un_username` (`username`) using btree;
+ drop index `un_username`,
+ modify column `username` varchar(255) collate utf8mb4_general_ci not null
comment 'user name',
+ add unique key `un_username` (`username`) using btree;
drop table if exists `t_variable`;
create table `t_variable` (
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkClusterController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkClusterController.java
index d8d0c21a3..0da5a0b5d 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkClusterController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkClusterController.java
@@ -76,7 +76,7 @@ public class FlinkClusterController {
flinkCluster.setClusterName(cluster.getClusterName());
flinkCluster.setAddress(cluster.getAddress());
flinkCluster.setExecutionMode(cluster.getExecutionMode());
- flinkCluster.setDynamicOptions(cluster.getDynamicOptions());
+ flinkCluster.setProperties(cluster.getProperties());
flinkCluster.setFlameGraph(cluster.getFlameGraph());
flinkCluster.setFlinkImage(cluster.getFlinkImage());
flinkCluster.setOptions(cluster.getOptions());
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Application.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Application.java
index 7064a80e9..d7cbb1c75 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Application.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Application.java
@@ -166,7 +166,7 @@ public class Application implements Serializable {
private String hotParams;
private Integer resolveOrder;
private Integer executionMode;
- private String dynamicOptions;
+ private String properties;
private Integer appType;
private Boolean flameGraph;
@@ -550,7 +550,7 @@ public class Application implements Serializable {
// 4) Parallelism has it changed
// 5) Task Slots has it changed
// 6) Options has it changed
- // 7) Dynamic Option has it changed
+ // 7) properties has it changed
// 8) Program Args has it changed
// 9) Flink Version has it changed
@@ -585,15 +585,15 @@ public class Application implements Serializable {
return false;
}
- if (this.getDynamicOptions() != null) {
- if (other.getDynamicOptions() != null) {
- if
(!this.getDynamicOptions().trim().equals(other.getDynamicOptions().trim())) {
+ if (this.getProperties() != null) {
+ if (other.getProperties() != null) {
+ if
(!this.getProperties().trim().equals(other.getProperties().trim())) {
return false;
}
} else {
return false;
}
- } else if (other.getDynamicOptions() != null) {
+ } else if (other.getProperties() != null) {
return false;
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkCluster.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkCluster.java
index c336e4dac..1efa42926 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkCluster.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkCluster.java
@@ -79,7 +79,7 @@ public class FlinkCluster implements Serializable {
private Boolean k8sHadoopIntegration;
- private String dynamicOptions;
+ private String properties;
private Integer k8sRestExposedType;
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationServiceImpl.java
index c6d7def33..858ad0d4d 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationServiceImpl.java
@@ -635,7 +635,7 @@ public class ApplicationServiceImpl extends
ServiceImpl<ApplicationMapper, Appli
newApp.setRestartSize(oldApp.getRestartSize());
newApp.setJobType(oldApp.getJobType());
newApp.setOptions(oldApp.getOptions());
- newApp.setDynamicOptions(oldApp.getDynamicOptions());
+ newApp.setProperties(oldApp.getProperties());
newApp.setResolveOrder(oldApp.getResolveOrder());
newApp.setExecutionMode(oldApp.getExecutionMode());
newApp.setFlinkImage(oldApp.getFlinkImage());
@@ -745,7 +745,7 @@ public class ApplicationServiceImpl extends
ServiceImpl<ApplicationMapper, Appli
application.setVersionId(appParam.getVersionId());
application.setArgs(appParam.getArgs());
application.setOptions(appParam.getOptions());
- application.setDynamicOptions(appParam.getDynamicOptions());
+ application.setProperties(appParam.getProperties());
application.setResolveOrder(appParam.getResolveOrder());
application.setExecutionMode(appParam.getExecutionMode());
application.setClusterId(appParam.getClusterId());
@@ -1100,7 +1100,7 @@ public class ApplicationServiceImpl extends
ServiceImpl<ApplicationMapper, Appli
appParam.getDrain(),
customSavepoint,
application.getK8sNamespace(),
- application.getDynamicOptions(),
+ application.getProperties(),
extraParameter
);
@@ -1186,7 +1186,7 @@ public class ApplicationServiceImpl extends
ServiceImpl<ApplicationMapper, Appli
}
return error;
} else {
- return "When custom savepoint is not set, state.savepoints.dir
needs to be set in Dynamic Option or flink-conf.yaml of application";
+ return "When custom savepoint is not set, state.savepoints.dir
needs to be set in properties or flink-conf.yaml of application";
}
}
@@ -1291,7 +1291,7 @@ public class ApplicationServiceImpl extends
ServiceImpl<ApplicationMapper, Appli
throw new UnsupportedOperationException("Unsupported...");
}
- Map<String, String> dynamicOption =
FlinkSubmitter.extractDynamicOptionAsJava(application.getDynamicOptions());
+ Map<String, String> properties =
FlinkSubmitter.extractPropertiesAsJava(application.getProperties());
Map<String, Object> extraParameter = new HashMap<>(0);
@@ -1312,7 +1312,7 @@ public class ApplicationServiceImpl extends
ServiceImpl<ApplicationMapper, Appli
if (ExecutionMode.isYarnMode(application.getExecutionModeEnum())) {
String yarnQueue = (String)
application.getHotParamsMap().get(ConfigConst.KEY_YARN_APP_QUEUE());
if (yarnQueue != null) {
- dynamicOption.put(ConfigConst.KEY_YARN_APP_QUEUE(), yarnQueue);
+ properties.put(ConfigConst.KEY_YARN_APP_QUEUE(), yarnQueue);
}
if
(ExecutionMode.YARN_SESSION.equals(application.getExecutionModeEnum())) {
FlinkCluster cluster =
flinkClusterService.getById(application.getFlinkClusterId());
@@ -1394,7 +1394,7 @@ public class ApplicationServiceImpl extends
ServiceImpl<ApplicationMapper, Appli
getSavePointed(appParam),
appParam.getFlameGraph() ? getFlameGraph(application) : null,
application.getOptionMap(),
- dynamicOption,
+ properties,
applicationArgs,
buildResult,
kubernetesSubmitParam,
@@ -1503,9 +1503,9 @@ public class ApplicationServiceImpl extends
ServiceImpl<ApplicationMapper, Appli
private String getSavePointPath(Application appParam) throws Exception {
Application application = getById(appParam.getId());
- // 1) dynamic parameters have the highest priority, read the dynamic
parameters are set: -Dstate.savepoints.dir
+ // 1) properties have the highest priority, read the properties are
set: -Dstate.savepoints.dir
String savepointPath = FlinkSubmitter
- .extractDynamicOptionAsJava(application.getDynamicOptions())
+ .extractPropertiesAsJava(application.getProperties())
.get(CheckpointingOptions.SAVEPOINT_DIRECTORY.key());
// Application conf configuration has the second priority. If it is a
streampark|flinksql type task,
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkClusterServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkClusterServiceImpl.java
index ab7626eba..89afdd20d 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkClusterServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkClusterServiceImpl.java
@@ -167,14 +167,14 @@ public class FlinkClusterServiceImpl extends
ServiceImpl<FlinkClusterMapper, Fli
FlinkEnv flinkEnv =
flinkEnvService.getById(flinkCluster.getVersionId());
Map<String, Object> extraParameter = flinkCluster.getOptionMap();
ResolveOrder resolveOrder =
ResolveOrder.of(flinkCluster.getResolveOrder());
- Map<String, String> dynamicOption =
FlinkSubmitter.extractDynamicOptionAsJava(flinkCluster.getDynamicOptions());
+ Map<String, String> properties =
FlinkSubmitter.extractPropertiesAsJava(flinkCluster.getProperties());
DeployRequest deployRequest = new DeployRequest(
flinkEnv.getFlinkVersion(),
flinkCluster.getClusterId(),
executionModeEnum,
resolveOrder,
flinkCluster.getFlameGraph() ? getFlameGraph(flinkCluster) :
null,
- dynamicOption,
+ properties,
kubernetesDeployParam,
extraParameter
);
diff --git
a/streampark-console/streampark-console-service/src/main/resources/db/schema-h2.sql
b/streampark-console/streampark-console-service/src/main/resources/db/schema-h2.sql
index d7be56dc2..1265851e5 100644
---
a/streampark-console/streampark-console-service/src/main/resources/db/schema-h2.sql
+++
b/streampark-console/streampark-console-service/src/main/resources/db/schema-h2.sql
@@ -78,7 +78,7 @@ create table if not exists `t_flink_app` (
`cp_max_failure_interval` int default null,
`cp_failure_rate_interval` int default null,
`cp_failure_action` tinyint default null,
- `dynamic_options` text ,
+ `properties` text ,
`description` varchar(255) default null,
`resolve_order` tinyint default null,
`k8s_rest_exposed_type` tinyint default null,
@@ -405,7 +405,7 @@ create table if not exists `t_flink_cluster` (
`description` varchar(255) default null,
`user_id` bigint default null,
`flink_image` varchar(255) default null comment 'flink image',
- `dynamic_options` text comment 'dynamic parameters',
+ `properties` text comment 'allows specifying multiple generic configuration
options',
`k8s_rest_exposed_type` tinyint default 2 comment 'k8s
export(0:loadbalancer,1:clusterip,2:nodeport)',
`k8s_hadoop_integration` tinyint default 0,
`flame_graph` tinyint default 0 comment 'flameGraph enable，default disable',
diff --git
a/streampark-console/streampark-console-service/src/main/resources/mapper/core/ApplicationMapper.xml
b/streampark-console/streampark-console-service/src/main/resources/mapper/core/ApplicationMapper.xml
index aa81b9872..8afa19ff8 100644
---
a/streampark-console/streampark-console-service/src/main/resources/mapper/core/ApplicationMapper.xml
+++
b/streampark-console/streampark-console-service/src/main/resources/mapper/core/ApplicationMapper.xml
@@ -26,7 +26,7 @@
<result column="module" jdbcType="VARCHAR" property="module"/>
<result column="args" jdbcType="LONGVARCHAR" property="args"/>
<result column="options" jdbcType="LONGVARCHAR" property="options"/>
- <result column="dynamic_options" jdbcType="LONGVARCHAR"
property="dynamicOptions"/>
+ <result column="properties" jdbcType="LONGVARCHAR"
property="properties"/>
<result column="hot_params" jdbcType="VARCHAR" property="hotParams"/>
<result column="job_name" jdbcType="VARCHAR" property="jobName"/>
<result column="app_id" jdbcType="VARCHAR" property="appId"/>
diff --git
a/streampark-console/streampark-console-service/src/main/resources/mapper/core/FlinkClusterMapper.xml
b/streampark-console/streampark-console-service/src/main/resources/mapper/core/FlinkClusterMapper.xml
index 9098143e2..2e073a39f 100644
---
a/streampark-console/streampark-console-service/src/main/resources/mapper/core/FlinkClusterMapper.xml
+++
b/streampark-console/streampark-console-service/src/main/resources/mapper/core/FlinkClusterMapper.xml
@@ -33,7 +33,7 @@
<result column="description" jdbcType="VARCHAR"
property="description"/>
<result column="user_id" jdbcType="BIGINT" property="userId"/>
<result column="flink_image" jdbcType="VARCHAR" property="flinkImage"/>
- <result column="dynamic_options" jdbcType="LONGVARCHAR"
property="dynamicOptions"/>
+ <result column="properties" jdbcType="LONGVARCHAR"
property="properties"/>
<result column="k8s_rest_exposed_type" jdbcType="TINYINT"
property="k8sRestExposedType"/>
<result column="k8s_hadoop_integration" jdbcType="BOOLEAN"
property="k8sHadoopIntegration"/>
<result column="flame_graph" jdbcType="BOOLEAN" property="flameGraph"/>
diff --git
a/streampark-console/streampark-console-webapp/src/views/flink/app/Add.vue
b/streampark-console/streampark-console-webapp/src/views/flink/app/Add.vue
index 109125fec..68aee7b42 100644
--- a/streampark-console/streampark-console-webapp/src/views/flink/app/Add.vue
+++ b/streampark-console/streampark-console-webapp/src/views/flink/app/Add.vue
@@ -1355,14 +1355,14 @@
</a-form-item>
<a-form-item
- label="Dynamic Option"
+ label="Properties"
:label-col="{lg: {span: 5}, sm: {span: 7}}"
:wrapper-col="{lg: {span: 16}, sm: {span: 17} }">
<a-textarea
rows="4"
- name="dynamicOptions"
+ name="properties"
placeholder="$key=$value,If there are multiple parameters,you can
new line enter them (-D <arg>)"
- v-decorator="['dynamicOptions']"/>
+ v-decorator="['properties']"/>
<p class="conf-desc">
<span class="note-info">
<a-tag color="#2db7f5" class="tag-note">Note</a-tag>
@@ -2322,7 +2322,7 @@
cpMaxFailureInterval: values.cpMaxFailureInterval || null,
cpFailureRateInterval: values.cpFailureRateInterval || null,
cpFailureAction: values.cpFailureAction || null,
- dynamicOptions: values.dynamicOptions,
+ properties: values.properties,
resolveOrder: values.resolveOrder,
k8sRestExposedType: values.k8sRestExposedType,
restartSize: values.restartSize,
@@ -2429,7 +2429,7 @@
cpMaxFailureInterval: values.cpMaxFailureInterval || null,
cpFailureRateInterval: values.cpFailureRateInterval || null,
cpFailureAction: values.cpFailureAction || null,
- dynamicOptions: values.dynamicOptions || null,
+ properties: values.properties || null,
resolveOrder: values.resolveOrder,
k8sRestExposedType: values.k8sRestExposedType,
restartSize: values.restartSize,
diff --git
a/streampark-console/streampark-console-webapp/src/views/flink/app/EditFlink.vue
b/streampark-console/streampark-console-webapp/src/views/flink/app/EditFlink.vue
index 016adaade..63119eb9a 100644
---
a/streampark-console/streampark-console-webapp/src/views/flink/app/EditFlink.vue
+++
b/streampark-console/streampark-console-webapp/src/views/flink/app/EditFlink.vue
@@ -811,14 +811,14 @@
</a-form-item>
<a-form-item
- label="Dynamic Option"
+ label="Properties"
:label-col="{lg: {span: 5}, sm: {span: 7}}"
:wrapper-col="{lg: {span: 16}, sm: {span: 17} }">
<a-textarea
rows="8"
- name="dynamicOptions"
+ name="properties"
placeholder="$key=$value,If there are multiple parameters,you can
new line enter them (-D <arg>)"
- v-decorator="['dynamicOptions']" />
+ v-decorator="['properties']" />
<p class="conf-desc">
<span class="note-info">
<a-tag color="#2db7f5" class="tag-note">Note</a-tag>
@@ -1280,7 +1280,7 @@ export default {
cpMaxFailureInterval: values.cpMaxFailureInterval || null,
cpFailureRateInterval: values.cpFailureRateInterval || null,
cpFailureAction: values.cpFailureAction || null,
- dynamicOptions: values.dynamicOptions,
+ properties: values.properties,
restartSize: values.restartSize,
// alertEmail: values.alertEmail || null,
alertId: values.alertId,
@@ -1369,7 +1369,7 @@ export default {
'args': this.app.args,
'jar': this.app.jar,
'description': this.app.description,
- 'dynamicOptions': this.app.dynamicOptions,
+ 'properties': this.app.properties,
'resolveOrder': this.app.resolveOrder,
'executionMode': this.executionMode || this.app.executionMode,
'yarnQueue': this.app.yarnQueue,
diff --git
a/streampark-console/streampark-console-webapp/src/views/flink/app/EditStreamPark.vue
b/streampark-console/streampark-console-webapp/src/views/flink/app/EditStreamPark.vue
index 694709761..a3527dc55 100644
---
a/streampark-console/streampark-console-webapp/src/views/flink/app/EditStreamPark.vue
+++
b/streampark-console/streampark-console-webapp/src/views/flink/app/EditStreamPark.vue
@@ -1462,14 +1462,14 @@
</a-form-item>
<a-form-item
- label="Dynamic Option"
+ label="Properties"
:label-col="{lg: {span: 5}, sm: {span: 7}}"
:wrapper-col="{lg: {span: 16}, sm: {span: 17} }">
<a-textarea
rows="8"
- name="dynamicOptions"
- placeholder="$key=$value,If there are multiple parameters,you can
new line enter them (-D <arg>)"
- v-decorator="['dynamicOptions']" />
+ name="properties"
+ placeholder="$key=$value,If there are multiple parameters,you can
new line enter them"
+ v-decorator="['properties']" />
<p class="conf-desc">
<span class="note-info">
<a-tag color="#2db7f5" class="tag-note">Note</a-tag>
@@ -2429,7 +2429,7 @@ export default {
args: values.args,
options: JSON.stringify(options),
yarnQueue: this.handleYarnQueue(values),
- dynamicOptions: values.dynamicOptions,
+ properties: values.properties,
cpMaxFailureInterval: values.cpMaxFailureInterval || null,
cpFailureRateInterval: values.cpFailureRateInterval || null,
cpFailureAction: values.cpFailureAction || null,
@@ -2491,7 +2491,7 @@ export default {
cpMaxFailureInterval: values.cpMaxFailureInterval || null,
cpFailureRateInterval: values.cpFailureRateInterval || null,
cpFailureAction: values.cpFailureAction || null,
- dynamicOptions: values.dynamicOptions || null,
+ properties: values.properties || null,
resolveOrder: values.resolveOrder,
k8sRestExposedType: values.k8sRestExposedType,
restartSize: values.restartSize,
@@ -2856,7 +2856,7 @@ export default {
'tags': this.app.tags,
'args': this.app.args,
'description': this.app.description,
- 'dynamicOptions': this.app.dynamicOptions,
+ 'properties': this.app.properties,
'resolveOrder': this.app.resolveOrder,
'versionId': this.app.versionId || null,
'k8sRestExposedType': this.app.k8sRestExposedType,
diff --git
a/streampark-console/streampark-console-webapp/src/views/flink/setting/AddCluster.vue
b/streampark-console/streampark-console-webapp/src/views/flink/setting/AddCluster.vue
index 89359d3d8..b3a0be3e7 100644
---
a/streampark-console/streampark-console-webapp/src/views/flink/setting/AddCluster.vue
+++
b/streampark-console/streampark-console-webapp/src/views/flink/setting/AddCluster.vue
@@ -446,14 +446,14 @@
</a-form-item>
<a-form-item
- label="Dynamic Option"
+ label="Properties"
:label-col="{lg: {span: 5}, sm: {span: 7}}"
:wrapper-col="{lg: {span: 16}, sm: {span: 17} }">
<a-textarea
rows="4"
- name="dynamicOptions"
+ name="properties"
placeholder="$key=$value,If there are multiple parameters,you can
new line enter them (-D <arg>)"
- v-decorator="['dynamicOptions']"/>
+ v-decorator="['properties']"/>
<p class="conf-desc">
<span class="note-info">
<a-tag color="#2db7f5" class="tag-note">Note</a-tag>
@@ -684,7 +684,7 @@ export default {
versionId: values.versionId,
options: JSON.stringify(options),
yarnQueue: this.handleYarnQueue(values),
- dynamicOptions: values.dynamicOptions,
+ properties: values.properties,
resolveOrder: values.resolveOrder,
address: values.address,
flameGraph: values.flameGraph,
@@ -697,7 +697,7 @@ export default {
executionMode: values.executionMode,
versionId: values.versionId,
options: JSON.stringify(options),
- dynamicOptions: values.dynamicOptions,
+ properties: values.properties,
resolveOrder: values.resolveOrder,
k8sRestExposedType: values.k8sRestExposedType,
k8sNamespace: values.k8sNamespace || null,
diff --git
a/streampark-console/streampark-console-webapp/src/views/flink/setting/EditCluster.vue
b/streampark-console/streampark-console-webapp/src/views/flink/setting/EditCluster.vue
index 965fa9569..d8dc9b0fb 100644
---
a/streampark-console/streampark-console-webapp/src/views/flink/setting/EditCluster.vue
+++
b/streampark-console/streampark-console-webapp/src/views/flink/setting/EditCluster.vue
@@ -446,14 +446,14 @@
</a-form-item>
<a-form-item
- label="Dynamic Option"
+ label="Properties"
:label-col="{lg: {span: 5}, sm: {span: 7}}"
:wrapper-col="{lg: {span: 16}, sm: {span: 17} }">
<a-textarea
rows="4"
- name="dynamicOptions"
+ name="properties"
placeholder="$key=$value,If there are multiple parameters,you can
new line enter them (-D <arg>)"
- v-decorator="['dynamicOptions']"/>
+ v-decorator="['properties']"/>
<p class="conf-desc">
<span class="note-info">
<a-tag color="#2db7f5" class="tag-note">Note</a-tag>
@@ -657,7 +657,7 @@ export default {
'address': this.cluster.address,
'clusterId': this.cluster.clusterId,
'description': this.cluster.description,
- 'dynamicOptions': this.cluster.dynamicOptions,
+ 'properties': this.cluster.properties,
'resolveOrder': this.cluster.resolveOrder,
'yarnQueue': this.cluster.yarnQueue,
'versionId': this.cluster.versionId || null,
@@ -776,7 +776,7 @@ export default {
versionId: values.versionId,
options: JSON.stringify(options),
yarnQueue: this.handleYarnQueue(values),
- dynamicOptions: values.dynamicOptions,
+ properties: values.properties,
resolveOrder: values.resolveOrder,
address: values.address,
flameGraph: values.flameGraph,
@@ -790,7 +790,7 @@ export default {
executionMode: values.executionMode,
versionId: values.versionId,
options: JSON.stringify(options),
- dynamicOptions: values.dynamicOptions,
+ properties: values.properties,
resolveOrder: values.resolveOrder,
k8sRestExposedType: values.k8sRestExposedType,
k8sNamespace: values.k8sNamespace || null,
diff --git
a/streampark-flink/streampark-flink-submit/streampark-flink-submit-api/src/main/scala/org/apache/streampark/flink/submit/FlinkSubmitter.scala
b/streampark-flink/streampark-flink-submit/streampark-flink-submit-api/src/main/scala/org/apache/streampark/flink/submit/FlinkSubmitter.scala
index 5423c23aa..a6239c41a 100644
---
a/streampark-flink/streampark-flink-submit/streampark-flink-submit-api/src/main/scala/org/apache/streampark/flink/submit/FlinkSubmitter.scala
+++
b/streampark-flink/streampark-flink-submit/streampark-flink-submit-api/src/main/scala/org/apache/streampark/flink/submit/FlinkSubmitter.scala
@@ -30,8 +30,7 @@ import scala.collection.JavaConverters._
object FlinkSubmitter extends Logger {
- // effective k-v regex pattern of submit.dynamicOption
- private[this] lazy val DYNAMIC_OPTION_ITEM_PATTERN =
Pattern.compile("(.*?)=(.*?)")
+ private[this] lazy val PROPERTY_PATTERN = Pattern.compile("(.*?)=(.*?)")
private[this] val FLINK_SUBMIT_CLASS_NAME =
"org.apache.streampark.flink.submit.FlinkSubmit"
@@ -90,18 +89,18 @@ object FlinkSubmitter extends Logger {
}
/**
- * extract flink configuration from application.dynamicOption
+ * extract flink configuration from application.properties
*/
- @Nonnull def extractDynamicOption(dynamicOptions: String): Map[String,
String] = {
- if (StringUtils.isEmpty(dynamicOptions)) {
+ @Nonnull def extractProperties(properties: String): Map[String, String] = {
+ if (StringUtils.isEmpty(properties)) {
Map.empty[String, String]
} else {
- dynamicOptions.split("\\s?-D") match {
+ properties.split("\\s?-D") match {
case x if Utils.isEmpty(x) => Map.empty
case d =>
d.filter(_.nonEmpty)
.map(_.trim)
- .map(DYNAMIC_OPTION_ITEM_PATTERN.matcher(_))
+ .map(PROPERTY_PATTERN.matcher(_))
.filter(_.matches)
.map(m => m.group(1) -> m.group(2).replace("\"", "").trim)
.toMap
@@ -109,6 +108,6 @@ object FlinkSubmitter extends Logger {
}
}
- @Nonnull def extractDynamicOptionAsJava(dynamicOptions: String):
JavaMap[String, String] = new util.HashMap[String,
String](extractDynamicOption(dynamicOptions).asJava)
+ @Nonnull def extractPropertiesAsJava(properties: String): JavaMap[String,
String] = new util.HashMap[String, String](extractProperties(properties).asJava)
}
diff --git
a/streampark-flink/streampark-flink-submit/streampark-flink-submit-api/src/main/scala/org/apache/streampark/flink/submit/bean/CancelRequest.scala
b/streampark-flink/streampark-flink-submit/streampark-flink-submit-api/src/main/scala/org/apache/streampark/flink/submit/bean/CancelRequest.scala
index 788f6e101..162743a72 100644
---
a/streampark-flink/streampark-flink-submit/streampark-flink-submit-api/src/main/scala/org/apache/streampark/flink/submit/bean/CancelRequest.scala
+++
b/streampark-flink/streampark-flink-submit/streampark-flink-submit-api/src/main/scala/org/apache/streampark/flink/submit/bean/CancelRequest.scala
@@ -32,7 +32,7 @@ case class CancelRequest(flinkVersion: FlinkVersion,
withDrain: Boolean,
customSavePointPath: String,
kubernetesNamespace: String =
K8sFlinkConfig.DEFAULT_KUBERNETES_NAMESPACE,
- @Nullable dynamicOption: String,
+ @Nullable properties: String,
@Nullable extraParameter: JavaMap[String, Any]
) {
diff --git
a/streampark-flink/streampark-flink-submit/streampark-flink-submit-api/src/main/scala/org/apache/streampark/flink/submit/bean/DeployRequest.scala
b/streampark-flink/streampark-flink-submit/streampark-flink-submit-api/src/main/scala/org/apache/streampark/flink/submit/bean/DeployRequest.scala
index f52a21b2d..9de5748fc 100644
---
a/streampark-flink/streampark-flink-submit/streampark-flink-submit-api/src/main/scala/org/apache/streampark/flink/submit/bean/DeployRequest.scala
+++
b/streampark-flink/streampark-flink-submit/streampark-flink-submit-api/src/main/scala/org/apache/streampark/flink/submit/bean/DeployRequest.scala
@@ -33,7 +33,7 @@ case class DeployRequest(flinkVersion: FlinkVersion,
executionMode: ExecutionMode,
resolveOrder: ResolveOrder,
flameGraph: JavaMap[String, java.io.Serializable],
- dynamicOption: JavaMap[String, String],
+ properties: JavaMap[String, String],
@Nullable k8sDeployParam: KubernetesDeployParam,
@Nullable extraParameter: JavaMap[String, Any]
) {
diff --git
a/streampark-flink/streampark-flink-submit/streampark-flink-submit-api/src/main/scala/org/apache/streampark/flink/submit/bean/SubmitRequest.scala
b/streampark-flink/streampark-flink-submit/streampark-flink-submit-api/src/main/scala/org/apache/streampark/flink/submit/bean/SubmitRequest.scala
index d3f9e5fc8..be1016285 100644
---
a/streampark-flink/streampark-flink-submit/streampark-flink-submit-api/src/main/scala/org/apache/streampark/flink/submit/bean/SubmitRequest.scala
+++
b/streampark-flink/streampark-flink-submit/streampark-flink-submit-api/src/main/scala/org/apache/streampark/flink/submit/bean/SubmitRequest.scala
@@ -55,7 +55,7 @@ case class SubmitRequest(flinkVersion: FlinkVersion,
savePoint: String,
flameGraph: JavaMap[String, java.io.Serializable],
option: JavaMap[String, Any],
- dynamicOption: JavaMap[String, String],
+ properties: JavaMap[String, String],
args: String,
@Nullable buildResult: BuildResult,
@Nullable k8sSubmitParam: KubernetesSubmitParam,
diff --git
a/streampark-flink/streampark-flink-submit/streampark-flink-submit-core/src/main/scala/org/apache/streampark/flink/submit/impl/KubernetesNativeSessionSubmit.scala
b/streampark-flink/streampark-flink-submit/streampark-flink-submit-core/src/main/scala/org/apache/streampark/flink/submit/impl/KubernetesNativeSessionSubmit.scala
index d83d152b4..39a4accad 100644
---
a/streampark-flink/streampark-flink-submit/streampark-flink-submit-core/src/main/scala/org/apache/streampark/flink/submit/impl/KubernetesNativeSessionSubmit.scala
+++
b/streampark-flink/streampark-flink-submit/streampark-flink-submit-core/src/main/scala/org/apache/streampark/flink/submit/impl/KubernetesNativeSessionSubmit.scala
@@ -132,7 +132,7 @@ object KubernetesNativeSessionSubmit extends
KubernetesNativeSubmitTrait with Lo
| flinkImage : ${deployRequest.k8sDeployParam.flinkImage}
| resolveOrder : ${deployRequest.resolveOrder.getName}
| flameGraph : ${deployRequest.flameGraph != null}
- | dynamicOption : ${deployRequest.dynamicOption.mkString(" ")}
+ | properties : ${deployRequest.properties.mkString(" ")}
|-------------------------------------------------------------------------------------------
|""".stripMargin)
var clusterDescriptor: KubernetesClusterDescriptor = null
@@ -141,7 +141,7 @@ object KubernetesNativeSessionSubmit extends
KubernetesNativeSubmitTrait with Lo
try {
val flinkConfig = extractConfiguration(
deployRequest.flinkVersion.flinkHome,
- deployRequest.dynamicOption,
+ deployRequest.properties,
deployRequest.extraParameter,
deployRequest.resolveOrder)
diff --git
a/streampark-flink/streampark-flink-submit/streampark-flink-submit-core/src/main/scala/org/apache/streampark/flink/submit/impl/YarnSessionSubmit.scala
b/streampark-flink/streampark-flink-submit/streampark-flink-submit-core/src/main/scala/org/apache/streampark/flink/submit/impl/YarnSessionSubmit.scala
index ccbb39348..1231d02e3 100644
---
a/streampark-flink/streampark-flink-submit/streampark-flink-submit-core/src/main/scala/org/apache/streampark/flink/submit/impl/YarnSessionSubmit.scala
+++
b/streampark-flink/streampark-flink-submit/streampark-flink-submit-core/src/main/scala/org/apache/streampark/flink/submit/impl/YarnSessionSubmit.scala
@@ -175,14 +175,14 @@ object YarnSessionSubmit extends YarnSubmitTrait {
| clusterId : ${deployRequest.clusterId}
| resolveOrder : ${deployRequest.resolveOrder.getName}
| flameGraph : ${deployRequest.flameGraph != null}
- | dynamicOption : ${deployRequest.dynamicOption.mkString(" ")}
+ | properties : ${deployRequest.properties.mkString(" ")}
|-------------------------------------------------------------------------------------------
|""".stripMargin)
var clusterDescriptor: YarnClusterDescriptor = null
var client: ClusterClient[ApplicationId] = null
try {
val flinkConfig =
extractConfiguration(deployRequest.flinkVersion.flinkHome,
- deployRequest.dynamicOption,
+ deployRequest.properties,
deployRequest.extraParameter,
deployRequest.resolveOrder)
setConfig(deployRequest, flinkConfig)
diff --git
a/streampark-flink/streampark-flink-submit/streampark-flink-submit-core/src/main/scala/org/apache/streampark/flink/submit/trait/FlinkSubmitTrait.scala
b/streampark-flink/streampark-flink-submit/streampark-flink-submit-core/src/main/scala/org/apache/streampark/flink/submit/trait/FlinkSubmitTrait.scala
index 3db09b706..3d61d8de8 100644
---
a/streampark-flink/streampark-flink-submit/streampark-flink-submit-core/src/main/scala/org/apache/streampark/flink/submit/trait/FlinkSubmitTrait.scala
+++
b/streampark-flink/streampark-flink-submit/streampark-flink-submit-core/src/main/scala/org/apache/streampark/flink/submit/trait/FlinkSubmitTrait.scala
@@ -74,8 +74,7 @@ trait FlinkSubmitTrait extends Logger {
| flameGraph : ${submitRequest.flameGraph != null}
| savePoint : ${submitRequest.savePoint}
| option : ${submitRequest.option}
- | property : ${submitRequest.option}
- | dynamicOption : ${submitRequest.dynamicOption.mkString(" ")}
+ | properties : ${submitRequest.properties.mkString(" ")}
| args : ${submitRequest.args}
| appConf : ${submitRequest.appConf}
| flinkBuildResult : ${submitRequest.buildResult}
@@ -289,8 +288,8 @@ trait FlinkSubmitTrait extends Logger {
}
//-D other dynamic parameter
- if (submitRequest.dynamicOption != null &&
submitRequest.dynamicOption.nonEmpty) {
- submitRequest.dynamicOption
+ if (submitRequest.properties != null &&
submitRequest.properties.nonEmpty) {
+ submitRequest.properties
.filter(_._1 != "classloader.resolve-order")
.foreach(x => array += s"-D${x._1}=${x._2}")
}
@@ -325,7 +324,7 @@ trait FlinkSubmitTrait extends Logger {
}
private[submit] def extractConfiguration(flinkHome: String,
- dynamicOption: JavaMap[String,
String],
+ properties: JavaMap[String, String],
extraParameter: JavaMap[String,
Any],
resolveOrder: ResolveOrder):
Configuration = {
val commandLine = {
@@ -337,8 +336,8 @@ trait FlinkSubmitTrait extends Logger {
if (MapUtils.isNotEmpty(extraParameter)) {
extraParameter.foreach(x => array +=
s"-D${x._1.trim}=${x._2.toString.trim}")
}
- if (dynamicOption != null && dynamicOption.nonEmpty) {
- dynamicOption
+ if (properties != null && properties.nonEmpty) {
+ properties
.filter(_._1 != "classloader.resolve-order")
.foreach(x => array += s"-D${x._1}=${x._2}")
}
