Skip to contentSkip to conversation

Flight Data Recorder Update

PATCH New Steve Dickson 1 participant 6 messages Jan 30, 2022

Subsystems (3)
lore
Share & tools
lore
#2 lore raw

PATCH 2/5 fdr.spec: logrotate clean up

In reply to Steve Dickson

Add an requirement for logrotate to be
install and put the nfs.logrotate into
its proper place.

---
 buildrpm/1.3/fdr.spec | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
buildrpm/1.3/fdr.spec +5 -4
index 40dedc9..3484659 100644
@@ -2,7 +2,7 @@ Summary:	A daemon which enables ftrace probes and harvests the data
 Name:		fdr
 URL:		https://github.com/oracle/fdr.git
 Version:	1.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	UPL
 Source0:	http://people.redhat.com/steved/fdr/%{name}-%{version}.tar.xz
 
@@ -10,7 +10,7 @@ BuildRequires:	gcc
 BuildRequires:	make
 BuildRequires:	sed
 BuildRequires:	systemd-rpm-macros
-Requires:	systemd
+Requires:	systemd logrotate
 
 %description
 The flight data recorder, a daemon which enables ftrace probes
@@ -30,7 +30,8 @@ install -m 755 fdrd %{buildroot}/%{_sbindir}
 
 mkdir -p %{buildroot}%{_datadir}/fdr/samples
 install -m 644 samples/nfs %{buildroot}/%{_datadir}/fdr/samples
-install -m 644 samples/nfs.logrotate %{buildroot}/%{_datadir}/fdr/samples
+mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
+install -m 644 samples/nfs.logrotate %{buildroot}/%{_sysconfdir}/logrotate.d/nfs
 
 mkdir -p %{buildroot}/%{_unitdir}
 install -m 644 %{name}.service %{buildroot}/%{_unitdir}/%{name}.service
@@ -51,7 +52,7 @@ install -m 644 fdrd.man %{buildroot}/%{_mandir}/man8/fdrd.8
 %{_sbindir}/fdrd
 %{_unitdir}/fdr.service
 %{_datadir}/fdr/samples/nfs
