Author: ecn
Date: Tue Apr 23 17:25:52 2013
New Revision: 1471059
URL: http://svn.apache.org/r1471059
Log:
ACCUMULO-1331 fixed
Modified:
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/util/TServerUtils.java
accumulo/branches/1.5/test/system/auto/simple/wal.py
Modified:
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/util/TServerUtils.java
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/util/TServerUtils.java?rev=1471059&r1=1471058&r2=1471059&view=diff
==============================================================================
---
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/util/TServerUtils.java
(original)
+++
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/util/TServerUtils.java
Tue Apr 23 17:25:52 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.
*/
Modified: accumulo/branches/1.5/test/system/auto/simple/wal.py
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/test/system/auto/simple/wal.py?rev=1471059&r1=1471058&r2=1471059&view=diff
==============================================================================
--- accumulo/branches/1.5/test/system/auto/simple/wal.py (original)
+++ accumulo/branches/1.5/test/system/auto/simple/wal.py Tue Apr 23 17:25:52
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'
