nfs-ganesha 2.8.0.3

Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
This commit is contained in:
Kaleb S. KEITHLEY 2019-07-01 08:19:37 -04:00
parent d8b0c47aad
commit 07543d66ee
2 changed files with 7 additions and 5 deletions

View File

@ -1663,7 +1663,7 @@ diff -ur nfs-ganesha-2.8.0.2/src/scripts/ganeshactl/Ganesha/ganesha_mgr_utils.py
['Name', ['Name',
diff -ur nfs-ganesha-2.8.0.2/src/scripts/ganeshactl/Ganesha/glib_dbus_stats.py nfs-ganesha-2.8.0.3/src/scripts/ganeshactl/Ganesha/glib_dbus_stats.py diff -ur nfs-ganesha-2.8.0.2/src/scripts/ganeshactl/Ganesha/glib_dbus_stats.py nfs-ganesha-2.8.0.3/src/scripts/ganeshactl/Ganesha/glib_dbus_stats.py
--- nfs-ganesha-2.8.0.2/src/scripts/ganeshactl/Ganesha/glib_dbus_stats.py 2019-06-14 18:23:42.000000000 -0400 --- nfs-ganesha-2.8.0.2/src/scripts/ganeshactl/Ganesha/glib_dbus_stats.py 2019-06-14 18:23:42.000000000 -0400
+++ nfs-ganesha-2.8.0.3/src/scripts/ganeshactl/Ganesha/glib_dbus_stats.py 2019-06-28 18:19:39.000000000 -0400 +++ nfs-ganesha-2.8.0.3/src/scripts/ganeshactl/Ganesha/glib_dbus_stats.py 2019-07-01 08:10:41.308197046 -0400
@@ -137,7 +137,11 @@ @@ -137,7 +137,11 @@
stats_state = self.exportmgrobj.get_dbus_method("GetFULLV4Stats", stats_state = self.exportmgrobj.get_dbus_method("GetFULLV4Stats",
self.dbus_exportstats_name) self.dbus_exportstats_name)
@ -1671,9 +1671,9 @@ diff -ur nfs-ganesha-2.8.0.2/src/scripts/ganeshactl/Ganesha/glib_dbus_stats.py n
- -
+ # authentication + # authentication
+ def auth_stats(self): + def auth_stats(self):
+ stats_state = self.exportmgrobj.get_dbus_method("GetAuthStats", + stats_state = self.exportmgrobj.get_dbus_method("GetAuthStats",
+ self.dbus_exportstats_name) + self.dbus_exportstats_name)
+ return DumpAuth(stats_state()) + return DumpAuth(stats_state())
class RetrieveClientStats(): class RetrieveClientStats():
def __init__(self): def __init__(self):
@ -1698,7 +1698,7 @@ diff -ur nfs-ganesha-2.8.0.2/src/scripts/ganeshactl/Ganesha/glib_dbus_stats.py n
+ self.success = stats[0] + self.success = stats[0]
+ self.status = stats[1] + self.status = stats[1]
+ if self.success: + if self.success:
+ self.timestamp = (stats[2][0], stats[2][1]) + self.timestamp = (stats[2][0], stats[2][1])
+ self.gctotal = stats[3][0] + self.gctotal = stats[3][0]
+ self.gclatency = stats[3][1] + self.gclatency = stats[3][1]
+ self.gcmax = stats[3][2] + self.gcmax = stats[3][2]
@ -1731,6 +1731,7 @@ diff -ur nfs-ganesha-2.8.0.2/src/scripts/ganeshactl/Ganesha/glib_dbus_stats.py n
class DumpFULLV3Stats(): class DumpFULLV3Stats():
def __init__(self, status): def __init__(self, status):
self.stats = status self.stats = status
Only in nfs-ganesha-2.8.0.3/src/scripts/ganeshactl/Ganesha: glib_dbus_stats.py.orig
diff -ur nfs-ganesha-2.8.0.2/src/scripts/ganeshactl/ganesha_mgr.py nfs-ganesha-2.8.0.3/src/scripts/ganeshactl/ganesha_mgr.py diff -ur nfs-ganesha-2.8.0.2/src/scripts/ganeshactl/ganesha_mgr.py nfs-ganesha-2.8.0.3/src/scripts/ganeshactl/ganesha_mgr.py
--- nfs-ganesha-2.8.0.2/src/scripts/ganeshactl/ganesha_mgr.py 2019-06-14 18:23:42.000000000 -0400 --- nfs-ganesha-2.8.0.2/src/scripts/ganeshactl/ganesha_mgr.py 2019-06-14 18:23:42.000000000 -0400
+++ nfs-ganesha-2.8.0.3/src/scripts/ganeshactl/ganesha_mgr.py 2019-06-28 18:19:39.000000000 -0400 +++ nfs-ganesha-2.8.0.3/src/scripts/ganeshactl/ganesha_mgr.py 2019-06-28 18:19:39.000000000 -0400

View File

@ -501,6 +501,7 @@ Development headers and auxiliary files for developing with %{name}.
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1
%build %build
cd src && %cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ cd src && %cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \