Merge branch 'tp/sri_ibm_next_0305_1' into ibm_next_tmp

phdeniel · May 5, 2012 · 3e3cbe6 · 3e3cbe6
2 parents 665cbff + 31af63b
commit 3e3cbe6
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 30 deletions.
diff --git a/src/Cache_inode/Makefile.am b/src/Cache_inode/Makefile.am
@@ -38,7 +38,10 @@ libcache_inode_la_SOURCES = cache_inode_access.c             \
                             ../include/log.h       \
                             ../include/HashData.h            \
                             ../include/HashTable.h           \
-                            ../include/err_cache_inode.h
+                            ../include/err_cache_inode.h     \
+                            ../include/generic_weakref.h     \
+                            ../include/cache_inode_lru.h     \
+                            ../include/cache_inode_weakref.h
 
 
 new: clean all
diff --git a/src/MainNFSD/Makefile.am b/src/MainNFSD/Makefile.am
@@ -136,6 +136,7 @@ libMainServices_la_SOURCES = nfs_admin_thread.c                   \
                              ../include/SemN.h                    \
                              ../include/external_tools.h          \
                              ../include/err_inject.h              \
+                             ../include/err_cache_content.h       \
                              $(STAT_SNMP_FILES)
 
 libMainServices_la_LIBADD         =   ../Protocols/NFS/libnfsproto.la                   \

diff --git a/src/Protocols/NFS/Makefile.am b/src/Protocols/NFS/Makefile.am
@@ -95,7 +95,8 @@ libnfsproto_la_SOURCES = mnt_Export.c	      		     \
                          ../../include/nfs_creds.h           \
                          ../../include/nfs_tools.h           \
                          ../../include/err_inject.h          \
-                         ../../include/nfs_file_handle.h
+                         ../../include/nfs_file_handle.h     \
+                         ../../include/cache_content_policy.h
 
 if USE_NFS4_1
 libnfsproto_la_SOURCES += nfs41_op_exchange_id.c      \

diff --git a/src/config_samples/gpfs.ganesha.main.conf b/src/config_samples/gpfs.ganesha.main.conf
@@ -91,13 +91,13 @@ GPFS
 CacheInode_Hash
 {
     # Size of the array used in the hash (must be a prime number for algorithm efficiency)
-    Index_Size = 9127 ;
+    Index_Size = 37 ;
 
     # Number of signs in the alphabet used to write the keys
     Alphabet_Length = 10 ;
 
     # Number of preallocated RBT nodes
-    Prealloc_Node_Pool_Size = 10 ;
+    Prealloc_Node_Pool_Size = 10000 ;
 }
 
 ###################################################
@@ -115,45 +115,46 @@ CacheInode_Client
     #LogFile = "SYSLOG";
 
     # LRU list item preallocated pool size
-    LRU_Prealloc_PoolSize = 1000 ;
+    #LRU_Prealloc_PoolSize = 1000 ;
 
     #Number of use of the LRU list before garbagging it
-    LRU_Nb_Call_Gc_invalid = 100 ;
+    #LRU_Nb_Call_Gc_invalid = 100 ;
 
     # CacheInode Entry preallocated pool size
-    Entry_Prealloc_PoolSize = 1000 ;
+    #Entry_Prealloc_PoolSize = 1000 ;
 
     # CacheInode Parent Data preallocated pool size
-    ParentData_Prealloc_PoolSize = 1000 ;
+    #ParentData_Prealloc_PoolSize = 1000 ;
 
     # Time after which attributes should be renewed
     # A value of 0 will disable this feature
     #Attr_Expiration_Time = Immediate ;
-    Attr_Expiration_Time = 120 ;
+    Attr_Expiration_Time = 600 ;
 
     # Time after which symbolic links should be renewed
     # A value of 0 will disable this feature
     #Symlink_Expiration_Time = Immediate ;
-    Symlink_Expiration_Time = 120 ;
+    Symlink_Expiration_Time = 600 ;
 
     # Time after which directory content should be renewed
     # A value of 0 will disable this feature
     #Directory_Expiration_Time = Immediate ;
-    Directory_Expiration_Time = 120 ;
+    Directory_Expiration_Time = 600 ;
 
     # This flag tells if 'access' operation are to be performed
     # explicitely on the FileSystem or only on cached attributes information
     Use_Test_Access = 1 ;
 
     # Number of opened files  (take care of tcp connections...)
-    Max_Fd = 128 ;
+    #Max_Fd = 128 ;
 
     # Open file retention (in seconds)
-    OpenFile_Retention = 5 ;
+    #OpenFile_Retention = 5 ;
 
     # flag used to enable/disable this feature
-    Use_OpenClose_cache = YES ;
+    #Use_OpenClose_cache = YES ;
 
+    Use_Getattr_Directory_Invalidation = 1;
 }
 
 ###################################################
