You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/04/23 19:33:32 UTC
svn commit: r1471065 - in /accumulo/trunk: ./ assemble/ core/ examples/
fate/src/main/java/org/apache/accumulo/fate/
fate/src/main/java/org/apache/accumulo/fate/zookeeper/ server/
server/src/main/java/org/apache/accumulo/server/util/ src/ test/system/a...
Author: ecn
Date: Tue Apr 23 17:33:31 2013
New Revision: 1471065
URL: http://svn.apache.org/r1471065
Log:
ACCUMULO-1331 fixed
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/assemble/ (props changed)
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/server/ (props changed)
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/TServerUtils.java
accumulo/trunk/src/ (props changed)
accumulo/trunk/test/system/auto/simple/wal.py
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5:r1471059
Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/assemble:r1471059
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/core:r1471059
Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/examples:r1471059
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:r1471059
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:r1471059
Propchange: accumulo/trunk/pom.xml
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/pom.xml:r1471059
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/server:r1471059
Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/TServerUtils.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/TServerUtils.java?rev=1471065&r1=1471064&r2=1471065&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/TServerUtils.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/TServerUtils.java Tue Apr 23 17:33:31 2013
@@ -216,6 +216,7 @@ public class TServerUtils {
THsHaServer.Args options = new THsHaServer.Args(transport);
options.protocolFactory(ThriftUtil.protocolFactory());
options.transportFactory(ThriftUtil.transportFactory(maxMessageSize));
+ options.stopTimeoutVal(5);
/*
* Create our own very special thread pool.
*/
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/src:r1471059
Modified: accumulo/trunk/test/system/auto/simple/wal.py
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/system/auto/simple/wal.py?rev=1471065&r1=1471064&r2=1471065&view=diff
==============================================================================
--- accumulo/trunk/test/system/auto/simple/wal.py (original)
+++ accumulo/trunk/test/system/auto/simple/wal.py Tue Apr 23 17:33:31 2013
@@ -32,6 +32,7 @@ class WriteAheadLog(SunnyDayTest):
settings['tserver.walog.max.size'] = '2M'
settings['gc.cycle.delay'] = 1
settings['gc.cycle.start'] = 1
+ settings['master.recovery.delay'] = 0
# compact frequently
settings['tserver.memory.maps.max'] = '200K'