big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDFS-13076: [SPS]: Resolve conflicts after rebasing HDFS-10285 branch to trunk. Contributed by Rakesh R.

Browse Source
This commit is contained in:
Rakesh Radhakrishnan 2018-07-05 10:10:13 +05:30 committed by Uma Maheswara Rao Gangumalla
parent 66e8f9b315
commit db3f227d8a
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterNamenodeProtocol.java
View File

@ -184,4 +184,10 @@ public boolean isRollingUpgrade() throws IOException {
rpcServer.checkOperation(OperationCategory.READ, false);
return false;
}
@Override
public Long getNextSPSPath() throws IOException {
// not supported
return null;
}
}

7
hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterRpcServer.java
View File

@ -2509,4 +2509,11 @@ public StoragePolicySatisfyPathStatus checkStoragePolicySatisfyPathStatus(
checkOperation(OperationCategory.READ, false);
return StoragePolicySatisfyPathStatus.NOT_AVAILABLE;
}
@Override
public Long getNextSPSPath() throws IOException {
checkOperation(OperationCategory.READ, false);
// not supported
return null;
}
}

2
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
View File

@ -5078,7 +5078,7 @@ public boolean createSPSManager(final Configuration conf,
DFSConfigKeys.DFS_STORAGE_POLICY_ENABLED_KEY,
DFSConfigKeys.DFS_STORAGE_POLICY_ENABLED_DEFAULT);
String modeVal = spsMode;
if (org.apache.commons.lang.StringUtils.isBlank(modeVal)) {
if (org.apache.commons.lang3.StringUtils.isBlank(modeVal)) {
modeVal = conf.get(DFSConfigKeys.DFS_STORAGE_POLICY_SATISFIER_MODE_KEY,
DFSConfigKeys.DFS_STORAGE_POLICY_SATISFIER_MODE_DEFAULT);
}

4
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/sps/IntraSPSNameNodeFileIdCollector.java
View File

@ -45,7 +45,7 @@ public class IntraSPSNameNodeFileIdCollector extends FSTreeTraverser
public IntraSPSNameNodeFileIdCollector(FSDirectory dir,
SPSService service) {
super(dir);
super(dir, service.getConf());
this.service = service;
this.maxQueueLimitToScan = service.getConf().getInt(
DFSConfigKeys.DFS_STORAGE_POLICY_SATISFIER_QUEUE_LIMIT_KEY,
@ -72,7 +72,7 @@ protected boolean processFileInode(INode inode, TraverseInfo traverseInfo)
}
@Override
protected boolean canSubmitCurrentBatch() {
protected boolean shouldSubmitCurrentBatch() {
return remainingCapacity <= 0;
}