From 7b4e6d92ac8978742d2afae42fe91917af8b8938 Mon Sep 17 00:00:00 2001
From: Paul Dagnelie <pcd@delphix.com>
Date: Mon, 22 Aug 2016 16:38:07 -0700
Subject: [PATCH] 7231 nlockmgr failing to start up during bootup Reviewed by:
 Matt Amdur <matt.amdur@delphix.com> Reviewed by: Sebastien Roy
 <sebastien.roy@delphix.com> Reviewed by: Kyle Cackett
 <kyle.cackett@delphix.com> Reviewed by: George Wilson
 <george.wilson@delphix.com> Reviewed by: Dan McDonald <danmcd@omniti.com>
 Approved by: Richard Lowe <richlowe@richlowe.net>

---
 usr/src/cmd/fs.d/nfs/svc/nlockmgr     | 15 +++++++++++++--
 usr/src/cmd/fs.d/nfs/svc/nlockmgr.xml |  3 ++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/usr/src/cmd/fs.d/nfs/svc/nlockmgr b/usr/src/cmd/fs.d/nfs/svc/nlockmgr
index 3a543d6d7c..c5d8b622a6 100644
--- a/usr/src/cmd/fs.d/nfs/svc/nlockmgr
+++ b/usr/src/cmd/fs.d/nfs/svc/nlockmgr
@@ -21,9 +21,9 @@
 #
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright (c) 2015 by Delphix. All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 
 #
 # Start the lockd service; we are serving NFS and we need to verify
@@ -60,5 +60,16 @@ then
 		echo "$0: WARNING svcadm refresh failed" 1>&2
 	fi
 fi
-   
+
+#
+# We have to wait for statd to finish starting up before lockd can
+# start running. If statd hangs after service startup (so SMF thinks
+# it's done) but before it registers an rpc address, we can end up
+# failing in the kernel when we attempt to contact it.
+#
+until /usr/bin/rpcinfo -T tcp 127.0.0.1 status >/dev/null 2>&1
+do
+	sleep 1
+done
+
 exec /usr/lib/nfs/lockd
diff --git a/usr/src/cmd/fs.d/nfs/svc/nlockmgr.xml b/usr/src/cmd/fs.d/nfs/svc/nlockmgr.xml
index 84cdfedee3..d669e481a6 100644
--- a/usr/src/cmd/fs.d/nfs/svc/nlockmgr.xml
+++ b/usr/src/cmd/fs.d/nfs/svc/nlockmgr.xml
@@ -21,6 +21,7 @@
  CDDL HEADER END
 
 	Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+	Copyright (c) 2012, 2015 by Delphix. All rights reserved.
 
 	NOTE:  This service manifest is not editable; its contents will
 	be overwritten by package or patch operations, including
@@ -71,7 +72,7 @@
 	    type='method'
 	    name='start'
 	    exec='/lib/svc/method/nlockmgr'
-	    timeout_seconds='60' />
+	    timeout_seconds='300' />
 
 	<exec_method
 	    type='method'
-- 
2.11.4.GIT