Attachment 1695854 Details for Bug 1844853 – Backport of upstream commit fad72dba

[patch] Backport of upstream commit fad72dba

sos-bz1844853-nfs-Applied-upstream-commit-fad72dba.patch (text/plain), 3.20 KB, created by Pierguido Lambri on 2020-06-07 15:36:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pierguido Lambri

Created: 2020-06-07 15:36:56 UTC

Size: 3.20 KB

patch

obsolete

>From 633814b58bf7b36bd23e9e42a301616b3eb75c65 Mon Sep 17 00:00:00 2001
>From: Pierguido Lambri <plambri@redhat.com>
>Date: Sun, 7 Jun 2020 15:25:37 +0100
>Subject: [PATCH] [nfs] Applied upstream commit fad72dba
>
>This will merge the two 'nfs' and 'nfsserver' plugin into a single one.
>
>Signed-off-by: Pierguido Lambri <plambri@redhat.com>
>---
> sos/plugins/nfs.py       | 14 ++++++++--
> sos/plugins/nfsserver.py | 55 ----------------------------------------
> 2 files changed, 12 insertions(+), 57 deletions(-)
> delete mode 100644 sos/plugins/nfsserver.py
>
>diff --git a/sos/plugins/nfs.py b/sos/plugins/nfs.py
>index 833d79a..e8185fa 100644
>--- a/sos/plugins/nfs.py
>+++ b/sos/plugins/nfs.py
>@@ -14,7 +14,7 @@ class Nfs(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
>     """
>     plugin_name = 'nfs'
>     profiles = ('storage', 'network', 'nfs')
>-    packages = ['nfs-utils']
>+    packages = ('nfs-utils', )
> 
>     def setup(self):
>         self.add_copy_spec([
>@@ -24,8 +24,18 @@ class Nfs(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
>             "/proc/fs/nfsfs/servers",
>             "/proc/fs/nfsfs/volumes",
>             "/run/sysconfig/nfs-utils",
>+            "/etc/exports",
>+            "/etc/exports.d",
>+            "/var/lib/nfs/etab",
>+            "/var/lib/nfs/xtab",
>+            "/var/lib/nfs/rmtab",
>+        ])
>+
>+        self.add_cmd_output([
>+            "rpcinfo -p localhost",
>+            "nfsstat -o all",
>+            "exportfs -v",
>         ])
>-        return
> 
> 
> # vim: set et ts=4 sw=4 :
>diff --git a/sos/plugins/nfsserver.py b/sos/plugins/nfsserver.py
>deleted file mode 100644
>index 3ee08cd..0000000
>--- a/sos/plugins/nfsserver.py
>+++ /dev/null
>@@ -1,55 +0,0 @@
>-# Copyright (C) 2007 Red Hat, Inc., Eugene Teo <eteo@redhat.com>
>-
>-# This file is part of the sos project: https://github.com/sosreport/sos
>-#
>-# This copyrighted material is made available to anyone wishing to use,
>-# modify, copy, or redistribute it subject to the terms and conditions of
>-# version 2 of the GNU General Public License.
>-#
>-# See the LICENSE file in the source distribution for further information.
>-
>-from sos.plugins import Plugin, RedHatPlugin
>-import os
>-from stat import ST_SIZE
>-
>-
>-class NfsServer(Plugin, RedHatPlugin):
>-    """NFS server information
>-    """
>-
>-    plugin_name = 'nfsserver'
>-    profiles = ('storage', 'network', 'services', 'nfs')
>-
>-    def check_enabled(self):
>-        default_runlevel = self.policy.default_runlevel()
>-        nfs_runlevels = self.policy.runlevel_by_service("nfs")
>-        if default_runlevel in nfs_runlevels:
>-            return True
>-
>-        try:
>-            exports = os.stat("/etc/exports")[ST_SIZE]
>-            xtab = os.stat("/var/lib/nfs/xtab")[ST_SIZE]
>-            if exports or xtab:
>-                return True
>-        except OSError:
>-            pass
>-
>-        return False
>-
>-    def setup(self):
>-        self.add_copy_spec([
>-            "/etc/exports",
>-            "/etc/exports.d",
>-            "/var/lib/nfs/etab",
>-            "/var/lib/nfs/xtab",
>-            "/var/lib/nfs/rmtab"
>-        ])
>-
>-        self.add_cmd_output([
>-            "rpcinfo -p localhost",
>-            "nfsstat -o all",
>-            "exportfs -v"
>-        ])
>-
>-
>-# vim: set et ts=4 sw=4 :
>-- 
>2.25.4
>

Actions: View | Diff

Attachments on bug 1844853: 1695854