Skip to content

Commit ef2697e

Browse files
committed
Downgrade DM debugging messages to trace level
Commit 66e1fdf added logging to the DM module using the debug! macro. In practice these messages can be very noisy, especially for e.g. in the Stratis test suite (which calls the status() method on thin pool devices). This leads to lots of messages like the following: [2023-11-06T16:01:05Z DEBUG devicemapper::core::dm] Retrieving table status for stratis-1-private-50db9929d265403b820bb155c8f5ae89-thinpool-pool Running the Stratis test suite results in hundreds of these messages being logged at debug level. Downgrade the logging calls in the DM module from debug! to trace! to quiet this down.
1 parent dd7882a commit ef2697e

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

src/core/dm.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ impl DM {
384384
match retry_with_index(
385385
Fixed::from_millis(DM_REMOVE_MSLEEP_DELAY).take(DM_REMOVE_RETRIES - 1),
386386
|i| {
387-
debug!("Device remove attempt {} of {}", i, DM_REMOVE_RETRIES);
387+
trace!("Device remove attempt {} of {}", i, DM_REMOVE_RETRIES);
388388
self.try_device_remove(id, options)
389389
},
390390
) {
@@ -469,7 +469,7 @@ impl DM {
469469
pub fn device_info(&self, id: &DevId<'_>) -> DmResult<DeviceInfo> {
470470
let mut hdr = DmOptions::default().to_ioctl_hdr(Some(id), DmFlags::empty())?;
471471

472-
debug!("Retrieving info for {}", id);
472+
trace!("Retrieving info for {}", id);
473473
self.do_ioctl(dmi::DM_DEV_STATUS_CMD as u8, &mut hdr, None)
474474
.map(|(hdr, _)| hdr)
475475
}
@@ -489,7 +489,7 @@ impl DM {
489489
) -> DmResult<(DeviceInfo, Vec<(u64, u64, String, String)>)> {
490490
let mut hdr = options.to_ioctl_hdr(Some(id), DmFlags::DM_QUERY_INACTIVE_TABLE)?;
491491

492-
debug!("Waiting on event for {}", id);
492+
trace!("Waiting on event for {}", id);
493493
let (hdr_out, data_out) = self.do_ioctl(dmi::DM_DEV_WAIT_CMD as u8, &mut hdr, None)?;
494494

495495
let status = DM::parse_table_status(hdr.target_count, &data_out)?;
@@ -577,7 +577,7 @@ impl DM {
577577
// Flatten targets into a buf
578578
let data_in = cursor.into_inner();
579579

580-
debug!("Loading table \"{:?}\" for {}", targets, id);
580+
trace!("Loading table \"{:?}\" for {}", targets, id);
581581
self.do_ioctl(dmi::DM_TABLE_LOAD_CMD as u8, &mut hdr, Some(&data_in))
582582
.map(|(hdr, _)| hdr)
583583
}
@@ -586,7 +586,7 @@ impl DM {
586586
pub fn table_clear(&self, id: &DevId<'_>) -> DmResult<DeviceInfo> {
587587
let mut hdr = DmOptions::default().to_ioctl_hdr(Some(id), DmFlags::empty())?;
588588

589-
debug!("Clearing inactive dable for {}", id);
589+
trace!("Clearing inactive table for {}", id);
590590
self.do_ioctl(dmi::DM_TABLE_CLEAR_CMD as u8, &mut hdr, None)
591591
.map(|(hdr, _)| hdr)
592592
}
@@ -601,7 +601,7 @@ impl DM {
601601
pub fn table_deps(&self, id: &DevId<'_>, options: DmOptions) -> DmResult<Vec<Device>> {
602602
let mut hdr = options.to_ioctl_hdr(Some(id), DmFlags::DM_QUERY_INACTIVE_TABLE)?;
603603

604-
debug!("Querying dependencies for {}", id);
604+
trace!("Querying dependencies for {}", id);
605605
let (_, data_out) = self.do_ioctl(dmi::DM_TABLE_DEPS_CMD as u8, &mut hdr, None)?;
606606

607607
if data_out.is_empty() {
@@ -707,7 +707,7 @@ impl DM {
707707
DmFlags::DM_NOFLUSH | DmFlags::DM_STATUS_TABLE | DmFlags::DM_QUERY_INACTIVE_TABLE,
708708
)?;
709709

710-
debug!("Retrieving table status for {}", id);
710+
trace!("Retrieving table status for {}", id);
711711
let (hdr_out, data_out) = self.do_ioctl(dmi::DM_TABLE_STATUS_CMD as u8, &mut hdr, None)?;
712712

713713
let status = DM::parse_table_status(hdr_out.target_count, &data_out)?;
@@ -721,7 +721,7 @@ impl DM {
721721
pub fn list_versions(&self) -> DmResult<Vec<(String, u32, u32, u32)>> {
722722
let mut hdr = DmOptions::default().to_ioctl_hdr(None, DmFlags::empty())?;
723723

724-
debug!("Listing loaded target versions");
724+
trace!("Listing loaded target versions");
725725
let (_, data_out) = self.do_ioctl(dmi::DM_LIST_VERSIONS_CMD as u8, &mut hdr, None)?;
726726

727727
let mut targets = Vec::new();
@@ -805,7 +805,7 @@ impl DM {
805805
pub fn arm_poll(&self) -> DmResult<DeviceInfo> {
806806
let mut hdr = DmOptions::default().to_ioctl_hdr(None, DmFlags::empty())?;
807807

808-
debug!("Issuing device-mapper arm poll command");
808+
trace!("Issuing device-mapper arm poll command");
809809
self.do_ioctl(dmi::DM_DEV_ARM_POLL_CMD as u8, &mut hdr, None)
810810
.map(|(hdr, _)| hdr)
811811
}

0 commit comments

Comments
 (0)