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

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

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

4
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
View File

@ -3624,8 +3624,8 @@ private DiskBalancer getDiskBalancer() throws IOException {
} }
return this.diskBalancer; return this.diskBalancer;
} }
}
StoragePolicySatisfyWorker getStoragePolicySatisfyWorker() { StoragePolicySatisfyWorker getStoragePolicySatisfyWorker() {
return storagePolicySatisfyWorker; return storagePolicySatisfyWorker;
}} }
}