You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by kt...@apache.org on 2013/05/31 01:41:47 UTC
svn commit: r1488057 - in /accumulo/trunk: ./ assemble/
conf/examples/1GB/standalone/ conf/examples/2GB/standalone/
conf/examples/3GB/standalone/ conf/examples/512MB/standalone/ core/
examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main...
Author: kturner
Date: Thu May 30 23:41:45 2013
New Revision: 1488057
URL: http://svn.apache.org/r1488057
Log:
ACCUMULO-1469 Patch from Aaron Glahe. Set the tserver.memory.maps.native.enabled = false for the standalone conf DIRs. This will explictly tell the system to use the non-native memory map.
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/assemble/ (props changed)
accumulo/trunk/conf/examples/1GB/standalone/accumulo-site.xml
accumulo/trunk/conf/examples/2GB/standalone/accumulo-site.xml
accumulo/trunk/conf/examples/3GB/standalone/accumulo-site.xml
accumulo/trunk/conf/examples/512MB/standalone/accumulo-site.xml
accumulo/trunk/core/ (props changed)
accumulo/trunk/examples/ (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed)
accumulo/trunk/pom.xml (props changed)
accumulo/trunk/proxy/README (props changed)
accumulo/trunk/server/ (props changed)
accumulo/trunk/src/ (props changed)
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5:r1487650-1487882,1487884-1488055
Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/assemble:r1487650-1488055
Modified: accumulo/trunk/conf/examples/1GB/standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/1GB/standalone/accumulo-site.xml?rev=1488057&r1=1488056&r2=1488057&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/1GB/standalone/accumulo-site.xml (original)
+++ accumulo/trunk/conf/examples/1GB/standalone/accumulo-site.xml Thu May 30 23:41:45 2013
@@ -52,6 +52,11 @@
</property>
<property>
+ <name>tserver.memory.maps.native.enabled</name>
+ <value>false</value>
+ </property>
+
+ <property>
<name>tserver.cache.data.size</name>
<value>15M</value>
</property>
Modified: accumulo/trunk/conf/examples/2GB/standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/2GB/standalone/accumulo-site.xml?rev=1488057&r1=1488056&r2=1488057&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/2GB/standalone/accumulo-site.xml (original)
+++ accumulo/trunk/conf/examples/2GB/standalone/accumulo-site.xml Thu May 30 23:41:45 2013
@@ -58,6 +58,11 @@
</property>
<property>
+ <name>tserver.memory.maps.native.enabled</name>
+ <value>false</value>
+ </property>
+
+ <property>
<name>tserver.cache.data.size</name>
<value>30M</value>
</property>
Modified: accumulo/trunk/conf/examples/3GB/standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/3GB/standalone/accumulo-site.xml?rev=1488057&r1=1488056&r2=1488057&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/3GB/standalone/accumulo-site.xml (original)
+++ accumulo/trunk/conf/examples/3GB/standalone/accumulo-site.xml Thu May 30 23:41:45 2013
@@ -52,6 +52,11 @@
</property>
<property>
+ <name>tserver.memory.maps.native.enabled</name>
+ <value>false</value>
+ </property>
+
+ <property>
<name>tserver.cache.data.size</name>
<value>128M</value>
</property>
Modified: accumulo/trunk/conf/examples/512MB/standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/512MB/standalone/accumulo-site.xml?rev=1488057&r1=1488056&r2=1488057&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/512MB/standalone/accumulo-site.xml (original)
+++ accumulo/trunk/conf/examples/512MB/standalone/accumulo-site.xml Thu May 30 23:41:45 2013
@@ -53,6 +53,11 @@
</property>
<property>
+ <name>tserver.memory.maps.native.enabled</name>
+ <value>false</value>
+ </property>
+
+ <property>
<name>tserver.cache.data.size</name>
<value>7M</value>
</property>
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/core:r1487650-1487882,1487884-1488055
Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/examples:r1487650-1488055
Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1487650-1488055
Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1487650-1488055
Propchange: accumulo/trunk/pom.xml
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/pom.xml:r1487650-1488055
Propchange: accumulo/trunk/proxy/README
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/proxy/README:r1487650-1488055
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/server:r1487650-1488055
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/src:r1487650-1488055