You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2022/04/06 02:30:49 UTC
[incubator-linkis] branch dev-1.1.2 updated: Linkis management console resource display and reset page, resource display should display instance and Yarn instances. (#1895)
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.2
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.1.2 by this push:
new a10c2628b Linkis management console resource display and reset page, resource display should display instance and Yarn instances. (#1895)
a10c2628b is described below
commit a10c2628b8bfeda0bbd8e7f07fafaa4abb66663f
Author: weixiao <le...@gmail.com>
AuthorDate: Wed Apr 6 10:30:45 2022 +0800
Linkis management console resource display and reset page, resource display should display instance and Yarn instances. (#1895)
Co-authored-by: leo_jie <we...@aliyun.com>
---
web/src/apps/linkis/module/ECM/engineConn.vue | 2 +-
web/src/apps/linkis/module/ECM/index.vue | 2 +-
.../linkis/module/resourceManagement/index.vue | 51 ++++++++++++----------
3 files changed, 31 insertions(+), 24 deletions(-)
diff --git a/web/src/apps/linkis/module/ECM/engineConn.vue b/web/src/apps/linkis/module/ECM/engineConn.vue
index 26eaef340..d21d09323 100644
--- a/web/src/apps/linkis/module/ECM/engineConn.vue
+++ b/web/src/apps/linkis/module/ECM/engineConn.vue
@@ -29,7 +29,7 @@
</template>
<template slot-scope="{row}" slot="usedResource">
<!-- 后台未做返回时的处理，下面几个可按照处理 -->
- <span v-if="row.usedResource">{{`${calcCompany(row.usedResource.cores)}cores,${calcCompany(row.usedResource.memory, true)}G `}}</span>
+ <span v-if="row.usedResource">{{`${calcCompany(row.usedResource.cores)}cores,${calcCompany(row.usedResource.memory, true)}G,${calcCompany(row.usedResource.instances)}apps`}}</span>
<span v-else>Null cores,Null G</span>
</template>
<!-- <template slot-scope="{row}" slot="maxResource">
diff --git a/web/src/apps/linkis/module/ECM/index.vue b/web/src/apps/linkis/module/ECM/index.vue
index 70b7ab0c1..407e73748 100644
--- a/web/src/apps/linkis/module/ECM/index.vue
+++ b/web/src/apps/linkis/module/ECM/index.vue
@@ -240,7 +240,7 @@ export default {
}
return data;
}
- return v && (v.cores !== undefined || v.memonry !== undefined) ? `${calcCompany(v.cores)}cores,${calcCompany(v.memory, true)}G` : ''
+ return v && (v.cores !== undefined || v.memonry !== undefined || v.instances !== undefined) ? `${calcCompany(v.cores)}cores,${calcCompany(v.memory, true)}G,${calcCompany(v.instances)}apps` : ''
}
},
created() {
diff --git a/web/src/apps/linkis/module/resourceManagement/index.vue b/web/src/apps/linkis/module/resourceManagement/index.vue
index 6a0a6ee5c..edd2f6e3c 100644
--- a/web/src/apps/linkis/module/resourceManagement/index.vue
+++ b/web/src/apps/linkis/module/resourceManagement/index.vue
@@ -100,9 +100,9 @@
<div class="resourceList">
<span>{{$t('message.linkis.resources')}}：</span>
<span v-if="applicationList.usedResource">
- <Tag color="success">{{`${calcCompany(applicationList.usedResource.cores)},${calcCompany(applicationList.usedResource.memory, true)}`}}(used)</Tag>
- <Tag color="error">{{`${calcCompany(applicationList.maxResource.cores)},${calcCompany(applicationList.maxResource.memory, true)}`}}(max)</Tag>
- <Tag color="warning" v-if="applicationList.leftResource">{{`${calcCompany(applicationList.leftResource.cores)},${calcCompany(applicationList.leftResource.memory, true)}`}}(remain)</Tag>
+ <Tag color="success">{{`${calcCompany(applicationList.usedResource)}`}}(used)</Tag>
+ <Tag color="error">{{`${calcCompany(applicationList.maxResource)}`}}(max)</Tag>
+ <Tag color="warning" v-if="applicationList.leftResource">{{`${calcCompany(applicationList.leftResource)}`}}(remain)</Tag>
</span>
</div>
<div class="instanceNum" >
@@ -115,19 +115,19 @@
<span>{{`${row.engineType}:${row.instance}`}}</span>
</template>
<template slot-scope="{row}" slot="usedResource">
- <span>{{`${calcCompany(row.resource.usedResource.cores)},${calcCompany(row.resource.usedResource.memory, true)}`}}</span>
+ <span>{{`${calcCompany(row.resource.usedResource)}`}}</span>
</template>
<template slot-scope="{row}" slot="lockedResource">
- <span>{{`${calcCompany(row.resource.lockedResource.cores)},${calcCompany(row.resource.lockedResource.memory, true)}`}}</span>
+ <span>{{`${calcCompany(row.resource.lockedResource)}`}}</span>
</template>
<template slot-scope="{row}" slot="maxResource">
- <span>{{`${calcCompany(row.resource.maxResource.cores)},${calcCompany(row.resource.maxResource.memory, true)}`}}</span>
+ <span>{{`${calcCompany(row.resource.maxResource)}`}}</span>
</template>
<template slot-scope="{row}" slot="leftResource">
- <span>{{`${calcCompany(row.resource.leftResource.cores)},${calcCompany(row.resource.leftResource.memory, true)}`}}</span>
+ <span>{{`${calcCompany(row.resource.leftResource)}`}}</span>
</template>
<template slot-scope="{row}" slot="minResource">
- <span>{{`${calcCompany(row.resource.minResource.cores)},${calcCompany(row.resource.minResource.memory, true)}`}}</span>
+ <span>{{`${calcCompany(row.resource.minResource)}`}}</span>
</template>
<template slot-scope="{row}" slot="startTime">
<span>{{ timeFormat(row) }}</span>
@@ -137,25 +137,25 @@
<template v-if="isAdminModel">
<Table class="table-content" border :width="tableWidth" :columns="admincolumns" :data="adminTableData">
<template slot-scope="{row}" slot="usedResource">
- <span>{{`${calcCompanyAdmin(row, 'usedResource', 'cores')},${calcCompanyAdmin(row, 'usedResource', 'memory')}`}}</span>
+ <span>{{`${calcCompanyAdmin(row, 'usedResource', 'cores')},${calcCompanyAdmin(row, 'usedResource', 'memory')},${calcCompanyAdmin(row, 'usedResource', 'instances')}`}}</span>
</template>
<template slot-scope="{row}" slot="lockedResource">
- <span>{{`${calcCompanyAdmin(row, 'lockedResource', 'cores')},${calcCompanyAdmin(row, 'lockedResource', 'memory')}`}}</span>
+ <span>{{`${calcCompanyAdmin(row, 'lockedResource', 'cores')},${calcCompanyAdmin(row, 'lockedResource', 'memory')},${calcCompanyAdmin(row, 'lockedResource', 'instances')}`}}</span>
</template>
<template slot-scope="{row}" slot="maxResource">
- <span>{{`${calcCompanyAdmin(row, 'maxResource', 'cores')},${calcCompanyAdmin(row, 'maxResource', 'memory')}`}}</span>
+ <span>{{`${calcCompanyAdmin(row, 'maxResource', 'cores')},${calcCompanyAdmin(row, 'maxResource', 'memory')},${calcCompanyAdmin(row, 'maxResource', 'instances')}`}}</span>
</template>
<template slot-scope="{row}" slot="leftResource">
- <span :class="'label-'+row.loadResourceStatus">{{`${calcCompanyAdmin(row, 'leftResource', 'cores')},${calcCompanyAdmin(row, 'leftResource', 'memory')}`}}</span>
+ <span :class="'label-'+row.loadResourceStatus">{{`${calcCompanyAdmin(row, 'leftResource', 'cores')},${calcCompanyAdmin(row, 'leftResource', 'memory')},${calcCompanyAdmin(row, 'leftResource', 'instances')}`}}</span>
</template>
<template slot-scope="{row}" slot="yarnUsedResource">
- <span>{{`${calcCompanyAdmin(row, 'usedResource', 'cores', true)},${calcCompanyAdmin(row, 'usedResource', 'memory', true)}`}}</span>
+ <span>{{`${calcCompanyAdmin(row, 'usedResource', 'cores', true)},${calcCompanyAdmin(row, 'usedResource', 'memory', true)},${calcCompanyAdmin(row, 'usedResource', 'instances', true)}`}}</span>
</template>
<template slot-scope="{row}" slot="yarnMaxResource">
- <span>{{`${calcCompanyAdmin(row, 'maxResource', 'cores', true)},${calcCompanyAdmin(row, 'maxResource', 'memory', true)}`}}</span>
+ <span>{{`${calcCompanyAdmin(row, 'maxResource', 'cores', true)},${calcCompanyAdmin(row, 'maxResource', 'memory', true)},${calcCompanyAdmin(row, 'maxResource', 'instances', true)}`}}</span>
</template>
<template slot-scope="{row}" slot="yarnLeftResource">
- <span :class="'label-'+row.queueResourceStatus">{{`${calcCompanyAdmin(row, 'leftResource', 'cores', true)},${calcCompanyAdmin(row, 'leftResource', 'memory', true)}`}}</span>
+ <span :class="'label-'+row.queueResourceStatus">{{`${calcCompanyAdmin(row, 'leftResource', 'cores', true)},${calcCompanyAdmin(row, 'leftResource', 'memory', true)},${calcCompanyAdmin(row, 'leftResource', 'instances', true)}`}}</span>
</template>
</Table>
<div class="page-bar">
@@ -548,20 +548,25 @@ export default {
timeFormat(row) {
return moment(new Date(row.startTime)).format('YYYY-MM-DD HH:mm:ss')
},
- calcCompany(num, isCompany = false) {
- let data = num > 0 ? num : 0;
- if (isCompany) {
- data = data / 1024 / 1024 / 1024 + 'G'
- } else {
- data = data + 'cores'
+ calcCompany(resource) {
+ const calcCompanyToData = function(num, isCompany = false) {
+ let data = num > 0 ? num : 0;
+ if (isCompany) {
+ return data / 1024 / 1024 / 1024;
+ }
+ return data;
}
- return data;
+ console.log(resource);
+ return resource && (resource.cores !== undefined || resource.memonry !== undefined || resource.instance !== undefined) ? `${calcCompanyToData(resource.cores)}cores,${calcCompanyToData(resource.memory, true)}G,${calcCompanyToData(resource.instance)}apps` : ''
},
calcCompanyAdmin(row, field, type, yarn) {
let data = ' -- '
if (row.resourceType === 'LoadInstance') {
if (!yarn) {
data = row[field][type]
+ if (type === 'instances' && data === undefined) {
+ data = row[field]['instance']
+ }
}
} else {
if (yarn) {
@@ -577,6 +582,8 @@ export default {
if (data !== ' -- ') {
if (type === 'memory') {
data = data + 'G'
+ } else if (type === 'instances') {
+ data = data + 'apps'
} else {
data = data + 'cores'
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org