HDFS-15625: Namenode trashEmptier should not init ViewFs on startup (#2378). Contributed by Uma Maheswara Rao G.
This commit is contained in:
parent
2e46ef9417
commit
b76b36ebbc
@ -41,6 +41,7 @@
|
||||
import org.apache.hadoop.hdfs.DFSConfigKeys;
|
||||
import org.apache.hadoop.hdfs.DFSUtil;
|
||||
import org.apache.hadoop.hdfs.DFSUtilClient;
|
||||
import org.apache.hadoop.hdfs.DistributedFileSystem;
|
||||
import org.apache.hadoop.hdfs.HAUtil;
|
||||
import org.apache.hadoop.hdfs.HdfsConfiguration;
|
||||
import org.apache.hadoop.hdfs.client.HdfsClientConfigKeys;
|
||||
@ -927,7 +928,9 @@ private void startTrashEmptier(final Configuration conf) throws IOException {
|
||||
new PrivilegedExceptionAction<FileSystem>() {
|
||||
@Override
|
||||
public FileSystem run() throws IOException {
|
||||
return FileSystem.get(conf);
|
||||
FileSystem dfs = new DistributedFileSystem();
|
||||
dfs.initialize(FileSystem.getDefaultUri(conf), conf);
|
||||
return dfs;
|
||||
}
|
||||
});
|
||||
this.emptier = new Thread(new Trash(fs, conf).getEmptier(), "Trash Emptier");
|
||||
|
@ -60,7 +60,7 @@ public static void setUp() {
|
||||
@Test(timeout = 30000)
|
||||
public void testHANameNodeAndDataNodeStartup() throws Exception {
|
||||
cluster = new MiniDFSCluster.Builder(CONF)
|
||||
.nnTopology(MiniDFSNNTopology.simpleHATopology()).numDataNodes(1)
|
||||
.nnTopology(MiniDFSNNTopology.simpleHATopology()).numDataNodes(0)
|
||||
.waitSafeMode(false).build();
|
||||
cluster.waitActive();
|
||||
cluster.transitionToActive(0);
|
||||
@ -73,7 +73,7 @@ public void testHANameNodeAndDataNodeStartup() throws Exception {
|
||||
@Test(timeout = 30000)
|
||||
public void testNameNodeAndDataNodeStartup() throws Exception {
|
||||
cluster =
|
||||
new MiniDFSCluster.Builder(CONF).numDataNodes(1).waitSafeMode(false)
|
||||
new MiniDFSCluster.Builder(CONF).numDataNodes(0).waitSafeMode(false)
|
||||
.build();
|
||||
cluster.waitActive();
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user