@@ -166,23 +167,26 @@ CacheInode_GC_Policy
 {
     # Lifetime for a file before being a candidate to GC
     # A value of -1 will disable file GC
-    File_Lifetime = 600 ;
+    #File_Lifetime = 600 ;
 
     # Lifetime for a directory before being a candidate to GC
     # A value of -1 will disable file GC
-    Directory_Lifetime = 1200 ;
+    #Directory_Lifetime = 1200 ;
 
     # GC High Water Mark
-    NbEntries_HighWater = 10000 ;
+    #NbEntries_HighWater = 10000 ;
 
     # GC Low Water Mark
-    NbEntries_LowWater = 9000 ;
+    #NbEntries_LowWater = 9000 ;
 
     # Runtime interval (in seconds)
-    Runtime_Interval = 360 ;
+    #Runtime_Interval = 360 ;
 
     # Number of calls to be made to Cache_Inode layer before testing for GC
-    Nb_Call_Before_GC = 10000 ;
+    #Nb_Call_Before_GC = 10000 ;
+
+    FD_HWMark_Percent = 75;
+    FD_LWMark_Percent =  5;
 }
 
 
@@ -253,7 +257,7 @@ NFS_Worker_Param
 	Pending_Job_Prealloc = 30 ;
 
 	# LRU list item preallocated pool size
-	LRU_Pending_Job_Prealloc_PoolSize = 200 ;
+	#LRU_Pending_Job_Prealloc_PoolSize = 200 ;
 
 	# Number of job before GC on the worker's job pool size
 	Nb_Before_GC = 101  ;
@@ -286,6 +290,8 @@ NFS_Core_Param
 	# Mount port to be used
 	# Default is 0 (let the system use an available ephemeral port)
 	#MNT_Port = 0 ;
+    MNT_Port = 32767 ;
+    NLM_Port = 32769 ;
 
 	# NFS RPC Program number
 	# Default value is 100003
@@ -318,10 +324,11 @@ NFS_Core_Param
 	# Clustered = FALSE ;
 
 	# The size of each RPC send buffer in bytes and effectively the maximum send size.
-        MaxRPCSendBufferSize = 32768 ;
+    MaxRPCSendBufferSize = 32768 ;
 
 	# The size of each RPC receive buffer in bytes and effectively the maximum receive size.
-        MaxRPCRecvBufferSize = 32768 ;
+    MaxRPCRecvBufferSize = 32768 ;
+    NFS_Protocols="3,4";
 }
 
 ###################################################
@@ -333,7 +340,7 @@ NFS_Core_Param
 NFS_DupReq_Hash
 {
     # Size of the array used in the hash (must be a prime number for algorithm efficiency)
-    Index_Size = 71 ;
+    Index_Size = 17 ;
 
     # Number of signs in the alphabet used to write the keys
     Alphabet_Length = 10 ;
@@ -351,7 +358,7 @@ NFS_DupReq_Hash
 NFS_IP_Name
 {
     # Size of the array used in the hash (must be a prime number for algorithm efficiency)
-    Index_Size = 71 ;
+    Index_Size = 17 ;
 
     # Number of signs in the alphabet used to write the keys
     Alphabet_Length = 10 ;
@@ -421,7 +428,7 @@ SNMP_ADM
     export_buddy_stats    = TRUE;
 
     export_nfs_calls_detail = FALSE;
-    export_cache_inode_calls_detail = FALSE;
+    #export_cache_inode_calls_detail = FALSE;
     export_fsal_calls_detail = FALSE;
 
 }
@@ -456,6 +463,18 @@ NFSv4
     Returns_ERR_FH_EXPIRED = TRUE ;
 }
 
+NFSv4_ClientId_Cache
+{
+    # Size of the array used in the hash (must be a prime number for algorithm efficiency)
+    Index_Size = 17 ;
+
+    # Number of signs in the alphabet used to write the keys
+    Alphabet_Length = 10 ;
+
+    # Number of preallocated RBT nodes
+    Prealloc_Node_Pool_Size = 1000;
+}
+
 ###################################################
 #
 # Kerberos parameters for use with RPCSEC_GSS

diff --git a/src/configure.ac b/src/configure.ac
@@ -838,8 +838,6 @@ AC_CONFIG_FILES([include/Makefile
                  SAL/Makefile
 		 FSAL_UP/Makefile
 		 FSAL_UP/DUMB/Makefile
-                 File_Content/Makefile
-                 File_Content_Policy/Makefile
 		 Protocols/Makefile
                  Protocols/9P/Makefile
 		 Protocols/NFS/Makefile
@@ -869,7 +867,6 @@ AC_CONFIG_FILES([include/Makefile
                  MainNFSD/Makefile
                  test/Makefile
                  cmdline_tools/Makefile
-                 shell/Makefile
                  snmp_adm/Makefile
                  example-fuse/Makefile
                  Docs/Makefile

diff --git a/src/nfs-ganesha.spec.in b/src/nfs-ganesha.spec.in
@@ -409,7 +409,6 @@ rm -rf $RPM_BUILD_ROOT
 %files gpfs
 %defattr(-,root,root,-)
 %{_bindir}/gpfs.ganesha.*
-%{_bindir}/gpfs.ganeshell
 %{_sysconfdir}/init.d/nfs-ganesha-gpfs
 %{_sysconfdir}/sysconfig/ganesha
 %config(noreplace) %{_sysconfdir}/ganesha/gpfs.ganesha*