public inbox for cluster-cvs@sourceware.org
help / color / mirror / Atom feed
* cluster: STABLE3 - rgmanager: Remove rg_test memory cap
@ 2009-04-27 17:55 Lon Hohberger
0 siblings, 0 replies; only message in thread
From: Lon Hohberger @ 2009-04-27 17:55 UTC (permalink / raw)
To: cluster-cvs-relay
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=a7071ccf17acf270adcd6f647ac894447bbd66bd
Commit: a7071ccf17acf270adcd6f647ac894447bbd66bd
Parent: 379a7bd9dbd2d20d4f7de18c095e2c6a7c65b887
Author: Lon Hohberger <lhh@redhat.com>
AuthorDate: Tue Apr 21 14:23:38 2009 -0400
Committer: Lon Hohberger <lhh@redhat.com>
CommitterDate: Mon Apr 27 13:14:23 2009 -0400
rgmanager: Remove rg_test memory cap
Newer libxml2 allocates more memory and hits a
hard 8MB limit in the slab allocator used within
rg_test. Note that rgmanager does not use this
slab allocator; it's there primarily for debugging
purposes, and serves no particularly useful purpose
apart from that.
This isn't actually a bug in either rg_test or
libxml2; rather, it's an interaction problem which
occurred when a couple of libxml2 buffer resize
patches were added. Libxml2 now can (in certain
conditions) temporarily require >8MB of parser
space to parse a large cluster.conf this large,
causing rg_test to run out of memory.
Resolves bugzilla #490455
Signed-off-by: Lon Hohberger <lhh@redhat.com>
---
rgmanager/src/daemons/Makefile | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/rgmanager/src/daemons/Makefile b/rgmanager/src/daemons/Makefile
index edad463..0b8e6f9 100644
--- a/rgmanager/src/daemons/Makefile
+++ b/rgmanager/src/daemons/Makefile
@@ -65,13 +65,10 @@ DLM_LDFLAGS += -L${dlmlibdir} -ldlm
XML2_LDFLAGS += `xml2-config --libs`
SLANG_LDFLAGS += -L${slanglibdir} -lslang
EXTRA_LDFLAGS += -lpthread
-LOCAL_LDFLAGS += -llalloc
READLINE_LDFLAGS += -L${readlinelibdir} -lreadline
LDDEPS += ../clulib/libclulib.a
-LOCAL_LDDEPS += ../clulib/liblalloc.a
-
${TARGET1}: ${OBJS1} ${LDDEPS}
$(CC) -o $@ $^ $(CCS_LDFLAGS) $(CMAN_LDFLAGS) \
$(DLM_LDFLAGS) $(XML2_LDFLAGS) \
@@ -92,13 +89,13 @@ ${TARGET1}: ${OBJS1} ${LDDEPS}
# This is NOT meant to be an installed binary. Rather, RPMs and/or other
# packages should run 'make check' as part of the build process.
#
-${TARGET2}: ${SHAREDOBJS} ${OBJS2} ${LDDEPS} ${LOCAL_LDDEPS}
- $(CC) -o $@ $^ $(CMAN_LDFLAGS) $(LOCAL_LDFLAGS) $(EXTRA_LDFLAGS) \
+${TARGET2}: ${SHAREDOBJS} ${OBJS2} ${LDDEPS}
+ $(CC) -o $@ $^ $(CMAN_LDFLAGS) $(EXTRA_LDFLAGS) \
$(XML2_LDFLAGS) $(LOGSYS_LDFLAGS) $(LDFLAGS)
-${TARGET3}: ${SHAREDOBJS} ${OBJS3} ${LDDEPS} ${LOCAL_LDDEPS}
+${TARGET3}: ${SHAREDOBJS} ${OBJS3} ${LDDEPS}
$(CC) -o $@ $^ $(CCS_LDFLAGS) $(CMAN_LDFLAGS) \
- $(LOCAL_LDFLAGS) $(EXTRA_LDFLAGS) $(XML2_LDFLAGS) \
+ $(EXTRA_LDFLAGS) $(XML2_LDFLAGS) \
$(READLINE_LDFLAGS) $(LOGSYS_LDFLAGS) $(LDFLAGS)
${TARGET4}: ${TARGET1}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-04-27 17:55 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-04-27 17:55 cluster: STABLE3 - rgmanager: Remove rg_test memory cap 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 read-only IMAP folder(s) and NNTP newsgroup(s).