[Cluster-devel] cluster/gfs-kernel/src/dlm lock_dlm.h thread.c

[Cluster-devel] cluster/gfs-kernel/src/dlm lock_dlm.h thread.c

[teigland]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL4
Changes by:	teigland at sourceware.org	2006-12-08 17:27:37

Modified files:
	gfs-kernel/src/dlm: lock_dlm.h thread.c 

Log message:
	- Change the default drop_count from 50,000 to 200,000.  The old value
	was too low and unnecessarily limited performance.
	- Update the drop_count for mounted fs's from the drop_count set
	through /proc/cluster/lock_dlm/drop_count, so the drop_count setting
	can be changed on a mounted fs.
	
	bz 218795

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/dlm/lock_dlm.h.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.18.2.5&r2=1.18.2.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/dlm/thread.c.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.16.2.3&r2=1.16.2.4

--- cluster/gfs-kernel/src/dlm/Attic/lock_dlm.h	2006/07/12 21:53:30	1.18.2.5
+++ cluster/gfs-kernel/src/dlm/Attic/lock_dlm.h	2006/12/08 17:27:37	1.18.2.6
@@ -46,7 +46,7 @@
 
 #define LOCK_DLM_MAX_NODES	(128)
 
-#define DROP_LOCKS_COUNT	(50000)
+#define DROP_LOCKS_COUNT	(200000)
 #define DROP_LOCKS_PERIOD	(60)
 #define SHRINK_CACHE_COUNT	(100)
 #define SHRINK_CACHE_MAX	(1000)
--- cluster/gfs-kernel/src/dlm/Attic/thread.c	2005/03/10 07:09:41	1.16.2.3
+++ cluster/gfs-kernel/src/dlm/Attic/thread.c	2006/12/08 17:27:37	1.16.2.4
@@ -13,6 +13,8 @@
 
 #include "lock_dlm.h"
 
+extern int lock_dlm_drop_count;
+
 /* 
  * Run in dlm_async thread 
  */
@@ -292,6 +294,7 @@
 
 	if (check_timeout(dlm->drop_time, dlm->drop_locks_period)) {
 		dlm->drop_time = jiffies;
+		dlm->drop_locks_count = lock_dlm_drop_count;
 		if (atomic_read(&dlm->lock_count) >= dlm->drop_locks_count)
 			return TRUE;
 	}

[Cluster-devel] cluster/gfs-kernel/src/dlm lock_dlm.h thread.c

[teigland]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	STABLE
Changes by:	teigland at sourceware.org	2006-12-08 17:27:45

Modified files:
	gfs-kernel/src/dlm: lock_dlm.h thread.c 

Log message:
	- Change the default drop_count from 50,000 to 200,000.  The old value
	was too low and unnecessarily limited performance.
	- Update the drop_count for mounted fs's from the drop_count set
	through /proc/cluster/lock_dlm/drop_count, so the drop_count setting
	can be changed on a mounted fs.
	
	bz 218795

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/dlm/lock_dlm.h.diff?cvsroot=cluster&only_with_tag=STABLE&r1=1.18.2.3.6.2&r2=1.18.2.3.6.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/dlm/thread.c.diff?cvsroot=cluster&only_with_tag=STABLE&r1=1.16.2.3&r2=1.16.2.3.6.1

--- cluster/gfs-kernel/src/dlm/Attic/lock_dlm.h	2006/07/12 21:58:29	1.18.2.3.6.2
+++ cluster/gfs-kernel/src/dlm/Attic/lock_dlm.h	2006/12/08 17:27:44	1.18.2.3.6.3
@@ -46,7 +46,7 @@
 
 #define LOCK_DLM_MAX_NODES	(128)
 
-#define DROP_LOCKS_COUNT	(50000)
+#define DROP_LOCKS_COUNT	(200000)
 #define DROP_LOCKS_PERIOD	(60)
 #define SHRINK_CACHE_COUNT	(100)
 #define SHRINK_CACHE_MAX	(1000)
--- cluster/gfs-kernel/src/dlm/Attic/thread.c	2005/03/10 07:09:41	1.16.2.3
+++ cluster/gfs-kernel/src/dlm/Attic/thread.c	2006/12/08 17:27:44	1.16.2.3.6.1
@@ -13,6 +13,8 @@
 
 #include "lock_dlm.h"
 
+extern int lock_dlm_drop_count;
+
 /* 
  * Run in dlm_async thread 
  */
@@ -292,6 +294,7 @@
 
 	if (check_timeout(dlm->drop_time, dlm->drop_locks_period)) {
 		dlm->drop_time = jiffies;
+		dlm->drop_locks_count = lock_dlm_drop_count;
 		if (atomic_read(&dlm->lock_count) >= dlm->drop_locks_count)
 			return TRUE;
 	}