|
 |
730daa |
From 600b2bcde77c4add84d85b396af95433343def6a Mon Sep 17 00:00:00 2001
|
|
|
730daa |
From: Cathy Avery <cavery@redhat.com>
|
|
|
730daa |
Date: Thu, 14 Jan 2021 13:25:51 -0500
|
|
|
730daa |
Subject: [PATCH] Rectify a log spew in vmsvc logging (vmware-vmsvc-root.log )
|
|
|
730daa |
|
|
|
730daa |
RH-Author: Cathy Avery <cavery@redhat.com>
|
|
|
730daa |
Message-id: <20210114132551.5365-1-cavery@redhat.com>
|
|
|
730daa |
Patchwork-id: 100651
|
|
|
730daa |
O-Subject: [RHEL-7.9.z open-vm-tools PATCH] Rectify a log spew in vmsvc logging (vmware-vmsvc-root.log )
|
|
|
730daa |
Bugzilla: 1911853
|
|
|
730daa |
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
|
|
730daa |
RH-Acked-by: Mohammed Gamal <mgamal@redhat.com>
|
|
|
730daa |
|
|
|
730daa |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1911853
|
|
|
730daa |
Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=34221678
|
|
|
730daa |
Branch: rhel7/master-11.0.5
|
|
|
730daa |
Tested: By QE
|
|
|
730daa |
Upstream Status: upstream/stable-11.0.5
|
|
|
730daa |
|
|
|
730daa |
When a LSI Logic Parallel SCSI controller sits in PCI bus 0
|
|
|
730daa |
(SCSI controller 0), the Linux disk device enumeration does not provide
|
|
|
730daa |
a "label" file with the controller name. This results in messages like
|
|
|
730daa |
|
|
|
730daa |
"GuestInfoGetDiskDevice: Missing disk device name; VMDK mapping unavailable for "/var/log", fsName: "/dev/sda2"
|
|
|
730daa |
|
|
|
730daa |
repeatedly appearing in the vmsvc logging. The patch converts what previously
|
|
|
730daa |
was a warning message to a debug message and thus avoids the log spew.
|
|
|
730daa |
|
|
|
730daa |
(cherry picked from commit 4ee0bd3c8ead89541ab7d196fb54e940e397420d)
|
|
|
730daa |
Signed-off-by: Cathy Avery <cavery@redhat.com>
|
|
|
730daa |
Signed-off-by: Jon Maloy <jmaloy.redhat.com>
|
|
|
730daa |
---
|
|
|
730daa |
open-vm-tools/services/plugins/guestInfo/diskInfo.c | 6 +++---
|
|
|
730daa |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
730daa |
|
|
|
730daa |
diff --git a/open-vm-tools/services/plugins/guestInfo/diskInfo.c b/open-vm-tools/services/plugins/guestInfo/diskInfo.c
|
|
|
730daa |
index 878276ce..032c0928 100644
|
|
|
730daa |
--- a/open-vm-tools/services/plugins/guestInfo/diskInfo.c
|
|
|
730daa |
+++ b/open-vm-tools/services/plugins/guestInfo/diskInfo.c
|
|
|
730daa |
@@ -846,9 +846,9 @@ GuestInfoGetDiskDevice(const char *fsName,
|
|
|
730daa |
*/
|
|
|
730daa |
for (indx = 0; indx < partEntry->diskDevCnt; indx++) {
|
|
|
730daa |
if (partEntry->diskDevNames[indx][0] == '\0') {
|
|
|
730daa |
- g_warning("%s: Missing disk device name; VMDK mapping unavailable "
|
|
|
730daa |
- "for \"%s\", fsName: \"%s\"\n", __FUNCTION__,
|
|
|
730daa |
- partEntry->name, fsName);
|
|
|
730daa |
+ g_debug("%s: Missing disk device name; VMDK mapping unavailable "
|
|
|
730daa |
+ "for \"%s\", fsName: \"%s\"\n", __FUNCTION__,
|
|
|
730daa |
+ partEntry->name, fsName);
|
|
|
730daa |
partEntry->diskDevCnt = 0;
|
|
|
730daa |
free(partEntry->diskDevNames);
|
|
|
730daa |
partEntry->diskDevNames = NULL;
|
|
|
730daa |
--
|
|
|
730daa |
2.18.2
|
|
|
730daa |
|