Skip to contentSkip to conversation

nfs-utils: Add scratch directory for NFS upcall state storage

PATCH In review Rich Dubielzig 3 participants 4 messages Feb 25, 2013 – Feb 27, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nfs-utils: Add scratch directory for NFS upcall state storage

When the /var/lib/nfs/v4recovery directory is not present, NFSD cannot record the upcall state and cannot end the 90-second grace period on startup. This is true even when NFS4 is not being served according to nfsstat.

More details and discussion here:
https://lkml.org/lkml/2012/6/11/206

---
 .../nfs-utils/nfs-utils_1.2.3.bb                   |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb +4 -1
index 84c4464..a0b2399 100644
@@ -12,7 +12,7 @@ DEPENDS = "libcap libnfsidmap libevent util-linux tcp-wrappers"
 RDEPENDS_${PN} = "rpcbind"
 RRECOMMENDS_${PN} = "kernel-module-nfsd"
 
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.bz2 \
            file://nfs-utils-1.0.6-uclibc.patch \
@@ -58,4 +58,7 @@ do_install_append () {
 	rm -f ${D}${sbindir}/rpcdebug
 	rm -f ${D}${sbindir}/rpcgen
 	rm -f ${D}${sbindir}/locktest
+
+	# needed to allow NFSD to end its grace period
+	install -d ${D}/var/lib/nfs/v4recovery
 }
Signature · 1 line
1.7.1
#1 lore raw
Quoted 27 lines · Rich Dubielzig

When the /var/lib/nfs/v4recovery directory is not present, NFSD cannot record the upcall state and cannot end the 90-second grace period on startup. This is true even when NFS4 is not being served according to nfsstat.

More details and discussion here:
https://lkml.org/lkml/2012/6/11/206

---
  .../nfs-utils/nfs-utils_1.2.3.bb                   |    5 ++++-
  1 files changed, 4 insertions(+), 1 deletions(-)
meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb +1 -1
index 84c4464..a0b2399 100644
@@ -12,7 +12,7 @@ DEPENDS = "libcap libnfsidmap libevent util-linux tcp-wrappers"
  RDEPENDS_${PN} = "rpcbind"
  RRECOMMENDS_${PN} = "kernel-module-nfsd"
 
-PR = "r4"
+PR = "r5"
 
  SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.bz2 \
             file://nfs-utils-1.0.6-uclibc.patch \

meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb do_install_append () { · line 63

Quoted 6 lines
meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb +3 -0
@@ -58,4 +58,7 @@ do_install_append () {
  	rm -f ${D}${sbindir}/rpcdebug
  	rm -f ${D}${sbindir}/rpcgen
  	rm -f ${D}${sbindir}/locktest
+
+	# needed to allow NFSD to end its grace period
+	install -d ${D}/var/lib/nfs/v4recovery

This should really use ${localstatedir} instead of var, it would also be better to co-locate this with the other directory creations earlier in the do_install_append().

Sau!

Quoted 2 lines
meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb +0 -0
  }
#2 lore raw

I can make this change, but if ${localstatedir} ends up being different than /var it would not be consistent with current kernel code which hardcodes the path "/var/lib/nfs/v4recovery" by default in fs/nfsd/nfs4recover.c

http://lxr.linux.no/#linux+v3.8/fs/nfsd/nfs4recover.c

-Rich
________________________________________
From: Saul Wold [[email protected]]
Sent: Monday, February 25, 2013 3:45 PM
To: Dubielzig, Rich
Cc: [email protected]
Subject: Re: [OE-core] [PATCH] nfs-utils: Add scratch directory for NFS upcall state storage

Quoted 27 lines · Rich Dubielzig

When the /var/lib/nfs/v4recovery directory is not present, NFSD cannot record the upcall state and cannot end the 90-second grace period on startup. This is true even when NFS4 is not being served according to nfsstat.

More details and discussion here:
https://lkml.org/lkml/2012/6/11/206

---
  .../nfs-utils/nfs-utils_1.2.3.bb                   |    5 ++++-
  1 files changed, 4 insertions(+), 1 deletions(-)
meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb +1 -1
index 84c4464..a0b2399 100644
@@ -12,7 +12,7 @@ DEPENDS = "libcap libnfsidmap libevent util-linux tcp-wrappers"
  RDEPENDS_${PN} = "rpcbind"
  RRECOMMENDS_${PN} = "kernel-module-nfsd"
 
-PR = "r4"
+PR = "r5"
 
  SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.bz2 \
             file://nfs-utils-1.0.6-uclibc.patch \

meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb do_install_append () { · line 63

Quoted 6 lines
meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb +3 -0
@@ -58,4 +58,7 @@ do_install_append () {
      rm -f ${D}${sbindir}/rpcdebug
      rm -f ${D}${sbindir}/rpcgen
      rm -f ${D}${sbindir}/locktest
+
+     # needed to allow NFSD to end its grace period
+     install -d ${D}/var/lib/nfs/v4recovery

This should really use ${localstatedir} instead of var, it would also be better to co-locate this with the other directory creations earlier in the do_install_append().

Sau!

Quoted 2 lines
meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb +0 -0
  }
#3 lore raw
Quoted 3 lines · Rich

I can make this change, but if ${localstatedir} ends up being different than /var it would not be consistent with current kernel code which hardcodes the path "/var/lib/nfs/v4recovery" by default in fs/nfsd/nfs4recover.c

http://lxr.linux.no/#linux+v3.8/fs/nfsd/nfs4recover.c

too bad. I think if you add this to commend and keep it hardcoded that will be better for future reference IMO so we know why we used /var and not conf var.

Quoted 57 lines

-Rich
________________________________________
From: Saul Wold [[email protected]]
Sent: Monday, February 25, 2013 3:45 PM
To: Dubielzig, Rich
Cc: [email protected]
Subject: Re: [OE-core] [PATCH] nfs-utils: Add scratch directory for NFS upcall state storage

Quoted 27 lines · Rich Dubielzig

When the /var/lib/nfs/v4recovery directory is not present, NFSD cannot record the upcall state and cannot end the 90-second grace period on startup. This is true even when NFS4 is not being served according to nfsstat.

More details and discussion here:
https://lkml.org/lkml/2012/6/11/206

---
  .../nfs-utils/nfs-utils_1.2.3.bb                   |    5 ++++-
  1 files changed, 4 insertions(+), 1 deletions(-)
meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb +1 -1
index 84c4464..a0b2399 100644
@@ -12,7 +12,7 @@ DEPENDS = "libcap libnfsidmap libevent util-linux tcp-wrappers"
  RDEPENDS_${PN} = "rpcbind"
  RRECOMMENDS_${PN} = "kernel-module-nfsd"
 
-PR = "r4"
+PR = "r5"
 
  SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.bz2 \
             file://nfs-utils-1.0.6-uclibc.patch \

meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb do_install_append () { · line 63

Quoted 6 lines
meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb +3 -0
@@ -58,4 +58,7 @@ do_install_append () {
      rm -f ${D}${sbindir}/rpcdebug
      rm -f ${D}${sbindir}/rpcgen
      rm -f ${D}${sbindir}/locktest
+
+     # needed to allow NFSD to end its grace period
+     install -d ${D}/var/lib/nfs/v4recovery

This should really use ${localstatedir} instead of var, it would also be better to co-locate this with the other directory creations earlier in the do_install_append().

Sau!

meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb do_install_append () { · line 64

Quoted 2 lines
meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb +0 -0
  }

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core