From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 15178 invoked by alias); 27 Apr 2009 17:55:33 -0000 Received: (qmail 15172 invoked by alias); 27 Apr 2009 17:55:33 -0000 X-SWARE-Spam-Status: No, hits=-2.0 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-2.0 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: cluster: STABLE3 - rgmanager: Remove rg_test memory cap To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: 379a7bd9dbd2d20d4f7de18c095e2c6a7c65b887 X-Git-Newrev: a7071ccf17acf270adcd6f647ac894447bbd66bd From: Lon Hohberger Message-Id: <20090427175512.1381D1202D2@lists.fedorahosted.org> Date: Mon, 27 Apr 2009 17:55:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q2/txt/msg00124.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=a7071ccf17acf270adcd6f647ac894447bbd66bd Commit: a7071ccf17acf270adcd6f647ac894447bbd66bd Parent: 379a7bd9dbd2d20d4f7de18c095e2c6a7c65b887 Author: Lon Hohberger AuthorDate: Tue Apr 21 14:23:38 2009 -0400 Committer: Lon Hohberger 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 --- 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}