From 1475bdd1f7b6cd434a6e1f8439b2a8a21111942a Mon Sep 17 00:00:00 2001 From: Ross Zwisler Date: Tue, 5 Dec 2017 17:37:43 -0700 Subject: [PATCH] dm-log-writes: only replay log to marks that exist The 'replay-log' executable will replay the dm-log-writes log until the given mark, or until the end of the log if the mark isn't found. This means that if the mark you're looking for was never inserted in the log or if you give garbage to _log_writes_replay_log() the entire log will be replayed. This can cause unexpected test results. Fix this by making sure that the mark we're given actually exists in the log before we allow the replay. Signed-off-by: Ross Zwisler Reviewed-by: Amir Goldstein Signed-off-by: Eryu Guan --- common/dmlogwrites | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/common/dmlogwrites b/common/dmlogwrites index 247c7442..05829dbc 100644 --- a/common/dmlogwrites +++ b/common/dmlogwrites @@ -72,6 +72,10 @@ _log_writes_replay_log() { _mark=$1 + $here/src/log-writes/replay-log --log $LOGWRITES_DEV --find \ + --end-mark $_mark >> $seqres.full 2>&1 + [ $? -ne 0 ] && _fail "mark '$_mark' does not exist" + $here/src/log-writes/replay-log --log $LOGWRITES_DEV --replay $SCRATCH_DEV \ --end-mark $_mark >> $seqres.full 2>&1 [ $? -ne 0 ] && _fail "replay failed" -- 2.47.3