-%{_datadir}/fdr/samples/nfs.logrotate
+%{_sysconfdir}/logrotate.d/nfs
 %{_mandir}/man8/*
 %doc README.md
 %license LICENSE
Signature · 1 line
2.34.1
#0 lore raw

cover Flight Data Recorder Update

Here a few updates to the FDR package that
will allow it to work out of the box when
the RPM is install... Kinda.

When the rpm is installed, the daemon is not enable or started and the config file is not enabled. But it makes much easier set a tracepoint. Uncomment the needed tracepoint and start the fdrd daemon. Then do tail -f on /var/log/nfs.log.

The package is very light weight: one daemon, two config files and one example file. The config file that is installed has all of the nfs,nfsv4 and sunrpc tracepoints, commented out.

The first 4 patches are clean up... Making things work right out of the box and conforming to current presidencies. The last patch, installing an nfsall.conf config, could be questionable. Do the maintainers want to maintain config files or have the distros do it?

I guess the bottom line is this. At the last bakeathon we talked about moving away from rpcdebug setting dprintks to tracepoints (which is a good thing IMHO). Now, it is not clear how it can be done, but I'm hoping this is the first step in that direction.

Steve Dickson (5):
Makefile: cleaned up the usage of RPMBUILD_DIR fdr.spec: logrotate clean up
systemd: rename service file.
saveto verb: Document updated
configs: Add an nfsall.conf config file

 Makefile                    |   8 +-
 buildrpm/1.3/fdr.spec       |  25 ++-
 configs/nfsall.conf         | 319 ++++++++++++++++++++++++++++++++++++
 fdrd.man                    |   9 +-
 fdr.service => fdrd.service |   0
 samples/nfs                 |   2 +
 6 files changed, 349 insertions(+), 14 deletions(-)
 create mode 100644 configs/nfsall.conf
 rename fdr.service => fdrd.service (100%)
Signature · 1 line
2.34.1
#1 lore raw

PATCH 1/5 Makefile: cleaned up the usage of RPMBUILD_DIR

---
 Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
Makefile +4 -4
index ac4a501..34d7279 100644
@@ -46,11 +46,11 @@ release:
 
 rpm: tarball
 	cp buildrpm/$(LATEST_VERS)/fdr.spec \
-		$(RPMBUILD_DIR)/rpmbuild/SPECS/fdr.spec
-	rpmbuild -bb $(RPMBUILD_DIR)/rpmbuild/SPECS/fdr.spec 
+		$(RPMBUILD_DIR)/SPECS/fdr.spec
+	rpmbuild -bb $(RPMBUILD_DIR)/SPECS/fdr.spec 
 
 srpm: tarball
 	cp buildrpm/$(LATEST_VERS)/fdr.spec \
-		$(RPMBUILD_DIR)/rpmbuild/SPECS/fdr.spec
-	rpmbuild -bs $(RPMBUILD_DIR)/rpmbuild/SPECS/fdr.spec 
+		$(RPMBUILD_DIR)/SPECS/fdr.spec
+	rpmbuild -bs $(RPMBUILD_DIR)/SPECS/fdr.spec 
 
Signature · 1 line
2.34.1
#5 lore raw

PATCH 5/5 configs: Add an nfsall.conf config file

In reply to Steve Dickson

The nfsall.conf file list all the possible nfs, nfsv4 and sunrpc tracepoints, commented out. The file will be installed into the /etc/fdr.d, allowing to easily set any and all NFS tracepoints.

---
 buildrpm/1.3/fdr.spec |   6 +
 configs/nfsall.conf   | 319 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 325 insertions(+)
 create mode 100644 configs/nfsall.conf
buildrpm/1.3/fdr.spec +6 -0
index 226db33..b69e306 100644
@@ -4,6 +4,7 @@ URL:		https://github.com/oracle/fdr.git
 Version:	1.3
 Release:	3%{?dist}
 License:	UPL
+
 Source0:	http://people.redhat.com/steved/fdr/%{name}-%{version}.tar.xz
 
 BuildRequires:	gcc
@@ -36,6 +37,9 @@ install -m 644 samples/nfs.logrotate %{buildroot}/%{_sysconfdir}/logrotate.d/nfs
 mkdir -p %{buildroot}/%{_unitdir}
 install -m 644 %{name}d.service %{buildroot}/%{_unitdir}/%{name}d.service
 
+mkdir -p %{buildroot}%{_sysconfdir}/%{name}.d
+install -m 644 configs/nfsall.conf %{buildroot}%{_sysconfdir}/%{name}.d/
+
 mkdir -p %{buildroot}/%{_mandir}/man8
 install -m 644 fdrd.man %{buildroot}/%{_mandir}/man8/fdrd.8
 
@@ -53,6 +57,8 @@ install -m 644 fdrd.man %{buildroot}/%{_mandir}/man8/fdrd.8
 %{_unitdir}/fdrd.service
 %{_datadir}/fdr/samples/nfs
 %{_sysconfdir}/logrotate.d/nfs
+%{_sysconfdir}/%{name}.d
+%{_sysconfdir}/%{name}.d/nfsall.conf
 %{_mandir}/man8/*
 %doc README.md
 %license LICENSE
configs/nfsall.conf new file +319 -0

319 lines not on this page · raw message

Signature · 1 line
2.34.1
#3 lore raw

PATCH 3/5 systemd: rename service file.

In reply to Steve Dickson

The precedence has been set that most
systemd service files are named after
the daemon they start.

---
 buildrpm/1.3/fdr.spec       | 10 +++++-----
 fdrd.man                    |  2 +-
 fdr.service => fdrd.service |  0
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename fdr.service => fdrd.service (100%)
buildrpm/1.3/fdr.spec +5 -5
index 3484659..226db33 100644
@@ -34,23 +34,23 @@ mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
 install -m 644 samples/nfs.logrotate %{buildroot}/%{_sysconfdir}/logrotate.d/nfs
 
 mkdir -p %{buildroot}/%{_unitdir}
-install -m 644 %{name}.service %{buildroot}/%{_unitdir}/%{name}.service
+install -m 644 %{name}d.service %{buildroot}/%{_unitdir}/%{name}d.service
 
 mkdir -p %{buildroot}/%{_mandir}/man8
 install -m 644 fdrd.man %{buildroot}/%{_mandir}/man8/fdrd.8
 
 %post
-%systemd_post %{name}.service
+%systemd_post %{name}d.service
 
 %preun
-%systemd_preun %{name}.service
+%systemd_preun %{name}d.service
 
 %postun
-%systemd_postun_with_restart %{name}.service
+%systemd_postun_with_restart %{name}d.service
 
 %files
 %{_sbindir}/fdrd
-%{_unitdir}/fdr.service
+%{_unitdir}/fdrd.service
 %{_datadir}/fdr/samples/nfs
 %{_sysconfdir}/logrotate.d/nfs
 %{_mandir}/man8/*
fdrd.man +1 -1
index d5199f0..99f7f80 100644
@@ -27,7 +27,7 @@ available.  Error messages from fdr can be viewed via systemctl,
 for example,
 .P
 .B
-systemctl status -l fdr
+systemctl status -l fdrd
 .SH Configuration File Syntax
 
 The following keywords and options are recognized
fdrd.service renamed from fdr.service +0 -0
similarity index 100%
rename from fdr.service
rename to fdrd.service
Signature · 1 line
2.34.1
#4 lore raw

PATCH 4/5 saveto verb: Document updated

In reply to Steve Dickson

Document that fact any verbs after the saveto
line will not be processed.

---
 fdrd.man    | 7 +++++++
 samples/nfs | 2 ++
 2 files changed, 9 insertions(+)
fdrd.man +7 -0
index 99f7f80..f62a23b 100644
@@ -102,6 +102,13 @@ can be harvested manually by reading:
 The ftrace buffers in the kernel are circular. If no
 process harvests the data, new data will overwrite old data.
 .P
+Note, the 
+.B saveto 
+verbs has to be last line in a configuration
+file. Verbs after the 
+.B saveto 
+verbs will not be seen.
+.P
 .B minfree
 value
 .P
samples/nfs +2 -0
index 0c635e6..c1dbb57 100644
@@ -58,4 +58,6 @@ enable sunrpc/rpc_xdr_overflow
 enable sunrpc/xprt_ping
 enable sunrpc/xprt_timer
 #
+# Needs to be the last line in the config
+# file. Verbs after this verb will not be seen.
 saveto /var/log/nfs.log 128k
Signature · 1 line
2.34.1