Add jemalloc library to installed packages for Redis
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/49d15bb5 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/49d15bb5 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/49d15bb5 Branch: refs/heads/0.5.0 Commit: 49d15bb588fab02f0794f00c3a01434502457fad Parents: 32a6eba Author: Andrew Kennedy <[email protected]> Authored: Wed Apr 10 15:27:39 2013 +0100 Committer: Andrew Kennedy <[email protected]> Committed: Wed Apr 10 15:28:33 2013 +0100 ---------------------------------------------------------------------- .../entity/nosql/redis/RedisStoreSshDriver.java | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/49d15bb5/software/nosql/src/main/java/brooklyn/entity/nosql/redis/RedisStoreSshDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/redis/RedisStoreSshDriver.java b/software/nosql/src/main/java/brooklyn/entity/nosql/redis/RedisStoreSshDriver.java index b3b4b23..6efccdb 100644 --- a/software/nosql/src/main/java/brooklyn/entity/nosql/redis/RedisStoreSshDriver.java +++ b/software/nosql/src/main/java/brooklyn/entity/nosql/redis/RedisStoreSshDriver.java @@ -45,25 +45,10 @@ public class RedisStoreSshDriver extends AbstractSoftwareProcessSshDriver implem String saveAs = resolver.getFilename(); expandedInstallDir = getInstallDir()+"/"+resolver.getUnpackedDirectoryName(format("redis-%s", getVersion())); - /* - * FIXME On jenkins releng3 box, needed to explicitly install jemalloc: - * wget http://www.canonware.com/download/jemalloc/jemalloc-3.3.0.tar.bz2 - * tar -xvjpf jemalloc-3.3.0.tar.bz2 - * cd jemalloc-3.3.0 - * ./configure - * make - * sudo make install - * cd .. - * - * cd redis-2.6.7 - * make distclean - * cd deps; make hiredis lua jemalloc linenoise; cd .. - * "make LDFLAGS="-all-static" - */ - List<String> commands = ImmutableList.<String>builder() .addAll(CommonCommands.downloadUrlAs(urls, saveAs)) .add(CommonCommands.INSTALL_TAR) + .add(CommonCommands.installPackage(MutableMap.of("apt", "libjemalloc-dev", "yum", "jemalloc-devel", "port", null, "brew", null), null)) .add("tar xzfv " + saveAs) .add(format("cd redis-%s", getVersion())) .add("make distclean")
