Update to new health_check program output.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
function test_thread_exit
{
test_thread_exit_name="$1"
- test_thread_exit_code="$2"
+ test_thread_error_string="$2"
diag "Test health failure with ${test_thread_exit_name}"
unset ${test_thread_exit_name}_EXIT
# Check initial health status
- $CURDIR/$HEALTH_CHECK_BIN &> /dev/null
+ $CURDIR/$HEALTH_CHECK_BIN > /dev/null
# Wait
sleep 30
- # Check health status, exit code should indicate failure
- $CURDIR/$HEALTH_CHECK_BIN &> /dev/null
+ # Check health status
+ $CURDIR/$HEALTH_CHECK_BIN > ${STDOUT_PATH} 2> ${STDERR_PATH}
- health_check_exit_code=$?
-
- if [ $health_check_exit_code -eq $test_thread_exit_code ]; then
- pass "Validate thread ${test_thread_exit_name} failure"
- stop_lttng_sessiond
- else
+ out=$(grep "${test_thread_error_string}" ${STDOUT_PATH} | wc -l)
+ if [ $out -eq 0 ]; then
fail "Validate thread ${test_thread_exit_name} failure"
-
- diag "Health returned: $health_check_exit_code\n"
+ diag "Health returned:"
+ diag "stdout:"
+ file=${STDOUT_PATH}
+ while read line ; do
+ diag "$line"
+ done < ${file}
+
+ diag "stderr:"
+ file=${STDERR_PATH}
+ while read line ; do
+ diag "$line"
+ done < ${file}
stop_lttng_sessiond
return 1
+ else
+ pass "Validate thread ${test_thread_exit_name} failure"
+ stop_lttng_sessiond
fi
}
"LTTNG_THREAD_MANAGE_APPS"
"LTTNG_THREAD_REG_APPS")
-# Exit code value to indicate specific thread failure
-EXIT_CODE=(1 2 4)
+ERROR_STRING=(
+ "Thread \"Session daemon command\" is not responding in component \"sessiond\"."
+ "Thread \"Session daemon application manager\" is not responding in component \"sessiond\"."
+ "Thread \"Session daemon application registration\" is not responding in component \"sessiond\"."
+)
+
+STDOUT_PATH=$(mktemp)
+STDERR_PATH=$(mktemp)
THREAD_COUNT=${#THREAD[@]}
i=0
while [ "$i" -lt "$THREAD_COUNT" ]; do
- test_thread_exit "${THREAD[$i]}" "${EXIT_CODE[$i]}"
+ test_thread_exit "${THREAD[$i]}" "${ERROR_STRING[$i]}"
if [ $? -eq 1 ]; then
exit 1
skip $isroot "Root access is needed. Skipping LTTNG_THREAD_MANAGE_KERNEL tests." "3" ||
{
- test_thread_exit "LTTNG_THREAD_MANAGE_KERNEL" "8"
+ test_thread_exit "LTTNG_THREAD_MANAGE_KERNEL" "Thread \"Session daemon kernel\" is not responding in component \"sessiond\"."
}
+rm -f ${STDOUT_PATH}
+rm -f ${STDERR_PATH}
# TODO: Special case manage consumer, need to spawn consumer via commands.
#"LTTNG_THREAD_MANAGE_CONSUMER"
unset ${test_thread_stall_name}_STALL
# Check initial health status
- $CURDIR/$HEALTH_CHECK_BIN &> /dev/null
+ $CURDIR/$HEALTH_CHECK_BIN > /dev/null
# Wait
sleep 30
- # Check health status, exit code should indicate failure
- $CURDIR/$HEALTH_CHECK_BIN &> /dev/null
-
- health_check_exit_code=$?
-
- if [ $health_check_exit_code -eq $test_thread_exit_code ]; then
- pass "Validate that ${test_thread_stall_name} is stalled"
- else
- fail "Validate that ${test_thread_stall_name} is stalled"
- diag "Health returned: $health_check_exit_code"
+ # Check health status, should indicate failure
+ $CURDIR/$HEALTH_CHECK_BIN > ${STDOUT_PATH} 2> ${STDERR_PATH}
+
+ out=$(grep "${test_thread_error_string}" ${STDOUT_PATH} | wc -l)
+ if [ $out -eq 0 ]; then
+ fail "Validate thread ${test_thread_stall_name} is stalled"
+ diag "Health returned:"
+ diag "stdout:"
+ file=${STDOUT_PATH}
+ while read line ; do
+ diag "$line"
+ done < ${file}
+
+ diag "stderr:"
+ file=${STDERR_PATH}
+ while read line ; do
+ diag "$line"
+ done < ${file}
stop_lttng_sessiond
return 1
+ else
+ pass "Validate thread ${test_thread_stall_name} is stalled"
fi
# Wait
sleep 40
- # Check health status, exit code should now pass
- $CURDIR/$HEALTH_CHECK_BIN &> /dev/null
-
- health_check_exit_code=$?
+ # Check health status, should now pass
+ $CURDIR/$HEALTH_CHECK_BIN > ${STDOUT_PATH} 2> ${STDERR_PATH}
+
+ out=$(grep "${test_thread_error_string}" ${STDOUT_PATH} | wc -l)
+ if [ $out -ne 0 ]; then
+ fail "Validate thread ${test_thread_stall_name} is not longer stalled"
+ diag "Health returned:"
+ diag "stdout:"
+ file=${STDOUT_PATH}
+ while read line ; do
+ diag "$line"
+ done < ${file}
+
+ diag "stderr:"
+ file=${STDERR_PATH}
+ while read line ; do
+ diag "$line"
+ done < ${file}
- if [ $health_check_exit_code -eq 0 ]; then
- pass "Validate that ${test_thread_stall_name} is no longer stalled"
stop_lttng_sessiond
+ return 1
else
- fail "Validate that ${test_thread_stall_name} is no longer stalled"
- diag "Health returned: $health_check_exit_code\n"
+ pass "Validate thread ${test_thread_stall_name} is not longer stalled"
stop_lttng_sessiond
- return 1
fi
-
-
}
plan_tests $NUM_TESTS
# "LTTNG_THREAD_REG_APPS"
)
-# Exit code value to indicate specific thread failure
-EXIT_CODE=(1
- 2
-# 4
+ERROR_STRING=(
+ "Thread \"Session daemon command\" is not responding in component \"sessiond\"."
+ "Thread \"Session daemon application manager\" is not responding in component \"sessiond\"."
+ "Thread \"Session daemon application registration\" is not responding in component \"sessiond\"."
)
+STDOUT_PATH=$(mktemp)
+STDERR_PATH=$(mktemp)
+
THREAD_COUNT=${#THREAD[@]}
i=0
while [ "$i" -lt "$THREAD_COUNT" ]; do
- test_thread_stall "${THREAD[$i]}" "${EXIT_CODE[$i]}"
+ test_thread_stall "${THREAD[$i]}" "${ERROR_STRING[$i]}"
if [ $? -eq 1 ]; then
exit 1
skip $isroot "Root access is needed. Skipping LTTNG_THREAD_MANAGE_KERNEL tests." "4" ||
{
- test_thread_stall "LTTNG_THREAD_MANAGE_KERNEL" "8"
+ test_thread_stall "LTTNG_THREAD_MANAGE_KERNEL" "Thread \"Session daemon kernel\" is not responding in component \"sessiond\"."
}
+
+rm -f ${STDOUT_PATH}
+rm -f ${STDERR_PATH}
function test_tp_fail
{
test_tp_fail_name="$1"
- test_tp_fail_code="$2"
+ test_tp_error_string="$2"
diag "Test health failure with ${test_tp_fail_name}"
unset LD_PRELOAD
unset ${test_tp_fail_name}_TP_FAIL
- # Check health status, exit code should indicate failure
- $CURDIR/$HEALTH_CHECK_BIN &> /dev/null
+ # Check health status
+ $CURDIR/$HEALTH_CHECK_BIN > ${STDOUT_PATH} 2> ${STDERR_PATH}
- health_check_exit_code=$?
+ out=$(grep "${test_tp_error_string}" ${STDOUT_PATH} | wc -l)
+ if [ $out -eq 0 ]; then
+ fail "Validate thread ${test_tp_fail_name} failure"
+ diag "Health returned:"
+
+ diag "stdout:"
+ file=${STDOUT_PATH}
+ while read line ; do
+ diag "$line"
+ done < ${file}
+
+ diag "stderr:"
+ file=${STDERR_PATH}
+ while read line ; do
+ diag "$line"
+ done < ${file}
- if [ $health_check_exit_code -eq $test_tp_fail_code ]; then
- pass "Validate thread ${test_tp_fail_name} failure"
stop_lttng_sessiond
+ return 1
else
- fail "Validate thread ${test_tp_fail_name} failure"
- diag "Health returned: $health_check_exit_code"
+ pass "Validate thread ${test_tp_fail_name} failure"
stop_lttng_sessiond
- return 1
fi
}
THREAD=("LTTNG_THREAD_MANAGE_CLIENTS"
"LTTNG_THREAD_MANAGE_APPS")
-# Exit code value to indicate specific thread failure
-EXIT_CODE=(1 2)
+ERROR_STRING=(
+ "Thread \"Session daemon command\" is not responding in component \"sessiond\"."
+ "Thread \"Session daemon application manager\" is not responding in component \"sessiond\"."
+)
+
+STDOUT_PATH=$(mktemp)
+STDERR_PATH=$(mktemp)
THREAD_COUNT=${#THREAD[@]}
i=0
while [ "$i" -lt "$THREAD_COUNT" ]; do
- test_tp_fail "${THREAD[$i]}" "${EXIT_CODE[$i]}"
+ test_tp_fail "${THREAD[$i]}" "${ERROR_STRING[$i]}"
if [ $? -eq 1 ]; then
exit 1
skip $isroot "Root access is needed. Skipping LTTNG_THREAD_MANAGE_KERNEL tests." "3" ||
{
- test_tp_fail "LTTNG_THREAD_MANAGE_KERNEL" "8"
+ test_tp_fail "LTTNG_THREAD_MANAGE_KERNEL" "Thread \"Session daemon kernel\" is not responding in component \"sessiond\"."
}
+rm -f ${STDOUT_PATH}
+rm -f ${STDERR_PATH}
# TODO: Special case manage consumer, need to spawn consumer via commands.
#"LTTNG_THREAD_MANAGE_CONSUMER"