[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Cluster-devel] [PATCH] 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}
-- 
1.6.0.6


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]