Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

job priority #1466

Merged
merged 35 commits into from
Dec 27, 2021
Merged

job priority #1466

Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
622a480
job priority
Dec 2, 2021
5986cf9
Optimizer (#1430)
Nov 30, 2021
2986868
Optimizer (#1430)
actions-user Nov 30, 2021
4326c9a
Optimizer (#1430)
actions-user Nov 30, 2021
00d5d18
job priority
Dec 2, 2021
5037e47
Merge branch 'master' into prioritized_jobs
Dec 2, 2021
fbaee4d
deep scan
Dec 2, 2021
8202259
exclude failing test
Dec 5, 2021
1aed123
tests
Dec 5, 2021
3fbd089
update db package version
Dec 5, 2021
dcd0e18
package-lock
Dec 5, 2021
9e56e5c
expose rest, use 2 queues
Dec 14, 2021
f463a2a
update preference api
Dec 15, 2021
500afce
remove redundant file
Dec 15, 2021
2b7bd10
error handling
Dec 15, 2021
db62123
load data and tests
Dec 19, 2021
213461c
CR
Dec 19, 2021
1cf4435
CR
Dec 19, 2021
8d9a383
api update
Dec 19, 2021
ce3411d
upgrade consts
Dec 19, 2021
d387f75
test accoring to api changes
Dec 19, 2021
a43c51c
ingress to driver-queue
Dec 20, 2021
10bc38e
swagger ui path to driver-queue/preferred
Dec 20, 2021
293771a
Merge branch 'master' into prioritized_jobs
Dec 20, 2021
45125a0
CR
Dec 21, 2021
cf80e23
deepscan
Dec 21, 2021
9c22ec9
fix api test
Dec 21, 2021
4ffbaaa
CR
Dec 22, 2021
e2f3b2d
add delete test
Dec 23, 2021
4418884
CR
Dec 23, 2021
13c44db
Merge branch 'master' into prioritized_jobs
Dec 26, 2021
7b7a83b
event only when realy dequeueing
Dec 26, 2021
4ce36df
driver-queue -> queue
Dec 26, 2021
e6a32b7
dequeued length
Dec 26, 2021
e6f4fb8
no metrics updates for preferred queue
Dec 26, 2021
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
332 changes: 331 additions & 1 deletion core/api-server/api/rest-api/swagger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"info": {
"title": "HKube API",
"description": "HKube RESTful API",
"version": "2.2.5",
"version": "2.2.6",
"contact": {
"email": "[email protected]"
},
Expand Down Expand Up @@ -12385,6 +12385,257 @@
}
}
},
"/driver-queue/preferred": {
"get": {
"tags": [
"Preferred"
],
"summary": "Get preferred",
"description": "Get preferred",
"responses": {
"200": {
"description": "Get preferred",
"content": {
"application/json": {
"schema": {
"type": "object",
"properties": {
"hits": {
"type": "array",
"description": "the actual result records",
"items": {}
},
"cursor": {
"type": "string",
"description": "this cursor to the next query can be used for pagination"
},
"timeTook": {
"type": "string",
"description": "the query completion time took in milliseconds"
}
}
}
}
}
},
"400": {
"description": "Bad request",
"content": {
"application/json": {
"schema": {
"type": "object",
"properties": {
"code": {
"type": "integer",
"format": "int32"
},
"message": {
"type": "string"
}
}
}
}
}
},
"default": {
"description": "Unexpected error",
"content": {
"application/json": {
"schema": {
"type": "object",
"properties": {
"code": {
"type": "integer",
"format": "int32"
},
"message": {
"type": "string"
}
}
}
}
}
}
}
},
"post": {
"tags": [
"Preferred"
],
"summary": "Add to preferred",
"description": "Add to preferred",
"requestBody": {
"content": {
"application/json": {
"schema": {
"type": "object",
"properties": {
"addedJobs": {
"type": "object",
"properties": {
"ids": {
"type": "array",
"items": {
"type": "string",
"description": "Unique identifier representing pipeline execution"
}
},
"position": {
"type": "string",
"enum": [
"first",
"last",
"before",
"after"
]
},
"query": {
"type": "object",
"properties": {
"tag": {
"type": "string",
"description": "Unique identifier representing a specific tag",
"minLength": 1,
"maxLength": 32
},
"jobId": {
"type": "string",
"description": "Unique identifier representing pipeline execution"
},
"pipeline": {
"type": "string",
"description": "Unique identifier representing a specific pipeline",
"minLength": 1,
"format": "pipeline-name"
}
}
}
},
"required": [
"ids",
"position"
]
},
"removedJobs": {
"type": "array",
"items": {
"type": "string",
"description": "Unique identifier representing pipeline execution"
}
}
}
}
}
},
"required": true
},
"responses": {
"200": {
"description": "start board response",
"content": {
"application/json": {
"schema": {
"type": "object",
"properties": {
"addedJobs": {
"type": "object",
"properties": {
"ids": {
"type": "array",
"items": {
"type": "string",
"description": "Unique identifier representing pipeline execution"
}
},
"position": {
"type": "string",
"enum": [
"first",
"last",
"before",
"after"
]
},
"query": {
"type": "object",
"properties": {
"tag": {
"type": "string",
"description": "Unique identifier representing a specific tag",
"minLength": 1,
"maxLength": 32
},
"jobId": {
"type": "string",
"description": "Unique identifier representing pipeline execution"
},
"pipeline": {
"type": "string",
"description": "Unique identifier representing a specific pipeline",
"minLength": 1,
"format": "pipeline-name"
}
}
}
},
"required": [
"ids",
"position"
]
},
"removedJobs": {
"type": "array",
"items": {
"type": "string",
"description": "Unique identifier representing pipeline execution"
}
}
}
}
}
}
},
"400": {
"description": "bad request",
"content": {
"application/json": {
"schema": {
"type": "object",
"properties": {
"code": {
"type": "integer",
"format": "int32"
},
"message": {
"type": "string"
}
}
}
}
}
},
"default": {
"description": "Unexpected error",
"content": {
"application/json": {
"schema": {
"type": "object",
"properties": {
"code": {
"type": "integer",
"format": "int32"
},
"message": {
"type": "string"
}
}
}
}
}
}
}
}
},
"/builds/status/{buildId}": {
"get": {
"tags": [
Expand Down Expand Up @@ -17896,6 +18147,85 @@
}
}
},
"updatePreferredRequest": {
"type": "object",
"properties": {
"addedJobs": {
"type": "object",
"properties": {
"ids": {
"type": "array",
"items": {
"type": "string",
"description": "Unique identifier representing pipeline execution"
}
},
"position": {
"type": "string",
"enum": [
"first",
"last",
"before",
"after"
]
},
"query": {
"type": "object",
"properties": {
"tag": {
"type": "string",
"description": "Unique identifier representing a specific tag",
"minLength": 1,
"maxLength": 32
},
"jobId": {
"type": "string",
"description": "Unique identifier representing pipeline execution"
},
"pipeline": {
"type": "string",
"description": "Unique identifier representing a specific pipeline",
"minLength": 1,
"format": "pipeline-name"
}
}
}
},
"required": [
"ids",
"position"
]
},
"removedJobs": {
"type": "array",
"items": {
"type": "string",
"description": "Unique identifier representing pipeline execution"
}
}
}
},
"preferredQuery": {
"type": "object",
"properties": {
"tag": {
"type": "string",
"description": "Unique identifier representing a specific tag",
"minLength": 1,
"maxLength": 32
},
"jobId": {
"type": "string",
"description": "Unique identifier representing pipeline execution"
},
"pipeline": {
"type": "string",
"description": "Unique identifier representing a specific pipeline",
"minLength": 1,
"format": "pipeline-name"
}
}
},
"buildId": {
"type": "object",
"properties": {
Expand Down
13 changes: 9 additions & 4 deletions core/api-server/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion core/api-server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"@hkube/config": "^2.0.11",
"@hkube/consts": "^1.0.39",
"@hkube/dag": "^2.1.25",
"@hkube/db": "^1.0.44",
"@hkube/db": "^1.0.47",
"@hkube/etcd": "^5.1.6",
"@hkube/logger": "^2.0.2",
"@hkube/metrics": "^1.0.42",
Expand Down
Loading