From 730daa34a4c1d0beb759510754b2ae20aa1387e8 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 16 2021 10:29:39 +0000 Subject: import open-vm-tools-11.0.5-3.el7_9.2 --- diff --git a/SOURCES/ovt-Rectify-a-log-spew-in-vmsvc-logging-vmware-vmsvc-roo.patch b/SOURCES/ovt-Rectify-a-log-spew-in-vmsvc-logging-vmware-vmsvc-roo.patch new file mode 100644 index 0000000..687175d --- /dev/null +++ b/SOURCES/ovt-Rectify-a-log-spew-in-vmsvc-logging-vmware-vmsvc-roo.patch @@ -0,0 +1,55 @@ +From 600b2bcde77c4add84d85b396af95433343def6a Mon Sep 17 00:00:00 2001 +From: Cathy Avery +Date: Thu, 14 Jan 2021 13:25:51 -0500 +Subject: [PATCH] Rectify a log spew in vmsvc logging (vmware-vmsvc-root.log ) + +RH-Author: Cathy Avery +Message-id: <20210114132551.5365-1-cavery@redhat.com> +Patchwork-id: 100651 +O-Subject: [RHEL-7.9.z open-vm-tools PATCH] Rectify a log spew in vmsvc logging (vmware-vmsvc-root.log ) +Bugzilla: 1911853 +RH-Acked-by: Vitaly Kuznetsov +RH-Acked-by: Mohammed Gamal + +Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1911853 +Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=34221678 +Branch: rhel7/master-11.0.5 +Tested: By QE +Upstream Status: upstream/stable-11.0.5 + +When a LSI Logic Parallel SCSI controller sits in PCI bus 0 +(SCSI controller 0), the Linux disk device enumeration does not provide +a "label" file with the controller name. This results in messages like + +"GuestInfoGetDiskDevice: Missing disk device name; VMDK mapping unavailable for "/var/log", fsName: "/dev/sda2" + +repeatedly appearing in the vmsvc logging. The patch converts what previously +was a warning message to a debug message and thus avoids the log spew. + +(cherry picked from commit 4ee0bd3c8ead89541ab7d196fb54e940e397420d) +Signed-off-by: Cathy Avery +Signed-off-by: Jon Maloy +--- + open-vm-tools/services/plugins/guestInfo/diskInfo.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/open-vm-tools/services/plugins/guestInfo/diskInfo.c b/open-vm-tools/services/plugins/guestInfo/diskInfo.c +index 878276ce..032c0928 100644 +--- a/open-vm-tools/services/plugins/guestInfo/diskInfo.c ++++ b/open-vm-tools/services/plugins/guestInfo/diskInfo.c +@@ -846,9 +846,9 @@ GuestInfoGetDiskDevice(const char *fsName, + */ + for (indx = 0; indx < partEntry->diskDevCnt; indx++) { + if (partEntry->diskDevNames[indx][0] == '\0') { +- g_warning("%s: Missing disk device name; VMDK mapping unavailable " +- "for \"%s\", fsName: \"%s\"\n", __FUNCTION__, +- partEntry->name, fsName); ++ g_debug("%s: Missing disk device name; VMDK mapping unavailable " ++ "for \"%s\", fsName: \"%s\"\n", __FUNCTION__, ++ partEntry->name, fsName); + partEntry->diskDevCnt = 0; + free(partEntry->diskDevNames); + partEntry->diskDevNames = NULL; +-- +2.18.2 + diff --git a/SPECS/open-vm-tools.spec b/SPECS/open-vm-tools.spec index cfeb6cc..8cace96 100644 --- a/SPECS/open-vm-tools.spec +++ b/SPECS/open-vm-tools.spec @@ -28,7 +28,7 @@ Name: open-vm-tools Version: %{toolsversion} -Release: 3%{?dist}.1 +Release: 3%{?dist}.2 Summary: Open Virtual Machine Tools for virtual machines hosted on VMware Group: Applications/System License: GPLv2 @@ -40,7 +40,7 @@ Source3: run-vmblock\x2dfuse.mount Source4: open-vm-tools.conf Source5: vmtoolsd.pam -ExclusiveArch: x86_64 %{ix86} +ExclusiveArch: x86_64 Patch0002: 0002-Fix-RELRO-flag.patch # For bz#1809753 - [ESXi][RHEL7.9]open-vm-tools add appinfo plugin patch @@ -49,6 +49,8 @@ Patch3: ovt-add-appinfo-plugin.patch Patch4: ovt-Fix-a-trivial-memory-leak-in-namespacetool.c.patch # For bz#1818109 - [ESXi][RHEL7.9]open-vm-tools coverity scan issue Patch5: ovt-Update-copyright-to-reflect-previous-change.patch +# For bz#1911853 - [ESXi][RHEL7.9][ warning] [guestinfo] GuestInfoGetDiskDevice: Missing disk device name; VMDK mapping unavailable for "/", fsName: "/dev/sda2" +Patch6: ovt-Rectify-a-log-spew-in-vmsvc-logging-vmware-vmsvc-roo.patch BuildRequires: autoconf BuildRequires: automake @@ -329,6 +331,11 @@ fi %{_bindir}/vmware-vgauth-smoketest %changelog +* Tue Feb 16 2021 Jon Maloy - 11.0.5-3.el7_9.2 +- ovt-Rectify-a-log-spew-in-vmsvc-logging-vmware-vmsvc-roo.patch [bz#1911853] +- Resolves: bz#1911853 + ([ESXi][RHEL7.9][ warning] [guestinfo] GuestInfoGetDiskDevice: Missing disk device name; VMDK mapping unavailable for "/", fsName: "/dev/sda2") + * Thu Oct 22 2020 Miroslav Rezanina - 11.0.5-3.el7_9.1 - ovt-Updated-PAM-configuration-file-to-follow-configured-.patch [bz#1840309] - Resolves: bz#1840309