You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampark.apache.org by be...@apache.org on 2023/02/25 11:30:50 UTC
[incubator-streampark] branch Launch-Status created (now e98f4d0da)
This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a change to branch Launch-Status
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
at e98f4d0da LanuchState change to ReleaseState
This branch includes the following new commits:
new e98f4d0da LanuchState change to ReleaseState
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-streampark] 01/01: LanuchState change to ReleaseState
Posted by be...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch Launch-Status
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
commit e98f4d0daf56d38da37ce93a36b5ed2e14d23a7d
Author: benjobs <be...@apache.org>
AuthorDate: Sat Feb 25 19:30:31 2023 +0800
LanuchState change to ReleaseState
---
.../src/main/assembly/script/data/mysql-data.sql | 2 +-
.../src/main/assembly/script/data/pgsql-data.sql | 2 +-
.../main/assembly/script/schema/mysql-schema.sql | 2 +-
.../main/assembly/script/schema/pgsql-schema.sql | 2 +-
.../main/assembly/script/upgrade/mysql/2.1.0.sql | 4 +++
.../ApplicationBuildPipelineController.java | 6 ++---
.../core/controller/ApplicationController.java | 2 +-
.../console/core/entity/Application.java | 17 +++++-------
.../streampark/console/core/enums/OptionState.java | 4 +--
.../enums/{LaunchState.java => ReleaseState.java} | 20 +++++++--------
.../console/core/service/ApplicationService.java | 2 +-
.../core/service/impl/AppBuildPipeServiceImpl.java | 20 +++++++--------
.../service/impl/ApplicationBackUpServiceImpl.java | 4 +--
.../core/service/impl/ApplicationServiceImpl.java | 30 +++++++++++-----------
.../core/service/impl/ProjectServiceImpl.java | 10 ++++----
.../console/core/task/FlinkRESTAPIWatcher.java | 8 +++---
.../console/core/task/ProjectBuildTask.java | 8 +++---
.../src/main/resources/db/data-h2.sql | 2 +-
.../src/main/resources/db/schema-h2.sql | 2 +-
.../resources/mapper/core/ApplicationMapper.xml | 2 +-
.../core/service/ApplicationServiceTest.java | 4 +--
.../src/api/flink/app/app.type.ts | 2 +-
.../src/components/Table/src/types/table.ts | 2 +-
.../src/enums/flinkEnum.ts | 18 ++++++-------
.../src/locales/lang/en/flink/app.ts | 18 ++++++-------
.../src/locales/lang/zh-CN/flink/app.ts | 16 ++++++------
.../src/views/flink/app/View.vue | 22 ++++++++--------
.../src/views/flink/app/components/State.tsx | 30 +++++++++++-----------
.../src/views/flink/app/data/index.ts | 16 ++++++------
.../src/views/flink/app/hooks/useApp.tsx | 24 ++++++++---------
.../src/views/flink/app/hooks/useAppTableAction.ts | 26 +++++++++----------
.../src/views/flink/app/utils/index.ts | 10 ++++----
32 files changed, 168 insertions(+), 169 deletions(-)
diff --git a/streampark-console/streampark-console-service/src/main/assembly/script/data/mysql-data.sql b/streampark-console/streampark-console-service/src/main/assembly/script/data/mysql-data.sql
index 6b2265ac3..67f5d1b77 100644
--- a/streampark-console/streampark-console-service/src/main/assembly/script/data/mysql-data.sql
+++ b/streampark-console/streampark-console-service/src/main/assembly/script/data/mysql-data.sql
@@ -73,7 +73,7 @@ insert into `t_menu` values (100021, 100015, 'edit streampark', '/flink/app/edit
insert into `t_menu` values (100022, 100014, 'build', null, null, 'project:build', null, '1', 1, null, now(), now());
insert into `t_menu` values (100023, 100014, 'delete', null, null, 'project:delete', null, '1', 1, null, now(), now());
insert into `t_menu` values (100024, 100015, 'mapping', null, null, 'app:mapping', null, '1', 1, null, now(), now());
-insert into `t_menu` values (100025, 100015, 'launch', null, null, 'app:launch', null, '1', 1, null, now(), now());
+insert into `t_menu` values (100025, 100015, 'release', null, null, 'app:release', null, '1', 1, null, now(), now());
insert into `t_menu` values (100026, 100015, 'start', null, null, 'app:start', null, '1', 1, null, now(), now());
insert into `t_menu` values (100027, 100015, 'clean', null, null, 'app:clean', null, '1', 1, null, now(), now());
insert into `t_menu` values (100028, 100015, 'cancel', null, null, 'app:cancel', null, '1', 1, null, now(), now());
diff --git a/streampark-console/streampark-console-service/src/main/assembly/script/data/pgsql-data.sql b/streampark-console/streampark-console-service/src/main/assembly/script/data/pgsql-data.sql
index ad68d03b0..d01733fbd 100644
--- a/streampark-console/streampark-console-service/src/main/assembly/script/data/pgsql-data.sql
+++ b/streampark-console/streampark-console-service/src/main/assembly/script/data/pgsql-data.sql
@@ -69,7 +69,7 @@ insert into "public"."t_menu" values (100021, 100015, 'edit streampark', '/flink
insert into "public"."t_menu" values (100022, 100014, 'build', null, null, 'project:build', null, '1', '1', null, now(), now());
insert into "public"."t_menu" values (100023, 100014, 'delete', null, null, 'project:delete', null, '1', '1', null, now(), now());
insert into "public"."t_menu" values (100024, 100015, 'mapping', null, null, 'app:mapping', null, '1', '1', null, now(), now());
-insert into "public"."t_menu" values (100025, 100015, 'launch', null, null, 'app:launch', null, '1', '1', null, now(), now());
+insert into "public"."t_menu" values (100025, 100015, 'release', null, null, 'app:release', null, '1', '1', null, now(), now());
insert into "public"."t_menu" values (100026, 100015, 'start', null, null, 'app:start', null, '1', '1', null, now(), now());
insert into "public"."t_menu" values (100027, 100015, 'clean', null, null, 'app:clean', null, '1', '1', null, now(), now());
insert into "public"."t_menu" values (100028, 100015, 'cancel', null, null, 'app:cancel', null, '1', '1', null, now(), now());
diff --git a/streampark-console/streampark-console-service/src/main/assembly/script/schema/mysql-schema.sql b/streampark-console/streampark-console-service/src/main/assembly/script/schema/mysql-schema.sql
index d0b3c8b6e..680a44cb9 100644
--- a/streampark-console/streampark-console-service/src/main/assembly/script/schema/mysql-schema.sql
+++ b/streampark-console/streampark-console-service/src/main/assembly/script/schema/mysql-schema.sql
@@ -88,7 +88,7 @@ create table `t_flink_app` (
`create_time` datetime not null default current_timestamp comment 'create time',
`modify_time` datetime not null default current_timestamp on update current_timestamp comment 'modify time',
`option_time` datetime default null,
- `launch` tinyint default 1,
+ `release` tinyint default 1,
`build` tinyint default 1,
`start_time` datetime default null,
`end_time` datetime default null,
diff --git a/streampark-console/streampark-console-service/src/main/assembly/script/schema/pgsql-schema.sql b/streampark-console/streampark-console-service/src/main/assembly/script/schema/pgsql-schema.sql
index 997007c47..a41dec2b0 100644
--- a/streampark-console/streampark-console-service/src/main/assembly/script/schema/pgsql-schema.sql
+++ b/streampark-console/streampark-console-service/src/main/assembly/script/schema/pgsql-schema.sql
@@ -233,7 +233,7 @@ create table "public"."t_flink_app" (
"create_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone),
"modify_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone),
"option_time" timestamp(6),
- "launch" int2 default 1,
+ "release" int2 default 1,
"build" boolean default true,
"start_time" timestamp(6),
"end_time" timestamp(6),
diff --git a/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/mysql/2.1.0.sql b/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/mysql/2.1.0.sql
index b1f8c2e2a..c9d0eea22 100644
--- a/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/mysql/2.1.0.sql
+++ b/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/mysql/2.1.0.sql
@@ -22,3 +22,7 @@ alter table `t_flink_savepoint` modify column `path` varchar(1024) collate utf8
insert into `t_menu` values (100070, 100015, 'savepoint trigger', null, null, 'savepoint:trigger', null, '1', 1, null, now(), now());
-- ISSUE-2192 DDL & DML End
+
+alter table `t_flink_app` change column `launch` `release` tinyint default 1;
+update `t_menu` set `menu_name`='release',`perms` = 'app:release' where menu_id = 100025;
+
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationBuildPipelineController.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationBuildPipelineController.java
index 1432cd120..f6b53c5d8 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationBuildPipelineController.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationBuildPipelineController.java
@@ -60,7 +60,7 @@ public class ApplicationBuildPipelineController {
@Autowired private FlinkSqlService flinkSqlService;
/**
- * Launch application building pipeline.
+ * Release application building pipeline.
*
* @param appId application id
* @param forceBuild forced start pipeline or not
@@ -68,8 +68,8 @@ public class ApplicationBuildPipelineController {
*/
@ApiAccess
@ApiOperation(
- value = "Launch application",
- notes = "Launch application",
+ value = "Release application",
+ notes = "Release application",
tags = ApiDocConstant.FLINK_APP_OP_TAG,
consumes = "application/x-www-form-urlencoded")
@ApiImplicitParams({
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationController.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationController.java
index c1e918b5e..52702ccb1 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationController.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationController.java
@@ -189,7 +189,7 @@ public class ApplicationController {
@AppUpdated
@PostMapping("revoke")
- @RequiresPermissions("app:launch")
+ @RequiresPermissions("app:release")
public RestResponse revoke(Application app) {
applicationService.revoke(app);
return RestResponse.success();
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 5eaa17e32..09dd61352 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
@@ -32,7 +32,7 @@ import org.apache.streampark.console.base.util.ObjectUtils;
import org.apache.streampark.console.base.util.WebUtils;
import org.apache.streampark.console.core.bean.AppControl;
import org.apache.streampark.console.core.enums.FlinkAppState;
-import org.apache.streampark.console.core.enums.LaunchState;
+import org.apache.streampark.console.core.enums.ReleaseState;
import org.apache.streampark.console.core.enums.ResourceFrom;
import org.apache.streampark.console.core.metrics.flink.JobsOverview;
import org.apache.streampark.console.core.utils.YarnQueueLabelExpression;
@@ -111,8 +111,8 @@ public class Application implements Serializable {
private String k8sNamespace = K8sFlinkConfig.DEFAULT_KUBERNETES_NAMESPACE();
private Integer state;
- /** task launch status */
- private Integer launch;
+ /** task release status */
+ private Integer release;
/** determine if a task needs to be built */
private Boolean build;
@@ -313,13 +313,8 @@ public class Application implements Serializable {
}
@JsonIgnore
- public LaunchState getLaunchState() {
- return LaunchState.of(state);
- }
-
- @JsonIgnore
- public void setLaunchState(LaunchState launchState) {
- this.launch = launchState.get();
+ public ReleaseState getReleaseState() {
+ return ReleaseState.of(release);
}
@JsonIgnore
@@ -468,7 +463,7 @@ public class Application implements Serializable {
@JsonIgnore
public boolean isNeedRollback() {
- return LaunchState.NEED_ROLLBACK.get() == this.getLaunch();
+ return ReleaseState.NEED_ROLLBACK.get() == this.getRelease();
}
@JsonIgnore
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/enums/OptionState.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/enums/OptionState.java
index 983b7e5ae..580c057ee 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/enums/OptionState.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/enums/OptionState.java
@@ -27,8 +27,8 @@ public enum OptionState implements Serializable {
/** Application which is currently action: none. */
NONE(0),
- /** Application which is currently action: deploying. */
- LAUNCHING(1),
+ /** Application which is currently action: releasing. */
+ RELEASING(1),
/** Application which is currently action: cancelling. */
CANCELLING(2),
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/enums/LaunchState.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/enums/ReleaseState.java
similarity index 81%
rename from streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/enums/LaunchState.java
rename to streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/enums/ReleaseState.java
index 2a311a236..0ecc4eb16 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/enums/LaunchState.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/enums/ReleaseState.java
@@ -20,20 +20,20 @@ package org.apache.streampark.console.core.enums;
import java.io.Serializable;
import java.util.Arrays;
-public enum LaunchState implements Serializable {
+public enum ReleaseState implements Serializable {
- /** launch failed */
+ /** release failed */
FAILED(-1),
- /** launch done */
+ /** release done */
DONE(0),
- /** need relaunch after modify task */
- NEED_LAUNCH(1),
+ /** need release after modify task */
+ NEED_RELEASE(1),
- /** launching */
- LAUNCHING(2),
+ /** releasing */
+ RELEASING(2),
- /** launch complete, need restart */
+ /** release complete, need restart */
NEED_RESTART(3),
/** need rollback */
@@ -47,7 +47,7 @@ public enum LaunchState implements Serializable {
private final int value;
- LaunchState(int value) {
+ ReleaseState(int value) {
this.value = value;
}
@@ -55,7 +55,7 @@ public enum LaunchState implements Serializable {
return this.value;
}
- public static LaunchState of(Integer state) {
+ public static ReleaseState of(Integer state) {
return Arrays.stream(values()).filter((x) -> x.value == state).findFirst().orElse(null);
}
}
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ApplicationService.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ApplicationService.java
index 87513f09b..555e3e488 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ApplicationService.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ApplicationService.java
@@ -86,7 +86,7 @@ public interface ApplicationService extends IService<Application> {
boolean checkAlter(Application application);
- void updateLaunch(Application application);
+ void updateRelease(Application application);
List<Application> getByProjectId(Long id);
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/AppBuildPipeServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/AppBuildPipeServiceImpl.java
index 007eba681..76f6ca9fb 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/AppBuildPipeServiceImpl.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/AppBuildPipeServiceImpl.java
@@ -34,9 +34,9 @@ import org.apache.streampark.console.core.entity.FlinkEnv;
import org.apache.streampark.console.core.entity.FlinkSql;
import org.apache.streampark.console.core.entity.Message;
import org.apache.streampark.console.core.enums.CandidateType;
-import org.apache.streampark.console.core.enums.LaunchState;
import org.apache.streampark.console.core.enums.NoticeType;
import org.apache.streampark.console.core.enums.OptionState;
+import org.apache.streampark.console.core.enums.ReleaseState;
import org.apache.streampark.console.core.mapper.ApplicationBuildPipelineMapper;
import org.apache.streampark.console.core.service.AppBuildPipeService;
import org.apache.streampark.console.core.service.ApplicationBackUpService;
@@ -164,8 +164,8 @@ public class AppBuildPipeServiceImpl
AppBuildPipeline.fromPipeSnapshot(snapshot).setAppId(app.getId());
saveEntity(buildPipeline);
- app.setLaunch(LaunchState.LAUNCHING.get());
- applicationService.updateLaunch(app);
+ app.setRelease(ReleaseState.RELEASING.get());
+ applicationService.updateRelease(app);
if (flinkRESTAPIWatcher.isWatchingApp(app.getId())) {
flinkRESTAPIWatcher.init();
@@ -235,10 +235,10 @@ public class AppBuildPipeServiceImpl
if (result.pass()) {
// running job ...
if (app.isRunning()) {
- app.setLaunch(LaunchState.NEED_RESTART.get());
+ app.setRelease(ReleaseState.NEED_RESTART.get());
} else {
app.setOptionState(OptionState.NONE.getValue());
- app.setLaunch(LaunchState.DONE.get());
+ app.setRelease(ReleaseState.DONE.get());
// If the current task is not running, or the task has just been added, directly set
// the candidate version to the official version
if (app.isFlinkSqlJob()) {
@@ -269,15 +269,15 @@ public class AppBuildPipeServiceImpl
new Message(
commonService.getUserId(),
app.getId(),
- app.getJobName().concat(" launch failed"),
+ app.getJobName().concat(" release failed"),
Utils.stringifyException(snapshot.error().exception()),
NoticeType.EXCEPTION);
messageService.push(message);
- app.setLaunch(LaunchState.FAILED.get());
+ app.setRelease(ReleaseState.FAILED.get());
app.setOptionState(OptionState.NONE.getValue());
app.setBuild(true);
}
- applicationService.updateLaunch(app);
+ applicationService.updateRelease(app);
if (flinkRESTAPIWatcher.isWatchingApp(app.getId())) {
flinkRESTAPIWatcher.init();
}
@@ -305,14 +305,14 @@ public class AppBuildPipeServiceImpl
}
});
}
- // save pipeline instance snapshot to db before launch it.
+ // save pipeline instance snapshot to db before release it.
AppBuildPipeline buildPipeline =
AppBuildPipeline.initFromPipeline(pipeline).setAppId(app.getId());
boolean saved = saveEntity(buildPipeline);
DOCKER_PULL_PG_SNAPSHOTS.invalidate(app.getId());
DOCKER_BUILD_PG_SNAPSHOTS.invalidate(app.getId());
DOCKER_PUSH_PG_SNAPSHOTS.invalidate(app.getId());
- // async launch pipeline
+ // async release pipeline
executorService.submit((Runnable) pipeline::launch);
return saved;
}
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationBackUpServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationBackUpServiceImpl.java
index 325c5735b..2747487a4 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationBackUpServiceImpl.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationBackUpServiceImpl.java
@@ -28,7 +28,7 @@ import org.apache.streampark.console.core.entity.ApplicationBackUp;
import org.apache.streampark.console.core.entity.ApplicationConfig;
import org.apache.streampark.console.core.entity.FlinkSql;
import org.apache.streampark.console.core.enums.EffectiveType;
-import org.apache.streampark.console.core.enums.LaunchState;
+import org.apache.streampark.console.core.enums.ReleaseState;
import org.apache.streampark.console.core.mapper.ApplicationBackUpMapper;
import org.apache.streampark.console.core.service.ApplicationBackUpService;
import org.apache.streampark.console.core.service.ApplicationConfigService;
@@ -144,7 +144,7 @@ public class ApplicationBackUpServiceImpl
new UpdateWrapper<Application>()
.lambda()
.eq(Application::getId, application.getId())
- .set(Application::getLaunch, LaunchState.NEED_RESTART.get()));
+ .set(Application::getRelease, ReleaseState.NEED_RESTART.get()));
} catch (Exception e) {
throw e;
}
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 aaf9ce5ad..e1125ec1c 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
@@ -54,8 +54,8 @@ import org.apache.streampark.console.core.enums.ChangedType;
import org.apache.streampark.console.core.enums.CheckPointType;
import org.apache.streampark.console.core.enums.ConfigFileType;
import org.apache.streampark.console.core.enums.FlinkAppState;
-import org.apache.streampark.console.core.enums.LaunchState;
import org.apache.streampark.console.core.enums.OptionState;
+import org.apache.streampark.console.core.enums.ReleaseState;
import org.apache.streampark.console.core.mapper.ApplicationMapper;
import org.apache.streampark.console.core.metrics.flink.JobsOverview;
import org.apache.streampark.console.core.runner.EnvInitializer;
@@ -352,9 +352,9 @@ public class ApplicationServiceImpl extends ServiceImpl<ApplicationMapper, Appli
LambdaUpdateWrapper<Application> updateWrapper = Wrappers.lambdaUpdate();
updateWrapper.eq(Application::getId, application.getId());
if (application.isFlinkSqlJob()) {
- updateWrapper.set(Application::getLaunch, LaunchState.FAILED.get());
+ updateWrapper.set(Application::getRelease, ReleaseState.FAILED.get());
} else {
- updateWrapper.set(Application::getLaunch, LaunchState.NEED_LAUNCH.get());
+ updateWrapper.set(Application::getRelease, ReleaseState.NEED_RELEASE.get());
}
if (!application.isRunning()) {
updateWrapper.set(Application::getState, FlinkAppState.REVOKED.getValue());
@@ -694,7 +694,7 @@ public class ApplicationServiceImpl extends ServiceImpl<ApplicationMapper, Appli
Utils.notNull(appParam.getTeamId(), "The teamId cannot be null");
appParam.setUserId(commonService.getUserId());
appParam.setState(FlinkAppState.ADDED.getValue());
- appParam.setLaunch(LaunchState.NEED_LAUNCH.get());
+ appParam.setRelease(ReleaseState.NEED_RELEASE.get());
appParam.setOptionState(OptionState.NONE.getValue());
appParam.setCreateTime(new Date());
appParam.setDefaultModeIngress(settingService.getIngressModeDefault());
@@ -773,7 +773,7 @@ public class ApplicationServiceImpl extends ServiceImpl<ApplicationMapper, Appli
newApp.setDefaultModeIngress(oldApp.getDefaultModeIngress());
newApp.setUserId(commonService.getUserId());
newApp.setState(FlinkAppState.ADDED.getValue());
- newApp.setLaunch(LaunchState.NEED_LAUNCH.get());
+ newApp.setRelease(ReleaseState.NEED_RELEASE.get());
newApp.setOptionState(OptionState.NONE.getValue());
newApp.setCreateTime(new Date());
newApp.setHotParams(oldApp.getHotParams());
@@ -816,7 +816,7 @@ public class ApplicationServiceImpl extends ServiceImpl<ApplicationMapper, Appli
try {
checkQueueLabelIfNeed(appParam.getExecutionMode(), appParam.getYarnQueue());
Application application = getById(appParam.getId());
- application.setLaunch(LaunchState.NEED_LAUNCH.get());
+ application.setRelease(ReleaseState.NEED_RELEASE.get());
if (application.isUploadJob()) {
if (!ObjectUtils.safeEquals(application.getJar(), appParam.getJar())) {
application.setBuild(true);
@@ -857,7 +857,7 @@ public class ApplicationServiceImpl extends ServiceImpl<ApplicationMapper, Appli
}
appParam.setJobType(application.getJobType());
- // changes to the following parameters need to be re-launched to take effect
+ // changes to the following parameters need to be re-release to take effect
application.setJobName(appParam.getJobName());
application.setVersionId(appParam.getVersionId());
application.setArgs(appParam.getArgs());
@@ -981,7 +981,7 @@ public class ApplicationServiceImpl extends ServiceImpl<ApplicationMapper, Appli
// sql and dependency not changed, but version changed, means that rollback to the version
CandidateType type = CandidateType.HISTORY;
flinkSqlService.setCandidate(type, appParam.getId(), appParam.getSqlId());
- application.setLaunch(LaunchState.NEED_ROLLBACK.get());
+ application.setRelease(ReleaseState.NEED_ROLLBACK.get());
application.setBuild(true);
}
}
@@ -990,10 +990,10 @@ public class ApplicationServiceImpl extends ServiceImpl<ApplicationMapper, Appli
}
@Override
- public void updateLaunch(Application application) {
+ public void updateRelease(Application application) {
LambdaUpdateWrapper<Application> updateWrapper = Wrappers.lambdaUpdate();
updateWrapper.eq(Application::getId, application.getId());
- updateWrapper.set(Application::getLaunch, application.getLaunch());
+ updateWrapper.set(Application::getRelease, application.getRelease());
updateWrapper.set(Application::getBuild, application.getBuild());
if (application.getOptionState() != null) {
updateWrapper.set(Application::getOptionState, application.getOptionState());
@@ -1018,9 +1018,9 @@ public class ApplicationServiceImpl extends ServiceImpl<ApplicationMapper, Appli
LambdaUpdateWrapper<Application> updateWrapper = Wrappers.lambdaUpdate();
updateWrapper.eq(Application::getId, application.getId());
if (application.isRunning()) {
- updateWrapper.set(Application::getLaunch, LaunchState.NEED_RESTART.get());
+ updateWrapper.set(Application::getRelease, ReleaseState.NEED_RESTART.get());
} else {
- updateWrapper.set(Application::getLaunch, LaunchState.DONE.get());
+ updateWrapper.set(Application::getRelease, ReleaseState.DONE.get());
updateWrapper.set(Application::getOptionState, OptionState.NONE.getValue());
}
this.update(updateWrapper);
@@ -1070,8 +1070,8 @@ public class ApplicationServiceImpl extends ServiceImpl<ApplicationMapper, Appli
@Override
public void clean(Application appParam) {
- appParam.setLaunch(LaunchState.DONE.get());
- this.updateLaunch(appParam);
+ appParam.setRelease(ReleaseState.DONE.get());
+ this.updateRelease(appParam);
}
@Override
@@ -1577,7 +1577,7 @@ public class ApplicationServiceImpl extends ServiceImpl<ApplicationMapper, Appli
application.setStartTime(new Date());
application.setEndTime(null);
if (isKubernetesApp(application)) {
- application.setLaunch(LaunchState.DONE.get());
+ application.setRelease(ReleaseState.DONE.get());
}
updateById(application);
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java
index 4b87409c9..7c1091434 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java
@@ -35,7 +35,7 @@ import org.apache.streampark.console.core.entity.Application;
import org.apache.streampark.console.core.entity.Project;
import org.apache.streampark.console.core.enums.BuildState;
import org.apache.streampark.console.core.enums.GitCredential;
-import org.apache.streampark.console.core.enums.LaunchState;
+import org.apache.streampark.console.core.enums.ReleaseState;
import org.apache.streampark.console.core.mapper.ProjectMapper;
import org.apache.streampark.console.core.service.ApplicationService;
import org.apache.streampark.console.core.service.ProjectService;
@@ -145,8 +145,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project>
"update deploy by project: {}, appName:{}",
project.getName(),
app.getJobName());
- app.setLaunch(LaunchState.NEED_CHECK.get());
- applicationService.updateLaunch(app);
+ app.setRelease(ReleaseState.NEED_CHECK.get());
+ applicationService.updateRelease(app);
});
}
}
@@ -219,9 +219,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project>
"update deploy by project: {}, appName:{}",
project.getName(),
app.getJobName());
- app.setLaunch(LaunchState.NEED_LAUNCH.get());
+ app.setRelease(ReleaseState.NEED_RELEASE.get());
app.setBuild(true);
- this.applicationService.updateLaunch(app);
+ this.applicationService.updateRelease(app);
});
flinkRESTAPIWatcher.init();
});
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/FlinkRESTAPIWatcher.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/FlinkRESTAPIWatcher.java
index 28649ae9e..0e7d76443 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/FlinkRESTAPIWatcher.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/FlinkRESTAPIWatcher.java
@@ -25,8 +25,8 @@ import org.apache.streampark.console.base.util.JacksonUtils;
import org.apache.streampark.console.core.entity.Application;
import org.apache.streampark.console.core.entity.FlinkCluster;
import org.apache.streampark.console.core.enums.FlinkAppState;
-import org.apache.streampark.console.core.enums.LaunchState;
import org.apache.streampark.console.core.enums.OptionState;
+import org.apache.streampark.console.core.enums.ReleaseState;
import org.apache.streampark.console.core.enums.StopFrom;
import org.apache.streampark.console.core.metrics.flink.CheckPoints;
import org.apache.streampark.console.core.metrics.flink.JobsOverview;
@@ -378,14 +378,14 @@ public class FlinkRESTAPIWatcher {
*/
if (OptionState.STARTING.equals(optionState)) {
Application latestApp = WATCHING_APPS.get(application.getId());
- LaunchState launchState = latestApp.getLaunchState();
- switch (launchState) {
+ ReleaseState releaseState = latestApp.getReleaseState();
+ switch (releaseState) {
case NEED_RESTART:
case NEED_ROLLBACK:
LambdaUpdateWrapper<Application> updateWrapper =
new LambdaUpdateWrapper<Application>()
.eq(Application::getId, application.getId())
- .set(Application::getLaunch, LaunchState.DONE.get());
+ .set(Application::getRelease, ReleaseState.DONE.get());
applicationService.update(updateWrapper);
break;
default:
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/ProjectBuildTask.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/ProjectBuildTask.java
index 8b673fb5e..2e4d1a3d1 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/ProjectBuildTask.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/ProjectBuildTask.java
@@ -42,17 +42,17 @@ public class ProjectBuildTask extends AbstractLogFileTask {
final Consumer<BuildState> stateUpdateConsumer;
- final Consumer<Logger> notifyLaunchConsumer;
+ final Consumer<Logger> notifyReleaseConsumer;
public ProjectBuildTask(
String logPath,
Project project,
Consumer<BuildState> stateUpdateConsumer,
- Consumer<Logger> notifyLaunchConsumer) {
+ Consumer<Logger> notifyReleaseConsumer) {
super(logPath, true);
this.project = project;
this.stateUpdateConsumer = stateUpdateConsumer;
- this.notifyLaunchConsumer = notifyLaunchConsumer;
+ this.notifyReleaseConsumer = notifyReleaseConsumer;
}
@Override
@@ -73,7 +73,7 @@ public class ProjectBuildTask extends AbstractLogFileTask {
}
stateUpdateConsumer.accept(BuildState.SUCCESSFUL);
this.deploy(project);
- notifyLaunchConsumer.accept(fileLogger);
+ notifyReleaseConsumer.accept(fileLogger);
}
@Override
diff --git a/streampark-console/streampark-console-service/src/main/resources/db/data-h2.sql b/streampark-console/streampark-console-service/src/main/resources/db/data-h2.sql
index 2d4097984..6fb2487fd 100644
--- a/streampark-console/streampark-console-service/src/main/resources/db/data-h2.sql
+++ b/streampark-console/streampark-console-service/src/main/resources/db/data-h2.sql
@@ -68,7 +68,7 @@ insert into `t_menu` values (100021, 100015, 'edit streampark', '/flink/app/edit
insert into `t_menu` values (100022, 100014, 'build', null, null, 'project:build', null, '1', 1, null, now(), now());
insert into `t_menu` values (100023, 100014, 'delete', null, null, 'project:delete', null, '1', 1, null, now(), now());
insert into `t_menu` values (100024, 100015, 'mapping', null, null, 'app:mapping', null, '1', 1, null, now(), now());
-insert into `t_menu` values (100025, 100015, 'launch', null, null, 'app:launch', null, '1', 1, null, now(), now());
+insert into `t_menu` values (100025, 100015, 'release', null, null, 'app:release', null, '1', 1, null, now(), now());
insert into `t_menu` values (100026, 100015, 'start', null, null, 'app:start', null, '1', 1, null, now(), now());
insert into `t_menu` values (100027, 100015, 'clean', null, null, 'app:clean', null, '1', 1, null, now(), now());
insert into `t_menu` values (100028, 100015, 'cancel', null, null, 'app:cancel', null, '1', 1, null, now(), now());
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 e906eed35..0ec3d38c7 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
@@ -81,7 +81,7 @@ create table if not exists `t_flink_app` (
`create_time` datetime not null default current_timestamp comment 'create time',
`modify_time` datetime not null default current_timestamp on update current_timestamp comment 'modify time',
`option_time` datetime default null,
- `launch` tinyint default 1,
+ `release` tinyint default 1,
`build` tinyint default 1,
`start_time` datetime default null,
`end_time` datetime default null,
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 70d19275b..7f98333dc 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
@@ -53,7 +53,7 @@
<result column="cp_failure_action" jdbcType="INTEGER" property="cpFailureAction"/>
<result column="restart_size" jdbcType="INTEGER" property="restartSize"/>
<result column="restart_count" jdbcType="INTEGER" property="restartCount"/>
- <result column="launch" jdbcType="INTEGER" property="launch"/>
+ <result column="release" jdbcType="INTEGER" property="release"/>
<result column="build" jdbcType="BOOLEAN" property="build"/>
<result column="resolve_order" jdbcType="INTEGER" property="resolveOrder"/>
<result column="total_tm" jdbcType="INTEGER" property="totalTM"/>
diff --git a/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/ApplicationServiceTest.java b/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/ApplicationServiceTest.java
index d44591a04..fb370f1ae 100644
--- a/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/ApplicationServiceTest.java
+++ b/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/ApplicationServiceTest.java
@@ -54,7 +54,7 @@ class ApplicationServiceTest {
app.setVersionId(1L);
app.setK8sNamespace("default");
app.setState(0);
- app.setLaunch(2);
+ app.setRelease(2);
app.setBuild(true);
app.setRestartSize(0);
app.setOptionState(0);
@@ -77,7 +77,7 @@ class ApplicationServiceTest {
app.setDrain(false);
app.setAllowNonRestored(false);
- Assertions.assertDoesNotThrow(() -> applicationService.updateLaunch(app));
+ Assertions.assertDoesNotThrow(() -> applicationService.updateRelease(app));
}
@Test
diff --git a/streampark-console/streampark-console-webapp/src/api/flink/app/app.type.ts b/streampark-console/streampark-console-webapp/src/api/flink/app/app.type.ts
index ea5284f78..a56cb4dad 100644
--- a/streampark-console/streampark-console-webapp/src/api/flink/app/app.type.ts
+++ b/streampark-console/streampark-console-webapp/src/api/flink/app/app.type.ts
@@ -57,7 +57,7 @@ export interface AppListRecord {
flinkImage?: string;
k8sNamespace: string;
state: number;
- launch: number;
+ release: number;
build: boolean;
restartSize: number;
restartCount?: number;
diff --git a/streampark-console/streampark-console-webapp/src/components/Table/src/types/table.ts b/streampark-console/streampark-console-webapp/src/components/Table/src/types/table.ts
index 8e9533b47..e0c847071 100644
--- a/streampark-console/streampark-console-webapp/src/components/Table/src/types/table.ts
+++ b/streampark-console/streampark-console-webapp/src/components/Table/src/types/table.ts
@@ -182,7 +182,7 @@ export interface BasicTableProps<T = any> {
fetchSetting?: Partial<FetchSetting>;
// Request the interface now
immediate?: boolean;
- // When the search form is launched, whether to display the table if there is no data
+ // When the search form is released, whether to display the table if there is no data
emptyDataIsShowTable?: boolean;
// Additional request parameters
searchInfo?: Recordable;
diff --git a/streampark-console/streampark-console-webapp/src/enums/flinkEnum.ts b/streampark-console/streampark-console-webapp/src/enums/flinkEnum.ts
index 4ad233682..6a0093b94 100644
--- a/streampark-console/streampark-console-webapp/src/enums/flinkEnum.ts
+++ b/streampark-console/streampark-console-webapp/src/enums/flinkEnum.ts
@@ -43,16 +43,16 @@ export enum ExecModeEnum {
KUBERNETES_APPLICATION = 6,
}
-export enum LaunchStateEnum {
- /** launch failed */
+export enum ReleaseStateEnum {
+ /** release failed */
FAILED = -1,
- /** launch done */
+ /** release done */
DONE = 0,
- /** need relaunch after modify task */
- NEED_LAUNCH = 1,
- /** launching */
- LAUNCHING = 2,
- /** launch complete, need restart */
+ /** need release after modify task */
+ NEED_RELEASE = 1,
+ /** releasing */
+ RELEASING = 2,
+ /** release complete, need restart */
NEED_RESTART = 3,
/** need rollback */
NEED_ROLLBACK = 4,
@@ -66,7 +66,7 @@ export enum OptionStateEnum {
/** Application which is currently action: none. */
NONE = 0,
/** Application which is currently action: deploying. */
- LAUNCHING = 1,
+ RELEASING = 1,
/** Application which is currently action: cancelling. */
CANCELLING = 2,
/** Application which is currently action: starting. */
diff --git a/streampark-console/streampark-console-webapp/src/locales/lang/en/flink/app.ts b/streampark-console/streampark-console-webapp/src/locales/lang/en/flink/app.ts
index 8f909eaa1..99688b9f9 100644
--- a/streampark-console/streampark-console-webapp/src/locales/lang/en/flink/app.ts
+++ b/streampark-console/streampark-console-webapp/src/locales/lang/en/flink/app.ts
@@ -24,7 +24,7 @@ export default {
duration: 'Duration',
modifiedTime: 'Modified Time',
runStatus: 'Run Status',
- launchBuild: 'Launch Status',
+ releaseBuild: 'Release Status',
jobType: 'Job Type',
developmentMode: 'Development Mode',
executionMode: 'Execution Mode',
@@ -65,11 +65,11 @@ export default {
status: 'Run Status',
startTime: 'Start Time',
endTime: 'End Time',
- launch: {
- launchTitle: 'The current launch of the application is in progress.',
- launchDesc: 'are you sure you want to force another build',
- launchFail: 'launch application failed,',
- launching: 'Current Application is launching',
+ release: {
+ releaseTitle: 'The current release of the application is in progress.',
+ releaseDesc: 'are you sure you want to force another build',
+ releaseFail: 'release application failed,',
+ releasing: 'Current Application is releasing',
},
detail: {
detailTitle: 'Application Info',
@@ -106,7 +106,7 @@ export default {
},
},
view: {
- buildTitle: 'Application Launching Progress',
+ buildTitle: 'Application releasing Progress',
stepTitle: 'Steps Detail',
errorLog: 'Error Log',
errorSummary: 'Error Summary',
@@ -147,8 +147,8 @@ export default {
},
operation: {
edit: 'Edit Application',
- launch: 'Launch Application',
- launchDetail: 'Launching Progress Detail',
+ release: 'Release Application',
+ releaseDetail: 'Releasing Progress Detail',
start: 'Start Application',
cancel: 'Cancel Application',
savepoint: 'Trigger Savepoint',
diff --git a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/flink/app.ts b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/flink/app.ts
index e30597018..303fb7415 100644
--- a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/flink/app.ts
+++ b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/flink/app.ts
@@ -24,7 +24,7 @@ export default {
duration: '运行时长',
modifiedTime: '修改时间',
runStatus: '运行状态',
- launchBuild: '发布状态',
+ releaseBuild: '发布状态',
jobType: '作业类型',
developmentMode: '作业模式',
executionMode: '执行模式',
@@ -64,11 +64,11 @@ export default {
status: '运行状态',
startTime: '启动时间',
endTime: '结束时间',
- launch: {
- launchTitle: '该应用程序的当前启动正在进行中.',
- launchDesc: '您确定要强制进行另一次构建吗',
- launchFail: '发布作业失败',
- launching: '当前作业正在发布中',
+ release: {
+ releaseTitle: '该应用程序的当前启动正在进行中.',
+ releaseDesc: '您确定要强制进行另一次构建吗',
+ releaseFail: '发布作业失败',
+ releasing: '当前作业正在发布中',
},
detail: {
detailTitle: '作业详情',
@@ -145,8 +145,8 @@ export default {
},
operation: {
edit: '编辑作业',
- launch: '发布作业',
- launchDetail: '发布详情',
+ release: '发布作业',
+ releaseDetail: '发布详情',
start: '启动作业',
cancel: '取消作业',
savepoint: '触发 Savepoint',
diff --git a/streampark-console/streampark-console-webapp/src/views/flink/app/View.vue b/streampark-console/streampark-console-webapp/src/views/flink/app/View.vue
index 858e7824c..4f6eb97d8 100644
--- a/streampark-console/streampark-console-webapp/src/views/flink/app/View.vue
+++ b/streampark-console/streampark-console-webapp/src/views/flink/app/View.vue
@@ -23,7 +23,7 @@
import { defineComponent, nextTick, ref, unref, onUnmounted, onMounted } from 'vue';
import { useAppTableAction } from './hooks/useAppTableAction';
import { useI18n } from '/@/hooks/web/useI18n';
- import { AppStateEnum, JobTypeEnum, OptionStateEnum, LaunchStateEnum } from '/@/enums/flinkEnum';
+ import { AppStateEnum, JobTypeEnum, OptionStateEnum, ReleaseStateEnum } from '/@/enums/flinkEnum';
import { useTimeoutFn } from '@vueuse/core';
import { Tooltip, Badge, Divider, Tag } from 'ant-design-vue';
import { fetchAppRecord } from '/@/api/flink/app/app';
@@ -31,7 +31,7 @@
import { PageWrapper } from '/@/components/Page';
import { BasicTable, TableAction } from '/@/components/Table';
import { AppListRecord } from '/@/api/flink/app/app.type';
- import { getAppColumns, launchTitleMap } from './data';
+ import { getAppColumns, releaseTitleMap } from './data';
import { handleView } from './utils';
import { useDrawer } from '/@/components/Drawer';
import { useModal } from '/@/components/Modal';
@@ -48,7 +48,7 @@
const optionApps = {
starting: new Map(),
stopping: new Map(),
- launch: new Map(),
+ release: new Map(),
savepointing: new Map(),
};
@@ -101,9 +101,9 @@
optionApps.stopping.delete(x.id);
}
}
- if (optionApps.launch.get(x.id)) {
- if (timestamp - optionApps.launch.get(x.id) > 2000) {
- optionApps.launch.delete(x.id);
+ if (optionApps.release.get(x.id)) {
+ if (timestamp - optionApps.release.get(x.id) > 2000) {
+ optionApps.release.delete(x.id);
}
}
if (optionApps.savepointing.get(x.id)) {
@@ -155,7 +155,7 @@
/* Update options data */
function handleOptionApp(data: {
- type: 'starting' | 'stopping' | 'launch' | 'savepointing';
+ type: 'starting' | 'stopping' | 'release' | 'savepointing';
key: any;
value: any;
}) {
@@ -213,13 +213,13 @@
<template v-if="record['jobType'] === JobTypeEnum.JAR">
<Badge
- v-if="record.launch == LaunchStateEnum.NEED_CHECK"
+ v-if="record.release == ReleaseStateEnum.NEED_CHECK"
class="build-badge"
count="NEW"
:title="t('flink.app.view.recheck')"
/>
<Badge
- v-else-if="record.launch >= LaunchStateEnum.LAUNCHING"
+ v-else-if="record.release >= ReleaseStateEnum.RELEASING"
class="build-badge"
count="NEW"
:title="t('flink.app.view.changed')"
@@ -243,8 +243,8 @@
<template v-if="column.dataIndex === 'state'">
<State option="state" :data="record" />
</template>
- <template v-if="column.dataIndex === 'launch'">
- <State option="launch" :title="launchTitleMap[record.launch] || ''" :data="record" />
+ <template v-if="column.dataIndex === 'release'">
+ <State option="release" :title="releaseTitleMap[record.release] || ''" :data="record" />
<Divider type="vertical" style="margin: 0 4px" v-if="record.buildStatus" />
<State
option="build"
diff --git a/streampark-console/streampark-console-webapp/src/views/flink/app/components/State.tsx b/streampark-console/streampark-console-webapp/src/views/flink/app/components/State.tsx
index 7bdb9a288..202c7986b 100644
--- a/streampark-console/streampark-console-webapp/src/views/flink/app/components/State.tsx
+++ b/streampark-console/streampark-console-webapp/src/views/flink/app/components/State.tsx
@@ -18,7 +18,7 @@
import { defineComponent, toRefs, unref } from 'vue';
import { Tag, Tooltip } from 'ant-design-vue';
import './State.less';
-import { AppStateEnum, LaunchStateEnum, OptionStateEnum } from '/@/enums/flinkEnum';
+import { AppStateEnum, ReleaseStateEnum, OptionStateEnum } from '/@/enums/flinkEnum';
/* state map*/
const stateMap = {
@@ -74,9 +74,9 @@ const stateMap = {
};
/* option state map*/
const optionStateMap = {
- [OptionStateEnum.LAUNCHING]: {
+ [OptionStateEnum.RELEASING]: {
color: '#1ABBDC',
- title: 'LAUNCHING',
+ title: 'RELEASING',
class: 'status-processing-deploying',
},
[OptionStateEnum.CANCELLING]: {
@@ -96,19 +96,19 @@ const optionStateMap = {
},
};
-/* launch state map*/
-const launchStateMap = {
- [LaunchStateEnum.DONE]: { color: '#52c41a', title: 'DONE' },
- [LaunchStateEnum.NEED_LAUNCH]: { color: '#fa8c16', title: 'WAITING' },
- [LaunchStateEnum.LAUNCHING]: {
+/* release state map*/
+const releaseStateMap = {
+ [ReleaseStateEnum.DONE]: { color: '#52c41a', title: 'DONE' },
+ [ReleaseStateEnum.NEED_RELEASE]: { color: '#fa8c16', title: 'WAITING' },
+ [ReleaseStateEnum.RELEASING]: {
color: '#52c41a',
- title: 'LAUNCHING',
+ title: 'RELEASING',
class: 'status-processing-deploying',
},
- [LaunchStateEnum.NEED_RESTART]: { color: '#fa8c16', title: 'PENDING' },
- [LaunchStateEnum.NEED_ROLLBACK]: { color: '#fa8c16', title: 'WAITING' },
+ [ReleaseStateEnum.NEED_RESTART]: { color: '#fa8c16', title: 'PENDING' },
+ [ReleaseStateEnum.NEED_ROLLBACK]: { color: '#fa8c16', title: 'WAITING' },
};
-launchStateMap[-1] = { color: '#f5222d', title: 'FAILED' };
+releaseStateMap[-1] = { color: '#f5222d', title: 'FAILED' };
/* build state map*/
const buildStatusMap = {
@@ -128,7 +128,7 @@ const overviewMap = {
canceling: { color: '#faad14', title: 'CANCELING' },
created: { color: '#2f54eb', title: 'CREATED' },
deploying: { color: '#eb2f96', title: 'RECONCILING' },
- reconciling: { color: '#13c2c2', title: 'LAUNCHING' },
+ reconciling: { color: '#13c2c2', title: 'RELEASING' },
scheduled: { color: '#722ed1', title: 'SCHEDULED' },
};
@@ -202,8 +202,8 @@ export default defineComponent({
return <span>{renderState()}</span>;
}
- if (unref(option) === 'launch') {
- return <span class="app_state">{renderTag(launchStateMap, unref(data).launch)}</span>;
+ if (unref(option) === 'release') {
+ return <span class="app_state">{renderTag(releaseStateMap, unref(data).release)}</span>;
}
if (unref(option) === 'build') {
diff --git a/streampark-console/streampark-console-webapp/src/views/flink/app/data/index.ts b/streampark-console/streampark-console-webapp/src/views/flink/app/data/index.ts
index 5a52c0a64..e8f0b7142 100644
--- a/streampark-console/streampark-console-webapp/src/views/flink/app/data/index.ts
+++ b/streampark-console/streampark-console-webapp/src/views/flink/app/data/index.ts
@@ -20,7 +20,7 @@ import {
AppStateEnum,
ExecModeEnum,
FailoverStrategyEnum,
- LaunchStateEnum,
+ ReleaseStateEnum,
} from '/@/enums/flinkEnum';
import { useI18n } from '/@/hooks/web/useI18n';
const { t } = useI18n();
@@ -62,7 +62,7 @@ export const getAppColumns = (): BasicColumn[] => [
{ text: t('flink.app.runStatusOptions.terminated'), value: String(AppStateEnum.TERMINATED) },
],
},
- { title: t('flink.app.launchBuild'), dataIndex: 'launch', width: 220 },
+ { title: t('flink.app.releaseBuild'), dataIndex: 'release', width: 220 },
];
/* Get diff editor configuration */
@@ -131,10 +131,10 @@ export const cpTriggerAction = [
{ label: 'restart', value: FailoverStrategyEnum.RESTART },
];
-export const launchTitleMap = {
- [LaunchStateEnum.FAILED]: 'launch failed',
- [LaunchStateEnum.NEED_LAUNCH]: 'current job need relaunch',
- [LaunchStateEnum.LAUNCHING]: 'launching',
- [LaunchStateEnum.NEED_RESTART]: 'launch finished,need restart',
- [LaunchStateEnum.NEED_ROLLBACK]: 'application is rollbacked,need relaunch',
+export const releaseTitleMap = {
+ [ReleaseStateEnum.FAILED]: 'release failed',
+ [ReleaseStateEnum.NEED_RELEASE]: 'current job need release',
+ [ReleaseStateEnum.RELEASING]: 'releasing',
+ [ReleaseStateEnum.NEED_RESTART]: 'release finished,need restart',
+ [ReleaseStateEnum.NEED_ROLLBACK]: 'application is rollbacked,need release',
};
diff --git a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useApp.tsx b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useApp.tsx
index 67f3a69ce..4c0d3371e 100644
--- a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useApp.tsx
+++ b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useApp.tsx
@@ -35,29 +35,29 @@ export const useFlinkApplication = (openStartModal: Fn) => {
const optionApps = {
starting: new Map(),
stopping: new Map(),
- launch: new Map(),
+ release: new Map(),
savepointing: new Map(),
};
/* check */
- function handleCheckLaunchApp(app: Recordable) {
+ function handleCheckReleaseApp(app: Recordable) {
if (app['appControl']['allowBuild'] === true) {
- handleLaunchApp(app, false);
+ handleReleaseApp(app, false);
} else {
createWarningModal({
title: 'WARNING',
content: `
- <p class="pt-10px">${t('flink.app.launch.launchTitle')}</p>
- <p>${t('flink.app.launch.launchDesc')}</p>
+ <p class="pt-10px">${t('flink.app.release.releaseTitle')}</p>
+ <p>${t('flink.app.release.releaseDesc')}</p>
`,
okType: 'danger',
- onOk: () => handleLaunchApp(app, true),
+ onOk: () => handleReleaseApp(app, true),
});
}
}
- /* Launch App */
- async function handleLaunchApp(app: Recordable, force: boolean) {
+ /* Release App */
+ async function handleReleaseApp(app: Recordable, force: boolean) {
const { data } = await fetchBuild({
appId: app.id,
forceBuild: force,
@@ -65,13 +65,13 @@ export const useFlinkApplication = (openStartModal: Fn) => {
if (!data.data) {
let message = data.message || '';
if (!message) {
- message = t('flink.app.launch.launchFail') + message.replaceAll(/\[StreamPark]/g, '');
+ message = t('flink.app.release.releaseFail') + message.replaceAll(/\[StreamPark]/g, '');
}
Swal.fire('Failed', message, 'error');
} else {
Swal.fire({
icon: 'success',
- title: t('flink.app.launch.launching'),
+ title: t('flink.app.release.releasing'),
showConfirmButton: false,
timer: 2000,
});
@@ -177,7 +177,7 @@ export const useFlinkApplication = (openStartModal: Fn) => {
[AppStateEnum.CANCELLING]: 'cancelling',
};
const optionStateMap = {
- [OptionStateEnum.LAUNCHING]: 'launching',
+ [OptionStateEnum.RELEASING]: 'releasing',
[OptionStateEnum.CANCELLING]: 'cancelling',
[OptionStateEnum.STARTING]: 'starting',
[OptionStateEnum.SAVEPOINTING]: 'savePointing',
@@ -380,7 +380,7 @@ export const useFlinkApplication = (openStartModal: Fn) => {
});
return {
- handleCheckLaunchApp,
+ handleCheckReleaseApp,
handleAppCheckStart,
handleCanStop,
handleForcedStop,
diff --git a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useAppTableAction.ts b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useAppTableAction.ts
index 2df2056a4..feeb602e6 100644
--- a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useAppTableAction.ts
+++ b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useAppTableAction.ts
@@ -26,7 +26,7 @@ import { useMessage } from '/@/hooks/web/useMessage';
import {
AppTypeEnum,
ExecModeEnum,
- LaunchStateEnum,
+ ReleaseStateEnum,
OptionStateEnum,
AppStateEnum,
JobTypeEnum,
@@ -52,7 +52,7 @@ export const useAppTableAction = (
const { createMessage } = useMessage();
const { hasPermission } = usePermission();
const {
- handleCheckLaunchApp,
+ handleCheckReleaseApp,
handleAppCheckStart,
handleCanStop,
handleForcedStop,
@@ -71,23 +71,23 @@ export const useAppTableAction = (
onClick: handleEdit.bind(null, record, currentPageNo),
},
{
- tooltip: { title: t('flink.app.operation.launch') },
+ tooltip: { title: t('flink.app.operation.release') },
ifShow:
[
- LaunchStateEnum.FAILED,
- LaunchStateEnum.NEED_LAUNCH,
- LaunchStateEnum.NEED_ROLLBACK,
- ].includes(record.launch) && record['optionState'] == OptionStateEnum.NONE,
- auth: 'app:launch',
+ ReleaseStateEnum.FAILED,
+ ReleaseStateEnum.NEED_RELEASE,
+ ReleaseStateEnum.NEED_ROLLBACK,
+ ].includes(record.release) && record['optionState'] == OptionStateEnum.NONE,
+ auth: 'app:release',
icon: 'ant-design:cloud-upload-outlined',
- onClick: handleCheckLaunchApp.bind(null, record),
+ onClick: handleCheckReleaseApp.bind(null, record),
},
{
- tooltip: { title: t('flink.app.operation.launchDetail') },
+ tooltip: { title: t('flink.app.operation.releaseDetail') },
ifShow:
- [LaunchStateEnum.FAILED, LaunchStateEnum.LAUNCHING].includes(record.launch) ||
- record['optionState'] == OptionStateEnum.LAUNCHING,
- auth: 'app:launch',
+ [ReleaseStateEnum.FAILED, ReleaseStateEnum.RELEASING].includes(record.release) ||
+ record['optionState'] == OptionStateEnum.RELEASING,
+ auth: 'app:release',
icon: 'ant-design:container-outlined',
onClick: () => openBuildDrawer(true, { appId: record.id }),
},
diff --git a/streampark-console/streampark-console-webapp/src/views/flink/app/utils/index.ts b/streampark-console/streampark-console-webapp/src/views/flink/app/utils/index.ts
index 647d2eb39..e1b108b06 100644
--- a/streampark-console/streampark-console-webapp/src/views/flink/app/utils/index.ts
+++ b/streampark-console/streampark-console-webapp/src/views/flink/app/utils/index.ts
@@ -22,7 +22,7 @@ import {
AppStateEnum,
ConfigTypeEnum,
ExecModeEnum,
- LaunchStateEnum,
+ ReleaseStateEnum,
OptionStateEnum,
PipelineStepEnum,
} from '/@/enums/flinkEnum';
@@ -144,20 +144,20 @@ export function handleIsStart(app: Recordable, optionApps: Recordable) {
/**
* Deployment failed FAILED(-1),
* Done DONE(0),
- * After the task is modified, NEED_LAUNCH(1) needs to be reissued,
- * Online LAUNCHING(2),
+ * After the task is modified, NEED_RELEASE(1) needs to be reissued,
+ * Online releasing(2),
* After going online, you need to restart NEED_RESTART(3),
* Need to rollback NEED_ROLLBACK(4),
* When the project changes, the task needs to be checked (whether the jar needs to be re-selected) NEED_CHECK(5),
* The posted task has been revoked REVOKED(10);
*/
- const launch = [LaunchStateEnum.DONE, LaunchStateEnum.NEED_RESTART].includes(app.launch);
+ const release = [ReleaseStateEnum.DONE, ReleaseStateEnum.NEED_RESTART].includes(app.release);
const optionState =
!optionApps.starting.get(app.id) || app['optionState'] === OptionStateEnum.NONE || false;
- return status && launch && optionState;
+ return status && release && optionState;
}
export function handleYarnQueue(values: Recordable) {