Date: Wed, 5 Oct 2011 13:32:19 +0200 (CEST) From: Radim Kolar <hsn@sendmail.cz> To: FreeBSD-gnats-submit@FreeBSD.org Cc: hsn@sendmail.cz, gslin@gslin.org Subject: ports/161301: [PATCH] databases/cassandra: update to 0.8.6 Message-ID: <201110051132.p95BWJWC064824@fbsd8.localdomain> Resent-Message-ID: <201110051200.p95C0fRD015100@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 161301
>Category: ports
>Synopsis: [PATCH] databases/cassandra: update to 0.8.6
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Oct 05 12:00:40 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Radim Kolar
>Release: FreeBSD 8.2-RELEASE i386
>Organization:
>Environment:
System: FreeBSD fbsd8.localdomain 8.2-RELEASE FreeBSD 8.2-RELEASE #8: Tue Mar 1 14:49:07 CET
>Description:
replaces ports/160654
- Update to 0.8.6
added script repaircluster for running cluster wide repair. Script generates
no screen output - suitable for running from cron
-cassandra scripts must be world executable
Added file(s):
- scripts/repaircluster
Port maintainer (gslin@gslin.org) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- cassandra-0.8.6.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/databases/cassandra/Makefile /home/hsn/ports/cassandra/Makefile
--- /usr/ports/databases/cassandra/Makefile 2011-09-10 22:44:29.000000000 +0200
+++ /home/hsn/ports/cassandra/Makefile 2011-10-05 13:17:10.905929826 +0200
@@ -6,7 +6,8 @@
#
PORTNAME= cassandra
-PORTVERSION= 0.8.5
+PORTVERSION= 0.8.6
+PORTREVISION= 0
CATEGORIES= databases java
MASTER_SITES= ${MASTER_SITE_APACHE}
MASTER_SITE_SUBDIR= cassandra/${PORTVERSION}
@@ -27,24 +28,27 @@
CONFIGS= access.properties cassandra-topology.properties cassandra.yaml \
log4j-server.properties log4j-tools.properties passwd.properties
SCRIPTS= cassandra cassandra-cli json2sstable nodetool sstable2json \
- sstablekeys sstableloader
+ sstablekeys sstableloader repaircluster
post-extract:
@${RM} ${WRKSRC}/bin/*.bat ${WRKSRC}/bin/stop-server
+ @${CP} ${SCRIPTDIR}/repaircluster ${WRKSRC}/bin
.for i in ${CONFIGS}
@${MV} ${WRKSRC}/conf/${i} ${WRKSRC}/conf/${i}.sample
.endfor
do-patch:
- @${REINPLACE_CMD} -e 's|/usr/share/cassandra|${DATADIR}/bin|' ${WRKSRC}/bin/cassandra-cli ${WRKSRC}/bin/nodetool
+ @${REINPLACE_CMD} -e 's|/usr/share/cassandra|${DATADIR}/bin|' ${WRKSRC}/bin/cassandra-cli ${WRKSRC}/bin/nodetool ${WRKSRC}/bin/sstableloader
@${REINPLACE_CMD} -e 's|\`dirname \$$\0\`/..|${DATADIR}|' ${WRKSRC}/bin/cassandra.in.sh
do-install:
@${MKDIR} ${DATADIR}
@cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${DATADIR}
- @cd ${DATADIR}/bin/ && ${CHMOD} u+x ${SCRIPTS}
+ @cd ${DATADIR}/bin/ && ${CHMOD} ${BINMODE} ${SCRIPTS}
@${LN} -s ${DATADIR}/bin/cassandra-cli ${PREFIX}/bin/cassandra-cli
@${LN} -s ${DATADIR}/bin/nodetool ${PREFIX}/bin/nodetool
+ @${LN} -s ${DATADIR}/bin/sstableloader ${PREFIX}/bin/sstableloader
+ @${LN} -s ${DATADIR}/bin/repaircluster ${PREFIX}/bin/repaircluster
post-install:
@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
diff -ruN --exclude=CVS /usr/ports/databases/cassandra/distinfo /home/hsn/ports/cassandra/distinfo
--- /usr/ports/databases/cassandra/distinfo 2011-09-10 22:44:29.000000000 +0200
+++ /home/hsn/ports/cassandra/distinfo 2011-09-25 23:42:35.147966313 +0200
@@ -1,2 +1,2 @@
-SHA256 (apache-cassandra-0.8.5-bin.tar.gz) = 12a433e51f8e49d70da761ceed9a912633480854e7ef7f49899865f28331883a
-SIZE (apache-cassandra-0.8.5-bin.tar.gz) = 10236276
+SHA256 (apache-cassandra-0.8.6-bin.tar.gz) = 87d4bfb967226a27a32331cd0ebc8547ac1693972aa32536e09c994908e963a2
+SIZE (apache-cassandra-0.8.6-bin.tar.gz) = 10271298
diff -ruN --exclude=CVS /usr/ports/databases/cassandra/files/cassandra.in /home/hsn/ports/cassandra/files/cassandra.in
--- /usr/ports/databases/cassandra/files/cassandra.in 2011-09-07 19:25:06.000000000 +0200
+++ /home/hsn/ports/cassandra/files/cassandra.in 2011-09-26 00:38:14.275142122 +0200
@@ -37,7 +37,7 @@
load_rc_config $name
cassandra_enable=${cassandra_enable:-"NO"}
-cassandra_vmargs=${cassandra_vmargs:-"-XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:+CMSIncrementalPacing -XX:CMSIncrementalDutyCycleMin=0 -XX:+CMSIncrementalDutyCycle=10"}
+cassandra_vmargs=${cassandra_vmargs:-"-ea -javaagent:%%DATADIR%%/lib/jamm-0.2.2.jar -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:+CMSIncrementalPacing -XX:CMSIncrementalDutyCycleMin=0 -XX:+CMSIncrementalDutyCycle=10"}
cassandra_memory=${cassandra_memory:-"1000m"}
cassandra_newgen=${cassandra_newgen:-"300m"}
command=%%DATADIR%%/bin/cassandra
diff -ruN --exclude=CVS /usr/ports/databases/cassandra/pkg-plist /home/hsn/ports/cassandra/pkg-plist
--- /usr/ports/databases/cassandra/pkg-plist 2011-09-10 22:44:29.000000000 +0200
+++ /home/hsn/ports/cassandra/pkg-plist 2011-10-05 13:19:21.264826111 +0200
@@ -1,6 +1,8 @@
@comment $FreeBSD: ports/databases/cassandra/pkg-plist,v 1.13 2011/09/10 20:44:29 sunpoet Exp $
bin/cassandra-cli
bin/nodetool
+bin/sstableloader
+bin/repaircluster
%%DATADIR%%/CHANGES.txt
%%DATADIR%%/LICENSE.txt
%%DATADIR%%/NEWS.txt
@@ -14,6 +16,7 @@
%%DATADIR%%/bin/sstable2json
%%DATADIR%%/bin/sstablekeys
%%DATADIR%%/bin/sstableloader
+%%DATADIR%%/bin/repaircluster
%%DATADIR%%/conf/README.txt
%%DATADIR%%/conf/access.properties.sample
%%DATADIR%%/conf/cassandra-env.sh
@@ -1555,8 +1558,8 @@
%%DATADIR%%/javadoc/serialized-form.html
%%DATADIR%%/javadoc/stylesheet.css
%%DATADIR%%/lib/antlr-3.2.jar
-%%DATADIR%%/lib/apache-cassandra-0.8.5.jar
-%%DATADIR%%/lib/apache-cassandra-thrift-0.8.5.jar
+%%DATADIR%%/lib/apache-cassandra-0.8.6.jar
+%%DATADIR%%/lib/apache-cassandra-thrift-0.8.6.jar
%%DATADIR%%/lib/avro-1.4.0-fixes.jar
%%DATADIR%%/lib/avro-1.4.0-sources-fixes.jar
%%DATADIR%%/lib/commons-cli-1.1.jar
diff -ruN --exclude=CVS /usr/ports/databases/cassandra/scripts/repaircluster /home/hsn/ports/cassandra/scripts/repaircluster
--- /usr/ports/databases/cassandra/scripts/repaircluster 1970-01-01 01:00:00.000000000 +0100
+++ /home/hsn/ports/cassandra/scripts/repaircluster 2011-10-05 12:50:35.662809744 +0200
@@ -0,0 +1,9 @@
+#! /bin/sh
+set -e
+if test $# -eq 0; then
+ echo "$0 <any node in cluster>"
+ exit 1;
+fi
+for i in `nodetool -h $1 ring | cut -d ' ' -f 1 | grep -e '^[0-9]'`; do
+ nodetool -h $i repair
+done
--- cassandra-0.8.6.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110051132.p95BWJWC064824>