Skip to content

Commit

Permalink
Merge pull request #83 from yamingk/yk_hdd
Browse files Browse the repository at this point in the history
unblock real drive testing with hdd
  • Loading branch information
yamingk authored May 21, 2024
2 parents a13e9b8 + bb2f7bc commit 9ac4f8f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 3 additions & 2 deletions src/lib/interfaces/drive_interface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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});
}

Expand Down Expand Up @@ -432,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 {
Expand Down

0 comments on commit 9ac4f8f

Please sign in to comment.