From c79205247ebb5f784cdaebc934c5a3311064f43c Mon Sep 17 00:00:00 2001 From: Erik Krogen Date: Fri, 23 Feb 2018 09:44:29 -0800 Subject: [PATCH] Closes #7. Replace usage of package-private dfs field within DistributedFileSystem with getClient. --- .../workloadgenerator/audit/AuditReplayThread.java | 3 +-- .../java/org/apache/hadoop/hdfs/DynoDFSUtil.java | 13 ------------- 2 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 dynamometer-workload/src/main/java/org/apache/hadoop/hdfs/DynoDFSUtil.java diff --git a/dynamometer-workload/src/main/java/com/linkedin/dynamometer/workloadgenerator/audit/AuditReplayThread.java b/dynamometer-workload/src/main/java/com/linkedin/dynamometer/workloadgenerator/audit/AuditReplayThread.java index 726e3c98f7..c007ff160c 100644 --- a/dynamometer-workload/src/main/java/com/linkedin/dynamometer/workloadgenerator/audit/AuditReplayThread.java +++ b/dynamometer-workload/src/main/java/com/linkedin/dynamometer/workloadgenerator/audit/AuditReplayThread.java @@ -22,7 +22,6 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.permission.FsPermission; import org.apache.hadoop.hdfs.DFSClient; -import org.apache.hadoop.hdfs.DynoDFSUtil; import org.apache.hadoop.hdfs.DistributedFileSystem; import org.apache.hadoop.hdfs.protocol.HdfsFileStatus; import org.apache.hadoop.mapreduce.Counter; @@ -70,7 +69,7 @@ public class AuditReplayThread extends Thread { createBlocks = mapperConf.getBoolean(AuditReplayMapper.CREATE_BLOCKS_KEY, AuditReplayMapper.CREATE_BLOCKS_DEFAULT); fs = FileSystem.get(URI.create(namenodeURI), mapperConf); - dfsClient = DynoDFSUtil.getDFSClient((DistributedFileSystem) fs); + dfsClient = ((DistributedFileSystem) fs).getClient(); LOG.info("Start timestamp: " + startTimestampMs); for (REPLAYCOUNTERS rc : REPLAYCOUNTERS.values()) { replayCountersMap.put(rc, new GenericCounter()); diff --git a/dynamometer-workload/src/main/java/org/apache/hadoop/hdfs/DynoDFSUtil.java b/dynamometer-workload/src/main/java/org/apache/hadoop/hdfs/DynoDFSUtil.java deleted file mode 100644 index 741919e28a..0000000000 --- a/dynamometer-workload/src/main/java/org/apache/hadoop/hdfs/DynoDFSUtil.java +++ /dev/null @@ -1,13 +0,0 @@ -/** - * Copyright 2017 LinkedIn Corporation. All rights reserved. Licensed under the BSD-2 Clause license. - * See LICENSE in the project root for license information. - */ -package org.apache.hadoop.hdfs; - -public class DynoDFSUtil { - - public static DFSClient getDFSClient(DistributedFileSystem dfs) { - return dfs.dfs; - } - -}