diff options
| author | Martin Schwenke <martin@meltin.net> | 2013-11-28 17:11:03 +1100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2013-12-05 00:40:37 +0100 |
| commit | a3fd8ddf3586f5e255df181d9b4e998f3c85e928 (patch) | |
| tree | 6babe8476ce2d820f693fdbc31afe67645c56416 /ctdb/tests | |
| parent | 28acce28626d17c27af831240a5ea593e0410616 (diff) | |
| download | samba-a3fd8ddf3586f5e255df181d9b4e998f3c85e928.tar.gz samba-a3fd8ddf3586f5e255df181d9b4e998f3c85e928.tar.xz samba-a3fd8ddf3586f5e255df181d9b4e998f3c85e928.zip | |
ctdb/tests/integration: Remove the time logging code
This hasn't been required for a long time and is probably broken. If
it is needed in future then we know where to find it.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'ctdb/tests')
| -rw-r--r-- | ctdb/tests/scripts/integration.bash | 53 | ||||
| -rwxr-xr-x | ctdb/tests/simple/00_ctdb_onnode.sh | 9 |
2 files changed, 0 insertions, 62 deletions
diff --git a/ctdb/tests/scripts/integration.bash b/ctdb/tests/scripts/integration.bash index 0f1af3ae35b..e9e3b1b36ea 100644 --- a/ctdb/tests/scripts/integration.bash +++ b/ctdb/tests/scripts/integration.bash @@ -23,54 +23,6 @@ PATH="${TEST_SCRIPTS_DIR}:${PATH}" ###################################################################### -ctdb_check_time_logs () -{ - local threshold=20 - - local jump=false - local prev="" - local ds_prev="" - local node="" - - out=$(onnode all tail -n 20 "${TEST_VAR_DIR}/ctdb.test.time.log" 2>&1) - - if [ $? -eq 0 ] ; then - local line - while read line ; do - case "$line" in - \>\>\ NODE:\ *\ \<\<) - node="${line#>> NODE: }" - node=${node% <<*} - ds_prev="" - ;; - *\ *) - set -- $line - ds_curr="$1${2:0:1}" - if [ -n "$ds_prev" ] && \ - [ $(($ds_curr - $ds_prev)) -ge $threshold ] ; then - echo "Node $node had time jump of $(($ds_curr - $ds_prev))ds between $(date +'%T' -d @${ds_prev%?}) and $(date +'%T' -d @${ds_curr%?})" - jump=true - fi - prev="$line" - ds_prev="$ds_curr" - ;; - esac - done <<<"$out" - else - echo Error getting time logs - fi - if $jump ; then - echo "Check time sync (test client first):" - date - onnode -p all date - echo "Information from test client:" - hostname - top -b -n 1 - echo "Information from cluster nodes:" - onnode all "top -b -n 1 ; echo '/proc/slabinfo' ; cat /proc/slabinfo" - fi -} - ctdb_test_exit () { local status=$? @@ -86,11 +38,6 @@ ctdb_test_exit () echo "*** TEST COMPLETED (RC=$status) AT $(date '+%F %T'), CLEANING UP..." - if [ -z "$TEST_LOCAL_DAEMONS" -a -n "$CTDB_TEST_TIME_LOGGING" -a \ - $status -ne 0 ] ; then - ctdb_check_time_logs - fi - eval "$ctdb_test_exit_hook" || true unset ctdb_test_exit_hook diff --git a/ctdb/tests/simple/00_ctdb_onnode.sh b/ctdb/tests/simple/00_ctdb_onnode.sh index 3bc8f8b2fee..dfd115976d2 100755 --- a/ctdb/tests/simple/00_ctdb_onnode.sh +++ b/ctdb/tests/simple/00_ctdb_onnode.sh @@ -27,12 +27,3 @@ ctdb_test_init "$@" echo "Checking connectivity between nodes..." onnode all onnode -p all hostname - -# We're seeing some weirdness with CTDB controls timing out. We're -# wondering if time is jumping forward, so this creates a time log on -# each node that we can examine later if tests fail weirdly. -if [ -z "$TEST_LOCAL_DAEMONS" -a -n "$CTDB_TEST_TIME_LOGGING" ] ; then - echo "Starting time logging on each node..." - f="${TEST_VAR_DIR}/ctdb.test.time.log" - onnode -p all "[ -f $f ] || while : ; do date '+%s %N' ; sleep 1 ; done >$f 2>&1 </dev/null &" & -fi |