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

Jump to bottom

Add relay snapshot test scenario with low bandwidth on data socket #149

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+146 −127
Open

Add relay snapshot test scenario with low bandwidth on data socket #149

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21cb188
Tests: cleanup relay bandwidth test
frdeso Nov 30, 2018
ebb47fa
Tests: cleanup: reuse snapshot utils functions
frdeso Dec 4, 2018
1bf4cb5
Tests: add snapshot with low bandwidth data socket testcase
frdeso Nov 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
Next Next commit
Tests: cleanup: reuse snapshot utils functions 
Signed-off-by: Francis Deslauriers <[email protected]>
  • Loading branch information
@frdeso
frdeso committed Dec 4, 2018
commit ebb47fa6605e0d9b33bf5ab3896dce3b4f5bd7b7
23 changes: 4 additions & 19 deletions tests/regression/tools/snapshots/test_kernel_streaming
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,6 @@ NUM_TESTS=36

source $TESTDIR/utils/utils.sh

function snapshot_add_output ()
{
local sess_name=$1
local trace_path=$2
local name=$3
local extra_opt=""

if [ ! -z $name ]; then
extra_opt="-n $name"
fi

$TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot add-output -s $sess_name $extra_opt $trace_path >/dev/null 2>&1
ok $? "Added snapshot output $trace_path"
}

