You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ar...@apache.org on 2015/06/26 23:49:56 UTC
hadoop git commit: Fix build break after merging from trunk
Repository: hadoop
Updated Branches:
refs/heads/HDFS-7240 3be3835be -> 652e21a35
Fix build break after merging from trunk
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/652e21a3
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/652e21a3
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/652e21a3
Branch: refs/heads/HDFS-7240
Commit: 652e21a3503b6e922cc9e5cad49dedc630ece114
Parents: 3be3835
Author: Arpit Agarwal <ar...@apache.org>
Authored: Fri Jun 26 14:48:58 2015 -0700
Committer: Arpit Agarwal <ar...@apache.org>
Committed: Fri Jun 26 14:48:58 2015 -0700
----------------------------------------------------------------------
.../hadoop/storagecontainer/StorageContainerNameService.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/652e21a3/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/storagecontainer/StorageContainerNameService.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/storagecontainer/StorageContainerNameService.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/storagecontainer/StorageContainerNameService.java
index dd3bb67..2b7e3ff 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/storagecontainer/StorageContainerNameService.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/storagecontainer/StorageContainerNameService.java
@@ -21,6 +21,7 @@ package org.apache.hadoop.storagecontainer;
import org.apache.hadoop.hdfs.protocol.Block;
import org.apache.hadoop.hdfs.server.blockmanagement.BlockInfo;
import org.apache.hadoop.hdfs.server.blockmanagement.BlockInfoUnderConstruction;
+import org.apache.hadoop.hdfs.server.namenode.CacheManager;
import org.apache.hadoop.hdfs.server.namenode.NameNode;
import org.apache.hadoop.hdfs.server.namenode.Namesystem;
import org.apache.hadoop.ipc.StandbyException;
@@ -90,6 +91,12 @@ public class StorageContainerNameService implements Namesystem {
}
@Override
+ public CacheManager getCacheManager() {
+ // Cache Management is not supported
+ return null;
+ }
+
+ @Override
public void readLock() {
coarseLock.readLock().lock();
}