From 314dd4da976cd329417b43c3ad281fd9990fdcd7 Mon Sep 17 00:00:00 2001
From: Kaushal M <kaushal@redhat.com>
Date: Wed, 22 Aug 2012 16:53:04 +0530
Subject: mount.glusterfs: Add support for {attribute,entry}-timeout options

Change-Id: Ib0c9b5be6f05cf9a36271df67e5e5c251c4c4628
BUG: 829279
Signed-off-by: Kaushal M <kaushal@redhat.com>
Reviewed-on: http://review.gluster.org/3840
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Jeff Darcy <obdurodon@gmail.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
---
 xlators/mount/fuse/utils/mount.glusterfs.in | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/xlators/mount/fuse/utils/mount.glusterfs.in b/xlators/mount/fuse/utils/mount.glusterfs.in
index 494c894ec90..381a61bd927 100755
--- a/xlators/mount/fuse/utils/mount.glusterfs.in
+++ b/xlators/mount/fuse/utils/mount.glusterfs.in
@@ -103,6 +103,14 @@ start_glusterfs ()
         cmd_line=$(echo "$cmd_line --volume-name=$volume_name");
     fi
 
+    if [ -n "$attribute_timeout" ]; then
+        cmd_line=$(echo "$cmd_line --attribute-timeout=$attribute_timeout");
+    fi
+
+    if [ -n "$entry_timeout" ]; then
+        cmd_line=$(echo "$cmd_line --entry-timeout=$entry_timeout");
+    fi
+
     if [ -z "$volfile_loc" ]; then
         if  [ -n "$server_ip" ]; then
             if [ -n "$server_port" ]; then
@@ -293,6 +301,9 @@ main ()
                                 volfile_max_fetch_attempts=$value ;;
                             "backupvolfile-server")
                                 backupvolfile_server=$value ;;
+                            "attribute-timeout")
+                                attribute_timeout=$value;;
+                            "entry-timeout")    entry_timeout=$value;;
                             *) echo "unknown option $key (ignored)" ;;
                         esac
                 esac
-- 
cgit