Skip to content

Gha/rm bzip install #2

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

Open
elfiesmelfie wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Gha/rm bzip install #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
51f8ec3
Fix CI failures caused by unsupported distros and updates to dependen…
elfiesmelfie Feb 15, 2022
68390d0
[gha] Add a test log when the tests fail (#3971)
elfiesmelfie Feb 15, 2022
de33b26
memory: add laundry and user wired pages (#3962)
fcharlier Feb 15, 2022
ac581da
[ci][gha] Miscellaneous improvements and sync with cirrus (#3976)
elfiesmelfie Feb 15, 2022
53f6191
[ci][gha] Remove the install "bzip2" task
elfiesmelfie Feb 16, 2022
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
10 changes: 5 additions & 5 deletions .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ debian_default_toolchain_task:
build_script:
- make -j2 -sk
tests_script:
- make -j2 -sk check
- VALGRIND_OPTS="--errors-for-leak-kinds=definite" make -j2 -sk check || cat ./test-suite.log || false
- /checks/check-built-plugins.sh

###
Expand Down Expand Up @@ -92,7 +92,7 @@ redhat_default_toolchain_task:
build_script:
- make -j2 -sk
tests_script:
- make -j2 -sk check
- VALGRIND_OPTS="--errors-for-leak-kinds=definite" make -j2 -sk check || cat ./test-suite.log || false
- /checks/check-built-plugins.sh


Expand Down Expand Up @@ -124,7 +124,7 @@ non_standard_toolchains_task:
build_script:
- make -j2 -sk
tests_script:
- make -j2 -sk check
- VALGRIND_OPTS="--errors-for-leak-kinds=definite" make -j2 -sk check || cat ./test-suite.log || false

# build against libstatgrab, should always pass
- env:
Expand Down Expand Up @@ -189,7 +189,7 @@ non_standard_toolchains_task:
build_script:
- make -j2 -sk
tests_script:
- make -j2 -sk check
- VALGRIND_OPTS="--errors-for-leak-kinds=definite" make -j2 -sk check || cat ./test-suite.log || false

###
# Build using a range of compilers, available in debian/unstable. NB: might
Expand Down Expand Up @@ -221,4 +221,4 @@ bleeding_edge_compilers_task:
build_script:
- make -j2 -sk
tests_script:
- make -j2 -sk check
- VALGRIND_OPTS="--errors-for-leak-kinds=definite" make -j2 -sk check || cat ./test-suite.log || false
52 changes: 26 additions & 26 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,39 +26,40 @@ jobs:
- buster_amd64
- stretch_amd64
- stretch_i386
- trusty_amd64
# Ubuntu
- xenial_amd64
- bionic_amd64
- focal_amd64
# RedHat family
- el8_x86_64
- el7_x86_64
- fedora34_x86_64
- fedora28_x86_64
config_flags: ['']
env:
MAKEFLAGS: "-j 2"
MAKEFLAGS: "-j2 -sk"
CONFIGURE_FLAGS: ${{ matrix.config_flags }}
# this env var picked up by valgrind during make check phase
VALGRIND_OPTS: "--errors-for-leak-kinds=definite"
steps:
- uses: actions/checkout@v2
- run: type pkg-config
- run: pkg-config --list-all | sort -u
- name: Generate configure script
run:
./build.sh
- name: configure
- name: Run configure script
run: ./configure $CONFIGURE_FLAGS
- name: Make
run: make
- name: make check
continue-on-error: true
run: make check
- name: install bzip2
continue-on-error: true
- name: Build collectd
run: make $MAKEFLAGS
- name: Run make check
run: make $MAKEFLAGS check
- name: Dump test logs
run: |
yum install -y bzip2 || apt install -y bzip2
- name: make
continue-on-error: true
cat ./test-suite.log || true
- name: Run make distcheck
run: |
make distcheck DISTCHECK_CONFIGURE_FLAGS="--disable-dependency-tracking --enable-debug"
make $MAKEFLAG distcheck DISTCHECK_CONFIGURE_FLAGS="--disable-dependency-tracking --enable-debug"

experimental:
runs-on: ubuntu-20.04
Expand All @@ -80,31 +81,30 @@ jobs:
cppflags: "-fPIE -Wno-deprecated-declarations"
config_flags: "--disable-dpdkstat --disable-dpdkevents --disable-virt --disable-xmms"
env:
MAKEFLAGS: "-j 2"
MAKEFLAGS: "-j2 -sk"
CFLAGS: ${{ matrix.cflags }}
CPPFLAGS: ${{ matrix.cppflags }}
CONFIGURE_FLAGS: ${{ matrix.config_flags }}
VALGRIND_OPTS: "--errors-for-leak-kinds=definite"
steps:
- uses: actions/checkout@v2
- run: type pkg-config
- run: pkg-config --list-all | sort -u
- name: Generate configure script
run:
./build.sh
- name: configure
- name: Run configure script
run: ./configure $CONFIGURE_FLAGS
- name: Make
run: make
- name: make check
- name: Build collectd
run: make $MAKEFLAGS
- name: Run make check
# Make check is failing on a few newer distros, temporarily mark it as optional until that is resolved
continue-on-error: true
run: make check
- name: install bzip2
continue-on-error: true
run: make $MAKEFLAGS check
- name: Dump test logs
run: |
yum install -y bzip2 || apt install -y bzip2
- name: make distcheck
continue-on-error: true
cat ./test-suite.log || true
- name: Run make distcheck
run: |
make distcheck DISTCHECK_CONFIGURE_FLAGS="--disable-dependency-tracking --enable-debug"
make $MAKEFLAGS distcheck DISTCHECK_CONFIGURE_FLAGS="--disable-dependency-tracking --enable-debug"

18 changes: 11 additions & 7 deletions src/memory.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,13 +281,16 @@ static int memory_read_internal(value_list_t *vl) {
* vm.stats.vm.v_active_count: 55239
* vm.stats.vm.v_inactive_count: 113730
* vm.stats.vm.v_cache_count: 10809
* vm.stats.vm.v_user_wire_count: 0
* vm.stats.vm.v_laundry_count: 40394
*/
const char *sysctl_keys[8] = {
"vm.stats.vm.v_page_size", "vm.stats.vm.v_page_count",
"vm.stats.vm.v_free_count", "vm.stats.vm.v_wire_count",
"vm.stats.vm.v_active_count", "vm.stats.vm.v_inactive_count",
"vm.stats.vm.v_cache_count", NULL};
double sysctl_vals[8];
const char *sysctl_keys[10] = {
"vm.stats.vm.v_page_size", "vm.stats.vm.v_page_count",
"vm.stats.vm.v_free_count", "vm.stats.vm.v_wire_count",
"vm.stats.vm.v_active_count", "vm.stats.vm.v_inactive_count",
"vm.stats.vm.v_cache_count", "vm.stats.vm.v_user_wire_count",
"vm.stats.vm.v_laundry_count", NULL};
double sysctl_vals[10];

for (int i = 0; sysctl_keys[i] != NULL; i++) {
int value;
Expand All @@ -310,7 +313,8 @@ static int memory_read_internal(value_list_t *vl) {
MEMORY_SUBMIT("free", (gauge_t)sysctl_vals[2], "wired",
(gauge_t)sysctl_vals[3], "active", (gauge_t)sysctl_vals[4],
"inactive", (gauge_t)sysctl_vals[5], "cache",
(gauge_t)sysctl_vals[6]);
(gauge_t)sysctl_vals[6], "user_wire", (gauge_t)sysctl_vals[7],
"laundry", (gauge_t)sysctl_vals[8]);

#endif /* HAVE_SYSCTL && KERNEL_NETBSD */
/* #endif HAVE_SYSCTLBYNAME */
Expand Down