Skip to content
This repository has been archived by the owner on Jun 6, 2024. It is now read-only.

fix get jobs api launchedTime field issue #5307

Merged
merged 3 commits into from
Feb 22, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/database-controller/sdk/index.js
Original file line number Diff line number Diff line change
@@ -27,6 +27,7 @@ class DatabaseModel {
jobConfig: Sequelize.TEXT,
executionType: Sequelize.STRING(32),
creationTime: Sequelize.DATE,
launchTime: Sequelize.DATE,
virtualCluster: Sequelize.STRING(256),
jobPriority: Sequelize.STRING(256),
totalGpuNumber: Sequelize.INTEGER,
2 changes: 1 addition & 1 deletion src/database-controller/sdk/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "openpaidbsdk",
"version": "1.0.1",
"version": "1.0.2",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
"lint": "eslint --ext .js --ext .jsx ."
3 changes: 3 additions & 0 deletions src/database-controller/src/common/framework.js
Original file line number Diff line number Diff line change
@@ -228,6 +228,9 @@ class Snapshot {
creationTime: this._snapshot.metadata.creationTimestamp
? new Date(this._snapshot.metadata.creationTimestamp)
: null,
launchTime: (this._snapshot.status.runTime || this._snapshot.status.completionTime)
? new Date(this._snapshot.status.runTime || this._snapshot.status.completionTime)
: null,
completionTime: this._snapshot.status.completionTime
? new Date(this._snapshot.status.completionTime)
: null,
1 change: 1 addition & 0 deletions src/rest-server/src/controllers/v2/job.js
Original file line number Diff line number Diff line change
@@ -119,6 +119,7 @@ const list = asyncHandler(async (req, res) => {
'executionType',
'submissionTime',
'creationTime',
'launchTime',
'virtualCluster',
'totalGpuNumber',
'totalTaskNumber',
3 changes: 1 addition & 2 deletions src/rest-server/src/models/v2/job/k8s.js
Original file line number Diff line number Diff line change
@@ -64,8 +64,7 @@ const convertFrameworkSummary = (framework) => {
retryDelayTime: framework.retryDelayTime,
submissionTime: new Date(framework.submissionTime).getTime(),
createdTime: new Date(framework.creationTime).getTime() || null,
launchedTime:
new Date(framework.runTime || framework.completionTime).getTime() || null,
launchedTime: new Date(framework.launchTime).getTime() || null,
completedTime: new Date(framework.completionTime).getTime() || null,
appExitCode: framework.appExitCode,
virtualCluster: framework.virtualCluster