rename properties for min/max workers threads to keep consistent

Alluxio · Feb 25, 2015 · 41d2817 · 41d2817
1 parent 6609edb
commit 41d2817
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/conf/tachyon-env.sh.template b/conf/tachyon-env.sh.template
@@ -71,11 +71,11 @@ export TACHYON_JAVA_OPTS+="
   -Dtachyon.underfs.address=$TACHYON_UNDERFS_ADDRESS
   -Dtachyon.underfs.hdfs.impl=$TACHYON_UNDERFS_HDFS_IMPL
   -Dtachyon.data.folder=$TACHYON_UNDERFS_ADDRESS/tmp/tachyon/data
-  -Dtachyon.worker.maxworker.threads=$TACHYON_WORKER_MAX_THREADS
+  -Dtachyon.worker.max.worker.threads=$TACHYON_WORKER_MAX_WORKER_THREADS
   -Dtachyon.workers.folder=$TACHYON_UNDERFS_ADDRESS/tmp/tachyon/workers
   -Dtachyon.worker.memory.size=$TACHYON_WORKER_MEMORY_SIZE
   -Dtachyon.worker.data.folder=/tachyonworker/
-  -Dtachyon.master.maxworker.threads=$TACHYON_MASTER_MAX_THREADS
+  -Dtachyon.master.max.worker.threads=$TACHYON_MASTER_MAX_WORKER_THREADS
   -Dtachyon.master.worker.timeout.ms=60000
   -Dtachyon.master.hostname=$TACHYON_MASTER_ADDRESS
   -Dtachyon.master.journal.folder=$TACHYON_HOME/journal/

diff --git a/core/src/main/java/tachyon/master/TachyonMaster.java b/core/src/main/java/tachyon/master/TachyonMaster.java
@@ -73,8 +73,8 @@ public static void main(String[] args) {
   private EditLogProcessor mEditLogProcessor;
   private int mWebPort;
 
-  private int mMaxWorkerThread;
+  private int mMaxWorkerThreads;
-  private int mMinWorkerThread;
+  private int mMinWorkerThreads;
   private boolean mZookeeperMode = false;
   private final ExecutorService mExecutorService = Executors.newFixedThreadPool(2,
       ThreadFactoryUtils.daemon("heartbeat-master-%d"));
@@ -101,13 +101,13 @@ public TachyonMaster(TachyonConf tachyonConf) {
 
     mIsStarted = false;
     mWebPort = webPort;
-    mMinWorkerThread = mTachyonConf.getInt(Constants.MASTER_MIN_WORKER_THREADS,
+    mMinWorkerThreads = mTachyonConf.getInt(Constants.MASTER_MIN_WORKER_THREADS,
         Runtime.getRuntime().availableProcessors());
 
     //Set max thread to max integer by default
     //An property will be set/added in tachyon-env for users to specify a number that make sense in
     //their production environment
-    mMaxWorkerThread = mTachyonConf.getInt(Constants.MASTER_MAX_WORKER_THREADS, Integer.MAX_VALUE);
+    mMaxWorkerThreads = mTachyonConf.getInt(Constants.MASTER_MAX_WORKER_THREADS, Integer.MAX_VALUE);
 
     try {
       // Extract the port from the generated socket.
@@ -238,8 +238,8 @@ private void setup() throws IOException, TTransportException {
 
     mMasterServiceServer = new TThreadPoolServer( new TThreadPoolServer.Args(
         mServerTServerSocket)
-        .maxWorkerThreads(mMaxWorkerThread)
+        .maxWorkerThreads(mMaxWorkerThreads)
-        .minWorkerThreads(mMinWorkerThread)
+        .minWorkerThreads(mMinWorkerThreads)
         .processor(masterServiceProcessor)
         .transportFactory(new TFramedTransport.Factory())
         .protocolFactory(new TBinaryProtocol.Factory()));