Author: ecn
Date: Wed Apr 17 14:24:49 2013
New Revision: 1468928
URL: http://svn.apache.org/r1468928
Log:
ACCUMULO-1283 use better ranges for timeout values
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/gc/SimpleGarbageCollector.java
accumulo/trunk/src/ (props changed)
accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Config.java
accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5:r1468599,1468927
Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/assemble:r1468599,1468927
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/core:r1468599,1468927
Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/examples:r1468599,1468927
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:r1468599,1468927
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:r1468599,1468927
Propchange: accumulo/trunk/pom.xml
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/pom.xml:r1468599,1468927
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/server:r1468599,1468927
Modified:
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java?rev=1468928&r1=1468927&r2=1468928&view=diff
==============================================================================
---
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
(original)
+++
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
Wed Apr 17 14:24:49 2013
@@ -310,7 +310,6 @@ public class SimpleGarbageCollector impl
// we just made a lot of changes to the !METADATA table: flush them out
try {
- TCredentials creds = SecurityConstants.getSystemCredentials();
Connector connector =
instance.getConnector(credentials.getPrincipal(),
CredentialHelper.extractToken(credentials));
connector.tableOperations().compact(Constants.METADATA_TABLE_NAME,
null, null, true, true);
} catch (Exception e) {
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/src:r1468599,1468927
Modified:
accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Config.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Config.java?rev=1468928&r1=1468927&r2=1468928&view=diff
==============================================================================
---
accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Config.java
(original)
+++
accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Config.java
Wed Apr 17 14:24:49 2013
@@ -79,8 +79,8 @@ public class Config extends Test {
s(Property.MASTER_BULK_RETRIES, 1, 10),
s(Property.MASTER_BULK_TIMEOUT, 10, 600),
s(Property.MASTER_FATE_THREADPOOL_SIZE, 1, 100),
- s(Property.MASTER_RECOVERY_DELAY, 0, 10000),
- s(Property.MASTER_RECOVERY_MAXTIME, 10000, 1000000),
+ s(Property.MASTER_RECOVERY_DELAY, 0, 100),
+ s(Property.MASTER_RECOVERY_MAXTIME, 10, 1000),
s(Property.MASTER_THREADCHECK, 100, 10000),
s(Property.MASTER_MINTHREADS, 1, 200),
};
Modified:
accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java?rev=1468928&r1=1468927&r2=1468928&view=diff
==============================================================================
---
accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java
(original)
+++
accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java
Wed Apr 17 14:24:49 2013
@@ -71,6 +71,7 @@ public class WalkingSecurity extends Sec
super(author, authent, pm, instanceId);
}
+ @SuppressWarnings("deprecation")
public WalkingSecurity(State state2) {
super(state2.getInstance().getInstanceID());
this.state = state2;