# Test a snapshot using a default name for the output destination.
function test_kernel_default_name_with_del()
{
Expand All @@ -51,7 +36,7 @@ function test_kernel_default_name_with_del()
enable_lttng_mmap_overwrite_kernel_channel $SESSION_NAME $CHANNEL_NAME
lttng_enable_kernel_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
start_lttng_tracing_ok $SESSION_NAME
snapshot_add_output $SESSION_NAME "net:https://localhost"
lttng_snapshot_add_output_ok $SESSION_NAME "net:https://localhost"
lttng_snapshot_record $SESSION_NAME

# Validate test
Expand All @@ -61,7 +46,7 @@ function test_kernel_default_name_with_del()
fi

lttng_snapshot_del_output_ok $SESSION_NAME 1
snapshot_add_output $SESSION_NAME "net:https://localhost"
lttng_snapshot_add_output_ok $SESSION_NAME "net:https://localhost"
lttng_snapshot_record $SESSION_NAME

# Validate test with the next ID since a del output was done prior.
Expand All @@ -84,7 +69,7 @@ function test_kernel_default_name()
enable_lttng_mmap_overwrite_kernel_channel $SESSION_NAME $CHANNEL_NAME
lttng_enable_kernel_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
start_lttng_tracing_ok $SESSION_NAME
snapshot_add_output $SESSION_NAME "net:https://localhost"
lttng_snapshot_add_output_ok $SESSION_NAME "net:https://localhost"
lttng_snapshot_record $SESSION_NAME
stop_lttng_tracing_ok $SESSION_NAME
destroy_lttng_session_ok $SESSION_NAME
Expand All @@ -106,7 +91,7 @@ function test_kernel_custom_name()
enable_lttng_mmap_overwrite_kernel_channel $SESSION_NAME $CHANNEL_NAME
lttng_enable_kernel_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
start_lttng_tracing_ok $SESSION_NAME
snapshot_add_output $SESSION_NAME "net:https://localhost" $name
lttng_snapshot_add_output_ok $SESSION_NAME "net:https://localhost" $name
lttng_snapshot_record $SESSION_NAME
stop_lttng_tracing_ok $SESSION_NAME
destroy_lttng_session_ok $SESSION_NAME
Expand Down
25 changes: 5 additions & 20 deletions tests/regression/tools/snapshots/test_ust_streaming
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,21 +39,6 @@ if [ ! -x "$TESTAPP_BIN" ]; then
BAIL_OUT "No UST events binary detected."
fi

function snapshot_add_output ()
{
local sess_name=$1
local trace_path=$2
local name=$3
local extra_opt=""

if [ ! -z $name ]; then
extra_opt="-n $name"
fi

$TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot add-output -s $sess_name $extra_opt $trace_path >/dev/null 2>&1
ok $? "Added snapshot output $trace_path"
}

# Start trace application and return once one event has been hit.
function start_test_app()
{
Expand Down Expand Up @@ -95,7 +80,7 @@ function test_ust_default_name_with_del()

start_test_app

snapshot_add_output $SESSION_NAME "net:https://localhost"
lttng_snapshot_add_output_ok $SESSION_NAME "net:https://localhost"
lttng_snapshot_record $SESSION_NAME

# Validate test
Expand All @@ -107,7 +92,7 @@ function test_ust_default_name_with_del()
fi

lttng_snapshot_del_output_ok $SESSION_NAME 1
snapshot_add_output $SESSION_NAME "net:https://localhost"
lttng_snapshot_add_output_ok $SESSION_NAME "net:https://localhost"
lttng_snapshot_record $SESSION_NAME

# Validate test with the next ID since a del output was done prior.
Expand Down Expand Up @@ -136,7 +121,7 @@ function test_ust_default_name()

start_test_app

snapshot_add_output $SESSION_NAME "net:https://localhost"
lttng_snapshot_add_output_ok $SESSION_NAME "net:https://localhost"
lttng_snapshot_record $SESSION_NAME
stop_lttng_tracing_ok $SESSION_NAME
destroy_lttng_session_ok $SESSION_NAME
Expand All @@ -159,7 +144,7 @@ function test_ust_default_name_custom_uri()

start_test_app

snapshot_add_output $SESSION_NAME "-C tcp:https://localhost:5342 -D tcp:https://localhost:5343"
lttng_snapshot_add_output_ok $SESSION_NAME "-C tcp:https://localhost:5342 -D tcp:https://localhost:5343"
lttng_snapshot_record $SESSION_NAME
stop_lttng_tracing_ok $SESSION_NAME
destroy_lttng_session_ok $SESSION_NAME
Expand All @@ -186,7 +171,7 @@ function test_ust_custom_name()

start_test_app

snapshot_add_output $SESSION_NAME "net:https://localhost" $name
lttng_snapshot_add_output_ok $SESSION_NAME "net:https://localhost" $name
lttng_snapshot_record $SESSION_NAME
stop_lttng_tracing_ok $SESSION_NAME
destroy_lttng_session_ok $SESSION_NAME
Expand Down
42 changes: 5 additions & 37 deletions tests/regression/tools/snapshots/ust_test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,39 +81,6 @@ function stop_test_apps()
APPS_PID=
}

function snapshot_add_output ()
{
local sess_name=$1
local trace_path=$2
local name=$3
local max_size=$4
local extra_opt=""

if [ ! -z $name ]; then
extra_opt+=" -n $name "
fi

if [ ! -z $max_size ]; then
extra_opt+=" -m $max_size "
fi

$TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot add-output \
-s $sess_name $extra_opt $trace_path > /dev/null 2>&1

ok $? "Added snapshot output $trace_path ($extra_opt)"
}

function snapshot_del_output ()
{
local sess_name=$1
local name=$2

$TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot del-output \
-s $sess_name $name > /dev/null 2>&1

ok $? "Deleted snapshot output named $name"
}

function enable_mmap_overwrite_subbuf_ust_channel ()
{
local sess_name=$1
Expand Down Expand Up @@ -164,15 +131,15 @@ function test_ust_list_output ()

start_lttng_tracing_ok $SESSION_NAME

snapshot_add_output $SESSION_NAME "file:https://$TRACE_PATH" ${output_names[0]}
lttng_snapshot_add_output_ok $SESSION_NAME "file:https://$TRACE_PATH" ${output_names[0]}

$TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot list-output \
-s $SESSION_NAME 2>&1 | grep ${output_names[0]} > /dev/null
ok $? "Snapshot named ${output_names[0]} present in list-output listing"

snapshot_del_output $SESSION_NAME ${output_names[0]}
lttng_snapshot_del_output_ok $SESSION_NAME ${output_names[0]}

snapshot_add_output $SESSION_NAME "file:https://$TRACE_PATH" ${output_names[1]}
lttng_snapshot_add_output_ok $SESSION_NAME "file:https://$TRACE_PATH" ${output_names[1]}

$TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot list-output \
-s $SESSION_NAME 2>&1 | grep ${output_names[1]} > /dev/null
Expand Down Expand Up @@ -306,6 +273,7 @@ function test_ust_local_snapshot_max_size ()
{
NR_ITER=-1
NR_USEC_WAIT=100
snapshot_name="max_size_snap"
page_size=`getconf PAGE_SIZE`
num_cpus=$(conf_proc_count)

Expand All @@ -323,7 +291,7 @@ function test_ust_local_snapshot_max_size ()
enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
start_lttng_tracing_ok $SESSION_NAME

snapshot_add_output $SESSION_NAME "file:https://$TRACE_PATH" "" $max_size
lttng_snapshot_add_output_ok $SESSION_NAME "file:https://$TRACE_PATH" $snapshot_name $max_size

# Returns once the application has at least fired ONE tracepoint.
start_test_app
Expand Down
18 changes: 15 additions & 3 deletions tests/utils/utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1235,14 +1235,26 @@ function lttng_snapshot_add_output ()
local expected_to_fail=$1
local sess_name=$2
local trace_path=$3
local name=$4
local max_size=$5
local extra_opt=""

$TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot add-output -s $sess_name file:https://$trace_path 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
if [ ! -z $name ]; then
extra_opt+=" -n $name"
fi

if [ ! -z $max_size ]; then
extra_opt+=" -m $max_size"
fi

$TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot add-output \
-s $sess_name $extra_opt $trace_path 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
ret=$?
if [[ $expected_to_fail -eq 1 ]]; then
test "$ret" -ne "0"
ok $? "Added snapshot output file:https://$trace_path failed as expected"
ok $? "Added snapshot output $trace_path failed as expected"
else
ok $ret "Added snapshot output file:https://$trace_path"
ok $ret "Added snapshot output $trace_path ($extra_opt)"
fi
}

Expand Down