Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
picodata
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
core
picodata
Commits
1f372dc3
Commit
1f372dc3
authored
1 year ago
by
Дмитрий Кольцов
Browse files
Options
Downloads
Patches
Plain Diff
fix(webui): add memory info to replicasets
parent
f8029b87
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!704
deps(webui): bump to 0.1.3
Pipeline
#25920
passed
1 year ago
Stage: test
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/http_server.lua
+5
-1
5 additions, 1 deletion
src/http_server.lua
test/int/test_http_server.py
+5
-1
5 additions, 1 deletion
test/int/test_http_server.py
with
10 additions
and
2 deletions
src/http_server.lua
+
5
−
1
View file @
1f372dc3
...
...
@@ -121,9 +121,13 @@ local function list_replicasets()
version
=
VERSION_PLACEHOLDER
,
grade
=
is_leader
and
instance
.
current_grade
[
1
],
-- frontend expects number
capacity
=
capacity
Usage
=
is_leader
and
instance_memory_info
.
quota_used
/
instance_memory_info
.
quota_size
*
100
,
memory
=
is_leader
and
{
used
=
instance_memory_info
.
quota_used
,
usable
=
instance_memory_info
.
quota_size
,
},
}
else
local
replicaset
=
acc
[
instance
.
replicaset_uuid
]
...
...
This diff is collapsed.
Click to expand it.
test/int/test_http_server.py
+
5
−
1
View file @
1f372dc3
...
...
@@ -56,7 +56,11 @@ def test_webui(cluster_with_webui: Cluster):
}
],
"
instanceCount
"
:
1
,
"
capacity
"
:
100
,
"
capacityUsage
"
:
100
,
"
memory
"
:
{
"
usable
"
:
33554432
,
"
used
"
:
33554432
,
},
"
uuid
"
:
instance
.
replicaset_uuid
(),
"
id
"
:
"
r1
"
,
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment