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

[HWORKS-512] Read cgroup parent from database #1334

Merged
merged 1 commit into from
Apr 25, 2023
Merged

[HWORKS-512] Read cgroup parent from database #1334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 16 additions & 7 deletions ...mon/src/main/java/io/hops/hopsworks/common/pythonresources/PythonResourcesController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,25 +152,34 @@ private Map<String, String> getNodeExporterQueriesKube() {
}

private Map<String, String> getCadvisorQueries() {
final String dockerCgroupParent = settings.getDockerCgroupParent();
String cGroupParentForRegex = dockerCgroupParent.replaceAll("\\.", "\\\\\\\\.");
final String headNodeInstanceQuery = "instance='" + glassfishIp + ":" + nodeExporterPort + "'";
return new HashMap<String, String>() {
{
put(DOCKER_CURRENT_CPU_USAGE_KEY,
"sum(avg by (cpu) (rate(container_cpu_usage_seconds_total{id=~'.*/docker/.*'}[60s]) * 100))");
"sum(avg by (cpu) (rate(container_cpu_usage_seconds_total{id=~'.*/" + cGroupParentForRegex
+ "/.*'}[60s]) * 100))");
put(DOCKER_TOTAL_ALLOCATABLE_CPU_KEY,
"(container_spec_cpu_quota{id='/docker'}/" + settings.getDockerCgroupCpuPeriod() + ")*100");
put(DOCKER_CURRENT_MEMORY_USAGE_KEY, "sum(container_memory_working_set_bytes{id=~'.*/docker/.*'})");
put(DOCKER_TOTAL_ALLOCATABLE_MEMORY_KEY, "container_spec_memory_limit_bytes{id='/docker'}");
"(sum(container_spec_cpu_quota{id='/" + dockerCgroupParent + "'})/("
+ settings.getDockerCgroupCpuPeriod()
+ " * (count(count(node_cpu_seconds_total{" + headNodeInstanceQuery + "}) without (mode,instance,job))"
+ "without (cpu))))*100");
put(DOCKER_CURRENT_MEMORY_USAGE_KEY, "sum(container_memory_working_set_bytes{id=~'.*/" + cGroupParentForRegex
+ "/.*'})");
put(DOCKER_TOTAL_ALLOCATABLE_MEMORY_KEY, "container_spec_memory_limit_bytes{id='/" + dockerCgroupParent
+ "'}");
}
};
}

private Map<String, String> getNodeExporterQueriesHeadNode() {
String headNodeQuery = "instance='" + glassfishIp + ":" + nodeExporterPort + "'";
final String headNodeQuery = "instance='" + glassfishIp + ":" + nodeExporterPort + "'";
return new HashMap<String, String>() {
{
put(CLUSTER_CURRENT_CPU_USAGE,
"100 - ((sum((avg by (instance) (rate(node_cpu_seconds_total{mode='idle', " + headNodeQuery + "}[1m])) " +
"* 100)))/(count(node_memory_Active_bytes{" + headNodeQuery + "})))");
"100 - ((sum((avg by (instance) (rate(node_cpu_seconds_total{mode='idle', " + headNodeQuery + "}[1m])) "
+ "* 100)))/(count(node_memory_Active_bytes{" + headNodeQuery + "})))");
put(CLUSTER_CURRENT_MEMORY_USAGE, "sum(node_memory_Active_bytes{" + headNodeQuery + "})");
put(CLUSTER_TOTAL_MEMORY_CAPACITY, "sum(node_memory_MemTotal_bytes{" + headNodeQuery + "})");
}
Expand Down
9 changes: 9 additions & 0 deletions hopsworks-common/src/main/java/io/hops/hopsworks/common/util/Settings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,7 @@ public class Settings implements Serializable {
private static final String VARIABLE_DOCKER_CGROUP_CPU_QUOTA = "docker_cgroup_cpu_quota_percentage";
private static final String VARIABLE_DOCKER_CGROUP_CPU_PERIOD = "docker_cgroup_cpu_period";
private static final String VARIABLE_DOCKER_CGROUP_MONITOR_INTERVAL = "docker_cgroup_monitor_interval";
private static final String VARIABLE_DOCKER_CGROUP_PARENT = "docker_cgroup_parent";

private static final String VARIABLE_PROMETHEUS_PORT = "prometheus_port";

Expand Down Expand Up @@ -902,6 +903,7 @@ private void populateCache() {
ENABLE_GIT_READ_ONLY_REPOSITORIES = setBoolVar(VARIABLE_ENABLE_GIT_READ_ONLY_REPOSITORIES,
ENABLE_GIT_READ_ONLY_REPOSITORIES);

//Docker cgroups
DOCKER_CGROUP_ENABLED = setBoolVar(VARIABLE_DOCKER_CGROUP_ENABLED, DOCKER_CGROUP_ENABLED);
DOCKER_CGROUP_MEMORY_LIMIT = setStrVar(VARIABLE_DOCKER_CGROUP_HARD_LIMIT_MEMORY,
DOCKER_CGROUP_MEMORY_LIMIT);
Expand All @@ -911,6 +913,7 @@ private void populateCache() {
DOCKER_CGROUP_CPU_PERIOD = setIntVar(VARIABLE_DOCKER_CGROUP_CPU_PERIOD, DOCKER_CGROUP_CPU_PERIOD);
DOCKER_CGROUP_MONITOR_INTERVAL = setStrVar(VARIABLE_DOCKER_CGROUP_MONITOR_INTERVAL,
DOCKER_CGROUP_MONITOR_INTERVAL);
DOCKER_CGROUP_PARENT = setStrVar(VARIABLE_DOCKER_CGROUP_PARENT, DOCKER_CGROUP_PARENT);

PROMETHEUS_PORT = setIntVar(VARIABLE_PROMETHEUS_PORT, PROMETHEUS_PORT);

Expand Down Expand Up @@ -1785,6 +1788,12 @@ public synchronized String getDockerCgroupIntervalMonitor() {
return DOCKER_CGROUP_MONITOR_INTERVAL;
}

private String DOCKER_CGROUP_PARENT = "docker.slice";
public synchronized String getDockerCgroupParent() {
checkCache();
return DOCKER_CGROUP_PARENT;
}


// Service key rotation interval
private static final String JUPYTER_SHUTDOWN_TIMER_INTERVAL = "jupyter_shutdown_timer_interval";
Expand Down