From 0e05af99c0e7f745a8f0954fa5c07ae90f7b13cb Mon Sep 17 00:00:00 2001 From: Yaming Kuang Date: Thu, 16 May 2024 20:17:14 -0700 Subject: [PATCH 1/2] unblock real drive testing with hdd --- conanfile.py | 2 +- src/lib/interfaces/drive_interface.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/conanfile.py b/conanfile.py index 178e6d7..89197c6 100644 --- a/conanfile.py +++ b/conanfile.py @@ -6,7 +6,7 @@ class IOMgrConan(ConanFile): name = "iomgr" - version = "11.3.1" + version = "11.3.2" homepage = "https://github.com/eBay/IOManager" description = "Asynchronous event manager" diff --git a/src/lib/interfaces/drive_interface.cpp b/src/lib/interfaces/drive_interface.cpp index 10d42d9..72ec291 100644 --- a/src/lib/interfaces/drive_interface.cpp +++ b/src/lib/interfaces/drive_interface.cpp @@ -178,6 +178,7 @@ static std::string get_raid_hdd_vendor_model_megcli() { #endif static std::string get_raid_hdd_vendor_model() { + return ""; // see this issue for more details: https://github.com/eBay/IOManager/issues/82 #ifdef MEGACLI_OPTION_ENABLED return get_raid_hdd_vendor_model_megcli(); #else @@ -216,7 +217,7 @@ drive_type DriveInterface::get_drive_type(const std::string& dev_name) { dtype = it->second; } else { dtype = detect_drive_type(dev_name); - LOGINFOMOD(iomgr, "Drive={} is detected to be drive_type={}", dev_name, dtype); + LOGINFO("Drive={} is detected to be drive_type={}", dev_name, dtype); s_dev_type.insert({dev_name, dtype}); } From bb2f7bc694e997c58ef1c16ac1d40a7a3e419f8a Mon Sep 17 00:00:00 2001 From: Yaming Kuang Date: Thu, 16 May 2024 21:33:27 -0700 Subject: [PATCH 2/2] fix log --- src/lib/interfaces/drive_interface.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/interfaces/drive_interface.cpp b/src/lib/interfaces/drive_interface.cpp index 72ec291..61bc8cc 100644 --- a/src/lib/interfaces/drive_interface.cpp +++ b/src/lib/interfaces/drive_interface.cpp @@ -433,7 +433,7 @@ std::error_code KernelDriveInterface::sync_write(IODevice* iodev, const char* da ++resubmit_cnt; } if (sisl_unlikely(written_size != size)) { - LOGWARN("Error during write offset={} write_size={} written_size={} errno={} fd={}", offset, size, written_size, + LOGWARN("Error during write offset={} size={} written_size={} errno={} fd={}", offset, size, written_size, errno, iodev->fd()); return std::error_code{((errno == 0) ? ERANGE : errno), std::generic_category()}; } else {