You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2013/10/14 19:50:52 UTC
[1/4] git commit: Set MALLOC_ARENA_MAX when unset. Patch by
brandonwilliams for CASSANDRA-6126
Updated Branches:
refs/heads/cassandra-2.0 613354136 -> b0b868f3f
refs/heads/trunk 9ef53836c -> 0b3a0a617
Set MALLOC_ARENA_MAX when unset.
Patch by brandonwilliams for CASSANDRA-6126
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/61335413
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/61335413
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/61335413
Branch: refs/heads/trunk
Commit: 6133541364d6e14f934e36012b2be691ae07db9f
Parents: 9bb16c3
Author: Brandon Williams <br...@apache.org>
Authored: Mon Oct 14 12:39:44 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Oct 14 12:40:22 2013 -0500
----------------------------------------------------------------------
conf/cassandra-env.sh | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/61335413/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index 1ba1a46..c8cb49c 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -132,6 +132,10 @@ esac
#MAX_HEAP_SIZE="4G"
#HEAP_NEWSIZE="800M"
+# Set this to control the amount of arenas per-thread in glibc
+#MALLOC_ARENA_MAX=4
+
+
if [ "x$MAX_HEAP_SIZE" = "x" ] && [ "x$HEAP_NEWSIZE" = "x" ]; then
calculate_heap_sizes
else
@@ -141,6 +145,10 @@ else
fi
fi
+if [ "x$MALLOC_ARENA_MAX" = "x" ]
+ MALLOC_ARENA_MAX=4
+fi
+
# Specifies the default port over which Cassandra will be available for
# JMX connections.
JMX_PORT="7199"
[2/4] git commit: fix missing then
Posted by br...@apache.org.
fix missing then
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b0b868f3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b0b868f3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b0b868f3
Branch: refs/heads/trunk
Commit: b0b868f3fcf200f1f3a5c58dc5ca4dbeb3ab7864
Parents: 6133541
Author: Brandon Williams <br...@apache.org>
Authored: Mon Oct 14 12:48:54 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Oct 14 12:48:54 2013 -0500
----------------------------------------------------------------------
conf/cassandra-env.sh | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b0b868f3/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index c8cb49c..d84c7ce 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -146,6 +146,7 @@ else
fi
if [ "x$MALLOC_ARENA_MAX" = "x" ]
+then
MALLOC_ARENA_MAX=4
fi
[3/4] git commit: fix missing then
Posted by br...@apache.org.
fix missing then
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b0b868f3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b0b868f3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b0b868f3
Branch: refs/heads/cassandra-2.0
Commit: b0b868f3fcf200f1f3a5c58dc5ca4dbeb3ab7864
Parents: 6133541
Author: Brandon Williams <br...@apache.org>
Authored: Mon Oct 14 12:48:54 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Oct 14 12:48:54 2013 -0500
----------------------------------------------------------------------
conf/cassandra-env.sh | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b0b868f3/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index c8cb49c..d84c7ce 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -146,6 +146,7 @@ else
fi
if [ "x$MALLOC_ARENA_MAX" = "x" ]
+then
MALLOC_ARENA_MAX=4
fi
[4/4] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Conflicts:
conf/cassandra-env.sh
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0b3a0a61
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0b3a0a61
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0b3a0a61
Branch: refs/heads/trunk
Commit: 0b3a0a6177484bff1cc031c123620829a0d29dcb
Parents: 9ef5383 b0b868f
Author: Brandon Williams <br...@apache.org>
Authored: Mon Oct 14 12:49:16 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Oct 14 12:49:16 2013 -0500
----------------------------------------------------------------------
conf/cassandra-env.sh | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------