Merge branch 'master' into cascading_lru

Alluxio · Jul 13, 2015 · ac8ae9b · ac8ae9b
2 parents 0601e0f + a0b12cd
commit ac8ae9b
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -3,16 +3,15 @@ Tachyon
 
 The master branch is in version 0.7.0-SNAPSHOT:
 
-- [Tachyon Homepage](http://www.tachyonproject.org)
+- [Tachyon Homepage](http://www.tachyonproject.org) | [Master Branch Document](http://tachyon-project.org/master/)
 - [Contribute to Tachyon](http://tachyon-project.org/master/Contributing-to-Tachyon.html) and
 [New Contributor's Tasks](https://tachyon.atlassian.net/issues/?jql=project%20%3D%20TACHYON%20AND%20labels%20%3D%20NewContributor%20AND%20status%20%3D%20Open)
-  - Please limit 2 tasks per new contributor. Afterwards, try some Beginner/Intermediate tasks,
+  - Please limit 2 tasks per new contributor. Afterwards, try some [beginner tasks](https://tachyon.atlassian.net/issues/?jql=project%20%3D%20TACHYON%20AND%20labels%20%3D%20Beginner%20AND%20status%20%3D%20Open) or [intermediate tasks](https://tachyon.atlassian.net/issues/?jql=project%20%3D%20TACHYON%20AND%20labels%20%3D%20Intermediate%20AND%20status%20%3D%20Open),
   or ask in the [Developer Mailing List](https://groups.google.com/forum/#!forum/tachyon-dev).
 - [Releases](https://github.com/amplab/tachyon/tags)
 - [Tachyon JIRA](https://tachyon.atlassian.net/browse/TACHYON)
-- [Master Branch Document](http://tachyon-project.org/master/)
-- [User Group](https://groups.google.com/forum/?fromgroups#!forum/tachyon-users)
-- [Meetup Group](http://www.meetup.com/Tachyon)
+- [User Mailing List](https://groups.google.com/forum/?fromgroups#!forum/tachyon-users)
+- [Bay Area Meetup Group](http://www.meetup.com/Tachyon)
 
 ## Building applications with Tachyon
 

diff --git a/deploy/vagrant/core/config_aws.rb b/deploy/vagrant/core/config_aws.rb
@@ -13,6 +13,8 @@ def config_aws(config, i, total, name)
   config.vm.synced_folder ".", "/vagrant", disabled: true
 
   config.vm.provider :aws do |aws, override|
+    aws.access_key_id = ENV['AWS_ACCESS_KEY_ID']
+    aws.secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
     aws.keypair_name = KEYPAIR
     aws.security_groups = SECURITY_GROUP
     aws.ami = AMI

diff --git a/servers/src/main/java/tachyon/worker/block/allocator/AllocatorFactory.java b/servers/src/main/java/tachyon/worker/block/allocator/AllocatorFactory.java
@@ -15,6 +15,7 @@
 
 package tachyon.worker.block.allocator;
 
+import com.google.common.base.Preconditions;
 
 import tachyon.worker.block.BlockMetadataManagerView;
 
@@ -30,13 +31,14 @@ public class AllocatorFactory {
    * @return the generated Allocator
    */
   public static Allocator create(AllocatorType allocatorType, BlockMetadataManagerView view) {
+    BlockMetadataManagerView managerView = Preconditions.checkNotNull(view);
     switch (allocatorType) {
       case GREEDY:
-        return new GreedyAllocator(view);
+        return new GreedyAllocator(managerView);
       case MAX_FREE:
-        return new MaxFreeAllocator(view);
+        return new MaxFreeAllocator(managerView);
       default:
-        return new MaxFreeAllocator(view);
+        return new MaxFreeAllocator(managerView);
     }
   }
 

diff --git a/servers/src/main/java/tachyon/worker/block/allocator/GreedyAllocator.java b/servers/src/main/java/tachyon/worker/block/allocator/GreedyAllocator.java
@@ -17,8 +17,6 @@
 
 import java.io.IOException;
 
-import com.google.common.base.Preconditions;
-
 import tachyon.worker.block.BlockMetadataManagerView;
 import tachyon.worker.block.BlockStoreLocation;
 import tachyon.worker.block.meta.StorageDirView;
@@ -33,7 +31,7 @@ public class GreedyAllocator implements Allocator {
   private BlockMetadataManagerView mManagerView;
 
   public GreedyAllocator(BlockMetadataManagerView view) {
-    mManagerView = Preconditions.checkNotNull(view);
+    mManagerView = view;
   }
 
   @Override

diff --git a/servers/src/main/java/tachyon/worker/block/allocator/MaxFreeAllocator.java b/servers/src/main/java/tachyon/worker/block/allocator/MaxFreeAllocator.java
@@ -17,8 +17,6 @@
 
 import java.io.IOException;
 
-import com.google.common.base.Preconditions;
-
 import tachyon.worker.block.BlockMetadataManagerView;
 import tachyon.worker.block.BlockStoreLocation;
 import tachyon.worker.block.meta.StorageDirView;
@@ -33,7 +31,7 @@ public class MaxFreeAllocator implements Allocator {
   private BlockMetadataManagerView mManagerView;
 
   public MaxFreeAllocator(BlockMetadataManagerView view) {
-    mManagerView = Preconditions.checkNotNull(view);
+    mManagerView = view;
   }
 
   @Override

diff --git a/servers/src/main/java/tachyon/worker/block/evictor/EvictorFactory.java b/servers/src/main/java/tachyon/worker/block/evictor/EvictorFactory.java
@@ -15,6 +15,8 @@
 
 package tachyon.worker.block.evictor;
 
+import com.google.common.base.Preconditions;
+
 import tachyon.worker.block.BlockMetadataManagerView;
 
 /**
@@ -31,13 +33,14 @@ private EvictorFactory() {}
    * @return the generated Evictor
    */
   public static Evictor create(EvictorType evictorType, BlockMetadataManagerView view) {
+    BlockMetadataManagerView managerView = Preconditions.checkNotNull(view);
     switch (evictorType) {
       case GREEDY:
-        return new GreedyEvictor(view);
+        return new GreedyEvictor(managerView);
       case LRU:
-        return new LRUEvictor(view);
+        return new LRUEvictor(managerView);
       default:
-        return new LRUEvictor(view);
+        return new LRUEvictor(managerView);
     }
   }
 }
diff --git a/servers/src/main/java/tachyon/worker/block/evictor/GreedyEvictor.java b/servers/src/main/java/tachyon/worker/block/evictor/GreedyEvictor.java
@@ -24,8 +24,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Preconditions;
-
 import tachyon.Constants;
 import tachyon.Pair;
 import tachyon.worker.block.BlockMetadataManagerView;
@@ -44,7 +42,7 @@ public class GreedyEvictor extends BlockStoreEventListenerBase implements Evicto
   private BlockMetadataManagerView mManagerView;
 
   public GreedyEvictor(BlockMetadataManagerView view) {
-    mManagerView = Preconditions.checkNotNull(view);
+    mManagerView = view;
   }
 
   @Override

diff --git a/servers/src/main/java/tachyon/worker/block/evictor/LRUEvictor.java b/servers/src/main/java/tachyon/worker/block/evictor/LRUEvictor.java
@@ -26,8 +26,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Preconditions;
-
 import tachyon.Constants;
 import tachyon.Pair;
 import tachyon.worker.block.BlockMetadataManagerView;
@@ -56,7 +54,7 @@ public class LRUEvictor extends BlockStoreEventListenerBase implements Evictor {
           LINKED_HASH_MAP_INIT_LOAD_FACTOR, LINKED_HASH_MAP_ACCESS_ORDERED));
 
   public LRUEvictor(BlockMetadataManagerView view) {
-    mManagerView = Preconditions.checkNotNull(view);
+    mManagerView = view;
 
     // preload existing blocks loaded by StorageDir to Evictor
     for (StorageTierView tierView : mManagerView.getTierViews()) {