Rush has submitted this change and it was merged.

Change subject: labs nfs scratch and dumps to soft mode
......................................................................


labs nfs scratch and dumps to soft mode

Some options cannot be activated on a remount which
Puppet is not savvy too. So first run w/ this change
results in a failure for '/bin/mount -o remount /path'
per mount.  This is transient and will not affect
subsequent runs.  The correct options are then staged
in /etc/fstab for umount/mount or reboot.

timeout is duration until failure 1/10ths of a sec
retrans is how many timeouts to sustain

Bug: T126083
Change-Id: I1e9049bc390b0e1eafa486e83a58d0cf6654ff57
---
M modules/role/manifests/labs/nfsclient.pp
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Rush: Verified; Looks good to me, approved



diff --git a/modules/role/manifests/labs/nfsclient.pp 
b/modules/role/manifests/labs/nfsclient.pp
index f03113e..0d959bb 100644
--- a/modules/role/manifests/labs/nfsclient.pp
+++ b/modules/role/manifests/labs/nfsclient.pp
@@ -25,7 +25,7 @@
 
     labstore::nfs_mount { 'scratch':
         project    => $::labsproject,
-        options    => ['rw', $mode],
+        options    => ['rw', 'soft', 'timeo=300', 'retrans=3'],
         mount_path => '/data/scratch',
         server     => $nfs_server,
         share_path => '/scratch',
@@ -33,7 +33,7 @@
 
     labstore::nfs_mount { 'dumps':
         project    => $::labsproject,
-        options    => ['ro', $mode],
+        options    => ['ro', 'soft', 'timeo=300', 'retrans=3'],
         mount_path => '/public/dumps',
         share_path => '/dumps',
         server     => $misc_nfs,

-- 
To view, visit https://gerrit.wikimedia.org/r/289903
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1e9049bc390b0e1eafa486e83a58d0cf6654ff57
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <r...@wikimedia.org>
Gerrit-Reviewer: Rush <r...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to