Author: drew
Date: Fri Jan 18 15:45:55 2013
New Revision: 1435198
URL: http://svn.apache.org/viewvc?rev=1435198&view=rev
Log:
ACCUMULO-778 (Configurable FATE threads in master) backport to 1.4 branch
Modified:
accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/conf/Property.java
accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/Master.java
Modified:
accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/conf/Property.java
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/conf/Property.java?rev=1435198&r1=1435197&r2=1435198&view=diff
==============================================================================
---
accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/conf/Property.java
(original)
+++
accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/conf/Property.java
Fri Jan 18 15:45:55 2013
@@ -72,6 +72,7 @@ public enum Property {
MASTER_BULK_TIMEOUT("master.bulk.timeout", "5m", PropertyType.TIMEDURATION,
"The time to wait for a tablet server to process a bulk import request"),
MASTER_MINTHREADS("master.server.threads.minimum", "20", PropertyType.COUNT,
"The minimum number of threads to use to handle incoming requests."),
MASTER_THREADCHECK("master.server.threadcheck.time", "1s",
PropertyType.TIMEDURATION, "The time between adjustments of the server thread
pool."),
+ MASTER_FATE_THREADPOOL_SIZE("master.fate.threadpool.size", "4",
PropertyType.COUNT, "The number of threads used to run FAult-Tolerant
Executions. These are primarily table operations like merge."),
// properties that are specific to tablet server behavior
TSERV_PREFIX("tserver.", null, PropertyType.PREFIX, "Properties in this
category affect the behavior of the tablet servers"),
Modified:
accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/Master.java
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/Master.java?rev=1435198&r1=1435197&r2=1435198&view=diff
==============================================================================
---
accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/Master.java
(original)
+++
accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/Master.java
Fri Jan 18 15:45:55 2013
@@ -220,6 +220,7 @@ public class Master implements LiveTServ
private MasterState state = MasterState.INITIAL;
private Fate<Master> fate;
+ private int fateThreadCount;
volatile private SortedMap<TServerInstance,TabletServerStatus> tserverStatus
= Collections
.unmodifiableSortedMap(new
TreeMap<TServerInstance,TabletServerStatus>());
@@ -537,6 +538,7 @@ public class Master implements LiveTServ
log.info("Instance " + instance.getInstanceID());
ThriftTransportPool.getInstance().setIdleTime(ServerConfiguration.getSiteConfiguration().getTimeInMillis(Property.GENERAL_RPC_TIMEOUT));
+ fateThreadCount =
ServerConfiguration.getSiteConfiguration().getCount(Property.MASTER_FATE_THREADPOOL_SIZE);
hostname = Accumulo.getLocalAddress(args).getHostName();
fs =
TraceFileSystem.wrap(FileUtil.getFileSystem(CachedConfiguration.getInstance(),
ServerConfiguration.getSiteConfiguration()));
@@ -2096,7 +2098,7 @@ public class Master implements LiveTServ
// TODO: add shutdown for fate object
try {
fate = new Fate<Master>(this, new
org.apache.accumulo.server.fate.ZooStore<Master>(ZooUtil.getRoot(instance) +
Constants.ZFATE,
- ZooReaderWriter.getRetryingInstance()), 4);
+ ZooReaderWriter.getRetryingInstance()), fateThreadCount);
} catch (KeeperException e) {
throw new IOException(e);
} catch (InterruptedException e) {
