Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gelencsér Szabolcs
/
circlestack
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
46c32973
authored
Feb 17, 2014
by
Gregory Nagy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge fxd
parent
ae77d3c8
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
8 deletions
+0
-8
circle/manager/scheduler.py
+0
-8
No files found.
circle/manager/scheduler.py
View file @
46c32973
...
...
@@ -50,13 +50,9 @@ def has_enough_ram(ram_size, node):
"""True, if the node has enough memory to accomodate a guest requiring
ram_size mebibytes of memory; otherwise, false.
"""
<<<<<<<
HEAD
total
=
node
.
ram_size
used
=
(
node
.
ram_usage
()
/
100
)
*
total
unused
=
total
-
used
=======
unused
=
node
.
ram_size
*
(
1
-
node
.
ram_usage
)
>>>>>>>
e17952087c648c91908f22e85c4db7194c5f8f60
overcommit
=
node
.
ram_size_with_overcommit
reserved
=
node
.
instance_set
.
aggregate
(
r
=
Sum
(
'ram_size'
))[
'r'
]
or
0
...
...
@@ -70,11 +66,7 @@ def free_cpu_time(node):
Higher values indicate more idle time.
"""
<<<<<<<
HEAD
activity
=
node
.
cpu_usage
()
/
100
=======
activity
=
node
.
cpu_usage
>>>>>>>
e17952087c648c91908f22e85c4db7194c5f8f60
inactivity
=
1
-
activity
cores
=
node
.
num_cores
return
cores
*
inactivity
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment