make node buffer configurable #6410
Conversation
| @@ -336,6 +337,8 @@ def self.node_utilization | |||
|
|
|||
| # use max_{active_,}gears if set in resource limits, or fall back to old "apps" names | |||
| res['max_active_gears'] = (resource.get('max_active_gears') or resource.get('max_active_apps') or DEFAULT_MAX_ACTIVE_GEARS) | |||
| res['node_df_buffer'] = resource.get('node_df_buffer', DEFAULT_NODE_DF_BUFFER) | |||
There was a problem hiding this comment.
It would make sense to do a .to_f here so that the facts.yaml doesn't sometimes contain a string (if the value from the configuration file is used) and sometimes a float (if DEFAULT_NODE_DF_BUFFER is used), although it shouldn't really matter since we do a .to_f on the broker's side.
sallyom
force-pushed
the
makeNodeBufferConfigurable
branch
from
2ed3fa6
to
7ecb9a0
Compare
|
openshift-bot, please [test][extended:node]! |
sallyom
force-pushed
the
makeNodeBufferConfigurable
branch
from
7ecb9a0
to
14307f6
Compare
| @@ -25,6 +25,12 @@ node_profile=small | |||
| # For no over-commit, should be (Total System Memory - 1G) / memory_limit_in_bytes | |||
| max_active_gears=60 | |||
|
|
|||
| # Node disk buffer | |||
| # | |||
| # When moving a gear to a node, ensure that after a move this buffer of free disk space | |||
There was a problem hiding this comment.
s/buffer/percentage/ for clarity.
sallyom
force-pushed
the
makeNodeBufferConfigurable
branch
from
14307f6
to
931d684
Compare
|
@Miciah, please review, thanks! |
| @@ -38,6 +38,7 @@ | |||
| :domain_suffix => conf.get("CLOUD_DOMAIN", "example.com"), | |||
| :default_max_domains => (conf.get("DEFAULT_MAX_DOMAINS", "10")).to_i, | |||
| :default_max_gears => (conf.get("DEFAULT_MAX_GEARS", "100")).to_i, | |||
| :default_node_df_buffer => (conf.get("DEFAULT_NODE_DF_BUFFER", "0.05").to_f, | |||
There was a problem hiding this comment.
We shouldn't need to make any changes under plugins/auth/.
sallyom
force-pushed
the
makeNodeBufferConfigurable
branch
2 times, most recently
from
a61c2b6
to
3b5d35f
Compare
|
Lovely jubbly! openshift-bot, please [merge]! |
|
Online Merge Results: SUCCESS (https://ci.dev.openshift.redhat.com/jenkins/job/test_pull_requests/9372/) (Image: devenv_5814) |
sallyom
force-pushed
the
makeNodeBufferConfigurable
branch
from
3b5d35f
to
7e08d1d
Compare
| @@ -2413,11 +2413,13 @@ def rsync_destination_container(gear, destination_container, destination_distric | |||
| log_debug "DEBUG: Gear platform is '#{platform}'" | |||
| destination_avail_space = destination_container.get_node_disk_free | |||
| destination_total_space = destination_container.get_node_total_size | |||
| node_df_buffer = Rails.application.config.openshift[:default_node_df_buffer].to_f | |||
sallyom
force-pushed
the
makeNodeBufferConfigurable
branch
from
7e08d1d
to
9425b79
Compare
|
Evaluated for online test up to 9425b79 |
|
Online Test Results: SUCCESS (https://ci.dev.openshift.redhat.com/jenkins/job/test_pull_requests/9370/) |
|
[merge] |
|
Evaluated for online merge up to 9425b79 |
@Miciah please take a look, thanks