* [Cluster-devel] [PATCH] cman: Move token timeout into header file
@ 2009-10-13 16:22 Lon Hohberger
2009-10-13 16:59 ` [Cluster-devel] " Lon Hohberger
0 siblings, 1 reply; 2+ messages in thread
From: Lon Hohberger @ 2009-10-13 16:22 UTC (permalink / raw)
To: cluster-devel.redhat.com
Signed-off-by: Lon Hohberger <lhh@redhat.com>
---
cman/daemon/cman-preconfig.c | 3 ++-
cman/daemon/cman.h | 1 +
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/cman/daemon/cman-preconfig.c b/cman/daemon/cman-preconfig.c
index b39ca4c..4bd3d95 100644
--- a/cman/daemon/cman-preconfig.c
+++ b/cman/daemon/cman-preconfig.c
@@ -690,8 +690,9 @@ static void add_cman_overrides(struct objdb_iface_ver0 *objdb)
/* Set the token timeout is 10 seconds, but don't overrride anything that
might be in cluster.conf */
if (objdb_get_string(objdb, object_handle, "token", &value)) {
+ snprintf(tmp, sizeof(tmp), "%d", DEFAULT_TOKEN_TIMEOUT);
objdb->object_key_create(object_handle, "token", strlen("token"),
- "10000", strlen("10000")+1);
+ tmp, strlen(tmp)+1);
}
if (objdb_get_string(objdb, object_handle, "token_retransmits_before_loss_const", &value)) {
objdb->object_key_create(object_handle, "token_retransmits_before_loss_const",
diff --git a/cman/daemon/cman.h b/cman/daemon/cman.h
index 67f76d3..dfcf014 100644
--- a/cman/daemon/cman.h
+++ b/cman/daemon/cman.h
@@ -11,6 +11,7 @@ extern int our_nodeid(void);
#define DEFAULT_PORT 5405
#define DEFAULT_CLUSTER_NAME "RHCluster"
#define DEFAULT_MAX_QUEUED 128
+#define DEFAULT_TOKEN_TIMEOUT 10000
#define DEFAULT_QUORUMDEV_POLL 10000
#define DEFAULT_SHUTDOWN_TIMEOUT 5000
#define DEFAULT_CCSD_POLL 1000
--
1.6.2.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Cluster-devel] Re: [PATCH] cman: Move token timeout into header file
2009-10-13 16:22 [Cluster-devel] [PATCH] cman: Move token timeout into header file Lon Hohberger
@ 2009-10-13 16:59 ` Lon Hohberger
0 siblings, 0 replies; 2+ messages in thread
From: Lon Hohberger @ 2009-10-13 16:59 UTC (permalink / raw)
To: cluster-devel.redhat.com
On Tue, 2009-10-13 at 12:22 -0400, Lon Hohberger wrote:
> Signed-off-by: Lon Hohberger <lhh@redhat.com>
Applied based on chrissie's ack
-- Lon
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-10-13 16:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-10-13 16:22 [Cluster-devel] [PATCH] cman: Move token timeout into header file Lon Hohberger
2009-10-13 16:59 ` [Cluster-devel] " Lon Hohberger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).