fix cgroups pressure (#17800)
Ilya Mashchenko committed
Jun 3, 2024 at 13:59 UTC
16d6b4dad0014b7c27d6afb06caa503c283c65b6
1 file changed
+10
-14
src/collectors/cgroups.plugin/sys_fs_cgroup.c
+10
-14
@@ -790,12 +790,8 @@ static inline void cgroup2_read_pressure(struct pressure *res) {
790
}
791
792
res->updated = (did_full || did_some) ? 1 : 0;
793
-
794
- if(unlikely(res->some.enabled == CONFIG_BOOLEAN_AUTO))
795
- res->some.enabled = (did_some) ? CONFIG_BOOLEAN_YES : CONFIG_BOOLEAN_NO;
796
-
797
- if(unlikely(res->full.enabled == CONFIG_BOOLEAN_AUTO))
798
- res->full.enabled = (did_full) ? CONFIG_BOOLEAN_YES : CONFIG_BOOLEAN_NO;
793
+ res->some.available = did_some;
794
+ res->full.available = did_full;
795
}
796
}
797
@@ -1263,44 +1259,44 @@ void update_cgroup_charts() {
1259
1260
if (cg->options & CGROUP_OPTIONS_IS_UNIFIED) {
1261
if (likely(cg->cpu_pressure.updated)) {
1266
- if (cg->cpu_pressure.some.enabled) {
1262
+ if (cg->cpu_pressure.some.available) {
1263
update_cpu_some_pressure_chart(cg);
1264
update_cpu_some_pressure_stall_time_chart(cg);
1265
}
1270
- if (cg->cpu_pressure.full.enabled) {
1266
+ if (cg->cpu_pressure.full.available) {
1267
update_cpu_full_pressure_chart(cg);
1268
update_cpu_full_pressure_stall_time_chart(cg);
1269
}
1270
}
1271
1272
if (likely(cg->memory_pressure.updated)) {
1277
- if (cg->memory_pressure.some.enabled) {
1273
+ if (cg->memory_pressure.some.available) {
1274
update_mem_some_pressure_chart(cg);
1275
update_mem_some_pressure_stall_time_chart(cg);
1276
}
1281
- if (cg->memory_pressure.full.enabled) {
1277
+ if (cg->memory_pressure.full.available) {
1278
update_mem_full_pressure_chart(cg);
1279
update_mem_full_pressure_stall_time_chart(cg);
1280
}
1281
}
1282
1283
if (likely(cg->irq_pressure.updated)) {
1288
- if (cg->irq_pressure.some.enabled) {
1284
+ if (cg->irq_pressure.some.available) {
1285
update_irq_some_pressure_chart(cg);
1286
update_irq_some_pressure_stall_time_chart(cg);
1287
}
1292
- if (cg->irq_pressure.full.enabled) {
1288
+ if (cg->irq_pressure.full.available) {
1289
update_irq_full_pressure_chart(cg);
1290
update_irq_full_pressure_stall_time_chart(cg);
1291
}
1292
}
1293
1294
if (likely(cg->io_pressure.updated)) {
1299
- if (cg->io_pressure.some.enabled) {
1295
+ if (cg->io_pressure.some.available) {
1296
update_io_some_pressure_chart(cg);
1297
update_io_some_pressure_stall_time_chart(cg);
1298
}
1303
- if (cg->io_pressure.full.enabled) {
1299
+ if (cg->io_pressure.full.available) {
1300
update_io_full_pressure_chart(cg);
1301
update_io_full_pressure_stall_time_chart(cg);
1302
}