This is an automated email from the ASF dual-hosted git repository. benjobs pushed a commit to branch restore-mode in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
commit 4774f2521f7f36de045c6a3ae50fbbb9b714e367 Author: benjobs <[email protected]> AuthorDate: Sun Aug 6 16:56:50 2023 +0800 [Improve] flink job restore mode option improvement --- .../streampark/console/core/entity/FlinkEnv.java | 31 +++++++++++----- .../src/api/flink/setting/flinkEnv.ts | 9 ++++- .../src/design/public.less | 4 +-- .../src/locales/lang/en/flink/app.ts | 2 ++ .../src/locales/lang/zh-CN/flink/app.ts | 1 + .../components/AppView/StartApplicationModal.vue | 42 ++++++---------------- .../components/AppView/StopApplicationModal.vue | 7 ++-- .../flink/app/hooks/useCreateAndEditSchema.ts | 8 ++--- .../src/views/flink/app/hooks/useFlinkRender.tsx | 40 +++++++++++++++++++-- .../flink/resource/components/ResourceDrawer.vue | 8 ----- .../flink/variable/components/VariableDrawer.vue | 10 +----- .../views/setting/Alarm/components/AlertModal.vue | 2 +- .../setting/ExternalLink/components/Modal.vue | 2 +- .../setting/FlinkCluster/useClusterSetting.ts | 8 ++--- .../views/setting/FlinkHome/components/Modal.vue | 11 ++---- .../src/views/setting/FlinkHome/index.vue | 4 +-- streampark-flink/pom.xml | 10 +++++- 17 files changed, 112 insertions(+), 87 deletions(-) diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkEnv.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkEnv.java index 60db28315..f5d589350 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkEnv.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkEnv.java @@ -17,6 +17,7 @@ package org.apache.streampark.console.core.entity; +import org.apache.commons.lang3.StringUtils; import org.apache.streampark.common.conf.FlinkVersion; import org.apache.streampark.common.util.DeflaterUtils; import org.apache.streampark.common.util.PropertiesUtils; @@ -61,6 +62,12 @@ public class FlinkEnv implements Serializable { private transient FlinkVersion flinkVersion; + private transient String versionOfLarge; + + private transient String versionOfMiddle; + + private transient String versionOfLast; + private transient String streamParkScalaVersion = scala.util.Properties.versionNumberString(); public void doSetFlinkConf() throws ApiDetailException { @@ -101,23 +108,31 @@ public class FlinkEnv implements Serializable { this.flinkConf = DeflaterUtils.unzipString(this.flinkConf); } - @JsonIgnore public String getLargeVersion() { - return this.version.substring(0, this.version.lastIndexOf(".")); + if (StringUtils.isNotEmpty(this.version)) { + return this.version.substring(0, this.version.lastIndexOf(".")); + } + return null; } - @JsonIgnore public String getVersionOfFirst() { - return this.version.split("\\.")[0]; + if (StringUtils.isNotEmpty(this.version)) { + return this.version.split("\\.")[0]; + } + return null; } - @JsonIgnore public String getVersionOfMiddle() { - return this.version.split("\\.")[1]; + if (StringUtils.isNotEmpty(this.version)) { + return this.version.split("\\.")[1]; + } + return null; } - @JsonIgnore public String getVersionOfLast() { - return this.version.split("\\.")[2]; + if (StringUtils.isNotEmpty(this.version)) { + return this.version.split("\\.")[2]; + } + return null; } } diff --git a/streampark-console/streampark-console-webapp/src/api/flink/setting/flinkEnv.ts b/streampark-console/streampark-console-webapp/src/api/flink/setting/flinkEnv.ts index 7693cc75d..49d9893d2 100644 --- a/streampark-console/streampark-console-webapp/src/api/flink/setting/flinkEnv.ts +++ b/streampark-console/streampark-console-webapp/src/api/flink/setting/flinkEnv.ts @@ -34,12 +34,19 @@ enum FLINK_API { * flink environment data * @returns Promise<FlinkEnv[]> */ -export function fetchFlinkEnv() { +export function fetchListFlinkEnv() { return defHttp.post<FlinkEnv[]>({ url: FLINK_API.LIST, }); } +export function fetchFlinkEnv(id: string) { + return defHttp.post<FlinkEnv>({ + url: FLINK_API.GET, + data: { id: id }, + }); +} + /** * Set the default * @param {String} id diff --git a/streampark-console/streampark-console-webapp/src/design/public.less b/streampark-console/streampark-console-webapp/src/design/public.less index af007f3db..3975f9c04 100644 --- a/streampark-console/streampark-console-webapp/src/design/public.less +++ b/streampark-console/streampark-console-webapp/src/design/public.less @@ -66,7 +66,7 @@ } } -.extra .conf-switch { +.tip-info { + margin-top: 10px; color: darkgrey; - margin-left: 5px; } 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 70236a86a..3dfd8ade7 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 @@ -69,6 +69,8 @@ export default { status: 'Run Status', startTime: 'Start Time', endTime: 'End Time', + restoreModeTip: + 'restore mode is supported since flink 1.15, usually, you do not have to set this parameter', release: { releaseTitle: 'The current release of the application is in progress.', releaseDesc: 'are you sure you want to force another build', 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 92e788091..d1b94b5b9 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 @@ -68,6 +68,7 @@ export default { status: '运行状态', startTime: '启动时间', endTime: '结束时间', + restoreModeTip: 'flink 1.15开始支持restore模式，一般情况下不用设置该参数', release: { releaseTitle: '该应用程序的当前启动正在进行中.', releaseDesc: '您确定要强制进行另一次构建吗', diff --git a/streampark-console/streampark-console-webapp/src/views/flink/app/components/AppView/StartApplicationModal.vue b/streampark-console/streampark-console-webapp/src/views/flink/app/components/AppView/StartApplicationModal.vue index fec877c32..32bb55830 100644 --- a/streampark-console/streampark-console-webapp/src/views/flink/app/components/AppView/StartApplicationModal.vue +++ b/streampark-console/streampark-console-webapp/src/views/flink/app/components/AppView/StartApplicationModal.vue @@ -24,7 +24,7 @@ }); </script> <script setup lang="ts" name="StartApplicationModal"> - import { h, onMounted, ref, unref } from 'vue'; + import { h } from 'vue'; import { Select, Input, Tag } from 'ant-design-vue'; import { BasicForm, useForm } from '/@/components/Form'; import { SvgIcon, Icon } from '/@/components/Icon'; @@ -34,7 +34,7 @@ import { fetchStart } from '/@/api/flink/app/app'; import { RestoreModeEnum } from '/@/enums/flinkEnum'; import { fetchFlinkEnv } from '/@/api/flink/setting/flinkEnv'; - import { FlinkEnv } from '/@/api/flink/setting/types/flinkEnv.type'; + import { renderFlinkAppRestoreMode } from '/@/views/flink/app/hooks/useFlinkRender'; const SelectOption = Select.Option; @@ -45,8 +45,6 @@ const emits = defineEmits(['register', 'updateOption']); const receiveData = reactive<Recordable>({}); - const flinkEnvs = ref<FlinkEnv[]>([]); - const [registerModal, { closeModal }] = useModalInner((data) => { if (data) { Object.assign(receiveData, data); @@ -73,7 +71,7 @@ afterItem: () => h( 'span', - { class: 'conf-switch' }, + { class: 'tip-info' }, 'restore the application from savepoint or latest checkpoint', ), }, @@ -87,7 +85,7 @@ afterItem: () => h( 'span', - { class: 'conf-switch' }, + { class: 'tip-info' }, 'restore the application from savepoint or latest checkpoint', ), slot: 'savepoint', @@ -99,21 +97,8 @@ label: 'restore mode', component: 'Select', defaultValue: RestoreModeEnum.NO_CLAIM, - componentProps: { - options: [ - { label: 'CLAIM', value: RestoreModeEnum.CLAIM }, - { label: 'NO_CLAIM', value: RestoreModeEnum.NO_CLAIM }, - { label: 'LEGACY', value: RestoreModeEnum.LEGACY }, - ], - }, - afterItem: () => - h( - 'span', - { class: 'conf-switch' }, - 'restore mode is supported since flink 1.15, usually, you do not have to set this parameter', - ), - ifShow: ({ values }) => - values.startSavePointed && checkFlinkVersion(receiveData.application.versionId), + render: (renderCallbackParams) => renderFlinkAppRestoreMode(renderCallbackParams), + ifShow: ({ values }) => values.startSavePointed && checkFlinkVersion(), }, { field: 'allowNonRestoredState', @@ -124,7 +109,7 @@ unCheckedChildren: 'OFF', }, afterItem: () => - h('span', { class: 'conf-switch' }, 'ignore savepoint then cannot be restored'), + h('span', { class: 'tip-info' }, 'ignore savepoint then cannot be restored'), defaultValue: false, ifShow: ({ values }) => values.startSavePointed, }, @@ -191,16 +176,11 @@ } } - function checkFlinkVersion(versionId: string) { - let env = unref(flinkEnvs).filter((env) => env.id == versionId)[0]; - return parseInt(env.version.split('.')[1]) >= 15; + async function checkFlinkVersion() { + const versionId = receiveData.application.versionId; + const flinkVersion = await fetchFlinkEnv(versionId); + return parseInt(flinkVersion.versionOfMiddle) >= 15; } - - onMounted(() => { - fetchFlinkEnv().then((res) => { - flinkEnvs.value = res; - }); - }); </script> <template> <BasicModal diff --git a/streampark-console/streampark-console-webapp/src/views/flink/app/components/AppView/StopApplicationModal.vue b/streampark-console/streampark-console-webapp/src/views/flink/app/components/AppView/StopApplicationModal.vue index 8e2fbde87..f8da5b674 100644 --- a/streampark-console/streampark-console-webapp/src/views/flink/app/components/AppView/StopApplicationModal.vue +++ b/streampark-console/streampark-console-webapp/src/views/flink/app/components/AppView/StopApplicationModal.vue @@ -54,8 +54,7 @@ unCheckedChildren: 'OFF', }, defaultValue: true, - afterItem: () => - h('span', { class: 'conf-switch' }, 'trigger savePoint before taking cancel'), + afterItem: () => h('span', { class: 'tip-info' }, 'trigger savePoint before taking cancel'), }, { field: 'customSavepoint', @@ -65,7 +64,7 @@ placeholder: 'Entry the custom savepoint path', allowClear: true, }, - afterItem: () => h('span', { class: 'conf-switch' }, 'cancel job with savepoint path'), + afterItem: () => h('span', { class: 'tip-info' }, 'cancel job with savepoint path'), ifShow: ({ values }) => !!values.stopSavePointed, }, { @@ -77,7 +76,7 @@ unCheckedChildren: 'OFF', }, defaultValue: false, - afterItem: () => h('span', { class: 'conf-switch' }, 'Send max watermark before stopped'), + afterItem: () => h('span', { class: 'tip-info' }, 'Send max watermark before stopped'), }, ], colon: true, diff --git a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useCreateAndEditSchema.ts b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useCreateAndEditSchema.ts index 4cf147ed4..597e1c890 100644 --- a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useCreateAndEditSchema.ts +++ b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useCreateAndEditSchema.ts @@ -46,7 +46,7 @@ import { import { fetchSelect } from '/@/api/flink/project'; import { fetchAlertSetting } from '/@/api/flink/setting/alert'; import { fetchFlinkCluster } from '/@/api/flink/setting/flinkCluster'; -import { fetchFlinkEnv } from '/@/api/flink/setting/flinkEnv'; +import { fetchFlinkEnv, fetchListFlinkEnv } from '/@/api/flink/setting/flinkEnv'; import { FlinkEnv } from '/@/api/flink/setting/types/flinkEnv.type'; import { AlertSetting } from '/@/api/flink/setting/types/alert.type'; import { FlinkCluster } from '/@/api/flink/setting/types/flinkCluster.type'; @@ -167,9 +167,9 @@ export const useCreateAndEditSchema = ( ]; }); - function handleFlinkVersion(id: number | string) { + async function handleFlinkVersion(id: number | string) { if (!dependencyRef) return; - scalaVersion = unref(flinkEnvs)?.find((v) => v.id === id)?.scalaVersion || ''; + scalaVersion = await fetchFlinkEnv(id)?.scalaVersion; checkPomScalaVersion(); } @@ -617,7 +617,7 @@ export const useCreateAndEditSchema = ( }); //get flinkEnv - fetchFlinkEnv().then((res) => { + fetchListFlinkEnv().then((res) => { flinkEnvs.value = res; }); //get flinkCluster diff --git a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useFlinkRender.tsx b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useFlinkRender.tsx index f47835368..0158d0f67 100644 --- a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useFlinkRender.tsx +++ b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useFlinkRender.tsx @@ -39,7 +39,7 @@ import { handleConfTemplate } from '/@/api/flink/config'; import { decodeByBase64 } from '/@/utils/cipher'; import { useMessage } from '/@/hooks/web/useMessage'; import { SelectValue } from 'ant-design-vue/lib/select'; -import { CandidateTypeEnum, FailoverStrategyEnum } from '/@/enums/flinkEnum'; +import { CandidateTypeEnum, FailoverStrategyEnum, RestoreModeEnum } from '/@/enums/flinkEnum'; import { useI18n } from '/@/hooks/web/useI18n'; import { fetchYarnQueueList } from '/@/api/flink/setting/yarnQueue'; import { ApiSelect } from '/@/components/Form'; @@ -227,7 +227,7 @@ export const renderOptionsItems = ( rules={[{ validator: conf.validator }]} /> )} - {conf.type === 'switch' && <span class="conf-switch">({conf.placeholder})</span>} + {conf.type === 'switch' && <span class="tip-info">({conf.placeholder})</span>} <p class="conf-desc"> {descriptionFilter(conf)} </p> </Form.Item> ); @@ -610,3 +610,39 @@ export const renderStreamParkJarApp = ({ model, resources }) => { </div> ); }; + +export const renderFlinkAppRestoreMode = ({ model, field }: RenderCallbackParams) => { + return ( + <div> + <Select + value={model[field]} + onChange={(value) => (model[field] = value)} + placeholder="Please select restore mode" + > + <Select.Option key="claim" value={RestoreModeEnum.CLAIM}> + <Tag color="#13c2c2" style=";margin-left: 5px;" size="small"> + CLAIM + </Tag> + </Select.Option> + <Select.Option key="no_claim" value={RestoreModeEnum.NO_CLAIM}> + <Tag color="#2db7f5" style=";margin-left: 5px;" size="small"> + NO_CLAIM + </Tag> + </Select.Option> + <Select.Option key="legacy" value={RestoreModeEnum.LEGACY}> + <Tag color="#8E50FF" style=";margin-left: 5px;" size="small"> + LEGACY + </Tag> + </Select.Option> + </Select> + <p class="mt-10px"> + <span class="note-info"> + <Tag color="#2db7f5" class="tag-note" size="small"> + {t('flink.app.noteInfo.note')} + </Tag> + <span class="tip-info">{t('flink.app.restoreModeTip')}</span> + </span> + </p> + </div> + ); +}; diff --git a/streampark-console/streampark-console-webapp/src/views/flink/resource/components/ResourceDrawer.vue b/streampark-console/streampark-console-webapp/src/views/flink/resource/components/ResourceDrawer.vue index ba9c1e61c..6d2231528 100644 --- a/streampark-console/streampark-console-webapp/src/views/flink/resource/components/ResourceDrawer.vue +++ b/streampark-console/streampark-console-webapp/src/views/flink/resource/components/ResourceDrawer.vue @@ -283,11 +283,3 @@ } } </script> - -<style lang="less"> - .conf-switch { - display: inline-block; - margin-top: 10px; - color: darkgrey; - } -</style> diff --git a/streampark-console/streampark-console-webapp/src/views/flink/variable/components/VariableDrawer.vue b/streampark-console/streampark-console-webapp/src/views/flink/variable/components/VariableDrawer.vue index 1a90ffd80..c2da41ed0 100644 --- a/streampark-console/streampark-console-webapp/src/views/flink/variable/components/VariableDrawer.vue +++ b/streampark-console/streampark-console-webapp/src/views/flink/variable/components/VariableDrawer.vue @@ -132,7 +132,7 @@ }, defaultValue: false, afterItem: () => - h('span', { class: 'conf-switch' }, t('flink.variable.form.desensitizationDesc')), + h('span', { class: 'tip-info' }, t('flink.variable.form.desensitizationDesc')), }, ]; }); @@ -194,11 +194,3 @@ } } </script> - -<style lang="less"> - .conf-switch { - display: inline-block; - margin-top: 10px; - color: darkgrey; - } -</style> diff --git a/streampark-console/streampark-console-webapp/src/views/setting/Alarm/components/AlertModal.vue b/streampark-console/streampark-console-webapp/src/views/setting/Alarm/components/AlertModal.vue index 1a4a56e86..422f8df56 100644 --- a/streampark-console/streampark-console-webapp/src/views/setting/Alarm/components/AlertModal.vue +++ b/streampark-console/streampark-console-webapp/src/views/setting/Alarm/components/AlertModal.vue @@ -58,7 +58,7 @@ allowClear: true, placeholder: t('setting.alarm.alertNamePlaceHolder'), }, - afterItem: () => h('span', { class: 'conf-switch' }, t('setting.alarm.alertNameTips')), + afterItem: () => h('span', { class: 'tip-info' }, t('setting.alarm.alertNameTips')), dynamicRules: () => { return [ { diff --git a/streampark-console/streampark-console-webapp/src/views/setting/ExternalLink/components/Modal.vue b/streampark-console/streampark-console-webapp/src/views/setting/ExternalLink/components/Modal.vue index 377f18cae..31acb9877 100644 --- a/streampark-console/streampark-console-webapp/src/views/setting/ExternalLink/components/Modal.vue +++ b/streampark-console/streampark-console-webapp/src/views/setting/ExternalLink/components/Modal.vue @@ -100,7 +100,7 @@ afterItem: () => h( 'span', - { class: 'conf-switch' }, + { class: 'tip-info' }, 'Supported variables: {job_id}, {yarn_id}, {job_name},Example: https://grafana/flink-monitoring?var-JobId=var-JobId={job_id}', ), rules: [ diff --git a/streampark-console/streampark-console-webapp/src/views/setting/FlinkCluster/useClusterSetting.ts b/streampark-console/streampark-console-webapp/src/views/setting/FlinkCluster/useClusterSetting.ts index 04563a701..723fbd6d1 100644 --- a/streampark-console/streampark-console-webapp/src/views/setting/FlinkCluster/useClusterSetting.ts +++ b/streampark-console/streampark-console-webapp/src/views/setting/FlinkCluster/useClusterSetting.ts @@ -27,7 +27,7 @@ import { renderYarnQueue, } from '../../flink/app/hooks/useFlinkRender'; import { fetchCheckHadoop } from '/@/api/flink/setting'; -import { fetchFlinkEnv } from '/@/api/flink/setting/flinkEnv'; +import { fetchListFlinkEnv } from '/@/api/flink/setting/flinkEnv'; import { FormSchema } from '/@/components/Table'; import optionData from '../../flink/app/data/option'; import { @@ -169,8 +169,8 @@ export const useClusterSetting = () => { fieldNames: { label: 'alertName', value: 'id', options: 'options' }, }, ifShow: ({ values }) => - values.executionMode == ExecModeEnum.YARN_SESSION || - values.executionMode == ExecModeEnum.REMOTE, + values.executionMode == ExecModeEnum.YARN_SESSION || + values.executionMode == ExecModeEnum.REMOTE, }, { field: 'clusterId', @@ -384,7 +384,7 @@ export const useClusterSetting = () => { } } onMounted(() => { - fetchFlinkEnv().then((res) => { + fetchListFlinkEnv().then((res) => { flinkEnvs.value = res; }); fetchAlertSetting().then((res) => { diff --git a/streampark-console/streampark-console-webapp/src/views/setting/FlinkHome/components/Modal.vue b/streampark-console/streampark-console-webapp/src/views/setting/FlinkHome/components/Modal.vue index de0ee072d..106df989c 100644 --- a/streampark-console/streampark-console-webapp/src/views/setting/FlinkHome/components/Modal.vue +++ b/streampark-console/streampark-console-webapp/src/views/setting/FlinkHome/components/Modal.vue @@ -51,7 +51,7 @@ allowClear: true, }, afterItem: () => - h('span', { class: 'conf-switch' }, t('setting.flinkHome.operateMessage.flinkNameTips')), + h('span', { class: 'tip-info' }, t('setting.flinkHome.operateMessage.flinkNameTips')), rules: [ { required: true, message: t('setting.flinkHome.operateMessage.flinkNameIsRequired') }, ], @@ -65,7 +65,7 @@ allowClear: true, }, afterItem: () => - h('span', { class: 'conf-switch' }, t('setting.flinkHome.operateMessage.flinkHomeTips')), + h('span', { class: 'tip-info' }, t('setting.flinkHome.operateMessage.flinkHomeTips')), rules: [ { required: true, message: t('setting.flinkHome.operateMessage.flinkHomeIsRequired') }, ], @@ -172,10 +172,3 @@ <BasicForm @register="registerForm" /> </BasicModal> </template> -<style lang="less"> - .conf-switch { - display: inline-block; - margin-top: 10px; - color: darkgrey; - } -</style> diff --git a/streampark-console/streampark-console-webapp/src/views/setting/FlinkHome/index.vue b/streampark-console/streampark-console-webapp/src/views/setting/FlinkHome/index.vue index 6715dd307..a81953314 100644 --- a/streampark-console/streampark-console-webapp/src/views/setting/FlinkHome/index.vue +++ b/streampark-console/streampark-console-webapp/src/views/setting/FlinkHome/index.vue @@ -38,7 +38,7 @@ import { fetchValidity, fetchDefaultSet, - fetchFlinkEnv, + fetchListFlinkEnv, fetchFlinkEnvRemove, fetchFlinkInfo, } from '/@/api/flink/setting/flinkEnv'; @@ -102,7 +102,7 @@ /* Get flink environment data */ async function getFlinkSetting() { - flinks.value = await fetchFlinkEnv(); + flinks.value = await fetchListFlinkEnv(); } onMounted(() => { diff --git a/streampark-flink/pom.xml b/streampark-flink/pom.xml index 19184ab60..961a6e784 100644 --- a/streampark-flink/pom.xml +++ b/streampark-flink/pom.xml @@ -31,7 +31,6 @@ <modules> <module>streampark-flink-shims</module> <module>streampark-flink-core</module> - <module>streampark-flink-connector</module> <module>streampark-flink-sqlclient</module> <module>streampark-flink-udf</module> <module>streampark-flink-client</module> @@ -76,4 +75,13 @@ </plugins> </build> + <profiles> + <profile> + <id>connector</id> + <modules> + <module>streampark-flink-connector</module> + </modules> + </profile> + </profiles> + </project>
