Skip to content

Commit

Permalink
Merge pull request #238 from jnpkrn/travis-issue-234
Browse files Browse the repository at this point in the history
Continue with investigation of intermittent failures in Travis CI (#234)
  • Loading branch information
chrissie-c authored Nov 29, 2016
2 parents d03b718 + 6fad6b7 commit 52db499
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 2 deletions.
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@ script: RPMBUILDOPTS_="--nodeps --define '_without_check 1'";
after_failure:
# keep an eye on issue #234 if it recidivates
- for f in $(ls -1 /dev/shm/qb-test*); do ls -l "$f"; lsof -- "$f"; done
- mount | grep shm
- dh -h | grep shm
#- ls -l /var/run/*
- mount | grep -e /shm #-e /var
- du -h | grep -e /shm #-e /var
- lsblk -f

notifications:
irc: "irc.freenode.net#clusterlabs-dev"
5 changes: 5 additions & 0 deletions lib/ipc_socket.c
Original file line number Diff line number Diff line change
Expand Up @@ -164,13 +164,18 @@ dgram_verify_msg_size(size_t max_msg_size)
char buf[max_msg_size];

if (socketpair(AF_UNIX, SOCK_DGRAM, 0, sockets) < 0) {
qb_util_perror(LOG_DEBUG, "error calling socketpair()");
goto cleanup_socks;
}

if (set_sock_size(sockets[0], max_msg_size) != 0) {
qb_util_log(LOG_DEBUG, "error set_sock_size(sockets[0],%#x)",
max_msg_size);
goto cleanup_socks;
}
if (set_sock_size(sockets[1], max_msg_size) != 0) {
qb_util_log(LOG_DEBUG, "error set_sock_size(sockets[1],%#x)",
max_msg_size);
goto cleanup_socks;
}

Expand Down
10 changes: 10 additions & 0 deletions tests/check_ipc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1495,7 +1495,17 @@ static void test_max_dgram_size(void)
fail_if(init <= 0);
for (i = 0; i < 100; i++) {
int try = qb_ipcc_verify_dgram_max_msg_size(1000000);
#if 0
ck_assert_int_eq(init, try);
#else
/* extra troubleshooting, report also on i and errno variables;
related: https://github.com/ClusterLabs/libqb/issues/234 */
if (init != try) {
ck_abort_msg("Assertion 'init==try' failed:"
" init==%#x, try==%#x, i=%d, errno=%d",
init, try, i, errno);
}
#endif
}

qb_log_filter_ctl(QB_LOG_STDERR, QB_LOG_FILTER_ADD,
Expand Down

0 comments on commit 52db499

Please sign in to comment.