From bb77f740df749de1bba0e91b03c4eb23d5586e43 Mon Sep 17 00:00:00 2001 From: Mykola Golub Date: Wed, 2 Dec 2020 09:41:13 +0000 Subject: [PATCH] test/librbd: print difference if deep-copy or migration test fails It may appear to be useful to track the sporadic test failures observed on jenkins, not reproducible locally. Previously it was disabled because the output could be too large. But after the hexdump was improved to skip repeating bytes the output will hopefully be much smaller. Signed-off-by: Mykola Golub --- src/test/librbd/test_DeepCopy.cc | 4 ++-- src/test/librbd/test_Migration.cc | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/test/librbd/test_DeepCopy.cc b/src/test/librbd/test_DeepCopy.cc index 9f75089598a18..741a5d5448580 100644 --- a/src/test/librbd/test_DeepCopy.cc +++ b/src/test/librbd/test_DeepCopy.cc @@ -122,8 +122,8 @@ struct TestDeepCopy : public TestFixture { std::cout << "snap: " << (src_snap_name ? src_snap_name : "null") << ", block " << offset << "~" << read_size << " differs" << std::endl; - // std::cout << "src block: " << std::endl; src_bl.hexdump(std::cout); - // std::cout << "dst block: " << std::endl; dst_bl.hexdump(std::cout); + std::cout << "src block: " << std::endl; src_bl.hexdump(std::cout); + std::cout << "dst block: " << std::endl; dst_bl.hexdump(std::cout); } EXPECT_TRUE(src_bl.contents_equal(dst_bl)); offset += read_size; diff --git a/src/test/librbd/test_Migration.cc b/src/test/librbd/test_Migration.cc index 5410eab553e08..5f96d620e2604 100644 --- a/src/test/librbd/test_Migration.cc +++ b/src/test/librbd/test_Migration.cc @@ -144,11 +144,8 @@ struct TestMigration : public TestFixture { std::cout << description << ", block " << offset << "~" << read_size << " differs" << std::endl; - char *c = getenv("TEST_RBD_MIGRATION_VERBOSE"); - if (c != NULL && *c != '\0') { - std::cout << "src block: " << src_ictx->id << ": " << std::endl; src_bl.hexdump(std::cout); - std::cout << "dst block: " << dst_ictx->id << ": " << std::endl; dst_bl.hexdump(std::cout); - } + std::cout << "src block: " << src_ictx->id << ": " << std::endl; src_bl.hexdump(std::cout); + std::cout << "dst block: " << dst_ictx->id << ": " << std::endl; dst_bl.hexdump(std::cout); } EXPECT_TRUE(src_bl.contents_equal(dst_bl)); offset += read_size; -- 2.39.5