Skip to content

Commit 51960ab

Browse files
committed
add unit test.
1 parent d315366 commit 51960ab

2 files changed

Lines changed: 22 additions & 18 deletions

File tree

hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterMountTable.java

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,18 +68,19 @@
6868
/**
6969
* Test a router end-to-end including the MountTable.
7070
*/
71+
@SuppressWarnings("checkstyle:VisibilityModifier")
7172
public class TestRouterMountTable {
7273

73-
private static StateStoreDFSCluster cluster;
74-
private static NamenodeContext nnContext0;
75-
private static NamenodeContext nnContext1;
76-
private static RouterContext routerContext;
77-
private static MountTableResolver mountTable;
78-
private static ClientProtocol routerProtocol;
79-
private static long startTime;
80-
private static FileSystem nnFs0;
81-
private static FileSystem nnFs1;
82-
private static FileSystem routerFs;
74+
protected static StateStoreDFSCluster cluster;
75+
protected static NamenodeContext nnContext0;
76+
protected static NamenodeContext nnContext1;
77+
protected static RouterContext routerContext;
78+
protected static MountTableResolver mountTable;
79+
protected static ClientProtocol routerProtocol;
80+
protected static long startTime;
81+
protected static FileSystem nnFs0;
82+
protected static FileSystem nnFs1;
83+
protected static FileSystem routerFs;
8384

8485
@BeforeClass
8586
public static void globalSetUp() throws Exception {

hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/async/TestRouterAsyncMountTable.java

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,23 @@
1818
package org.apache.hadoop.hdfs.server.federation.router.async;
1919

2020
import org.apache.hadoop.conf.Configuration;
21-
import org.apache.hadoop.fs.FileSystem;
2221
import org.apache.hadoop.fs.Path;
23-
import org.apache.hadoop.hdfs.server.federation.MiniRouterDFSCluster;
2422
import org.apache.hadoop.hdfs.server.federation.RouterConfigBuilder;
2523
import org.apache.hadoop.hdfs.server.federation.StateStoreDFSCluster;
2624
import org.apache.hadoop.hdfs.server.federation.resolver.MountTableManager;
2725
import org.apache.hadoop.hdfs.server.federation.resolver.MountTableResolver;
2826
import org.apache.hadoop.hdfs.server.federation.router.RBFConfigKeys;
2927
import org.apache.hadoop.hdfs.server.federation.router.Router;
3028
import org.apache.hadoop.hdfs.server.federation.router.RouterClient;
29+
import org.apache.hadoop.hdfs.server.federation.router.TestRouterMountTable;
3130
import org.apache.hadoop.hdfs.server.federation.store.protocol.AddMountTableEntryRequest;
3231
import org.apache.hadoop.hdfs.server.federation.store.protocol.AddMountTableEntryResponse;
3332
import org.apache.hadoop.hdfs.server.federation.store.protocol.GetMountTableEntriesRequest;
3433
import org.apache.hadoop.hdfs.server.federation.store.protocol.GetMountTableEntriesResponse;
3534
import org.apache.hadoop.hdfs.server.federation.store.protocol.RemoveMountTableEntryRequest;
3635
import org.apache.hadoop.hdfs.server.federation.store.records.MountTable;
3736
import org.apache.hadoop.test.LambdaTestUtils;
37+
import org.apache.hadoop.util.Time;
3838
import org.junit.After;
3939
import org.junit.AfterClass;
4040
import org.junit.BeforeClass;
@@ -52,16 +52,13 @@
5252
/**
5353
* Test a router end-to-end including the MountTable using async rpc.
5454
*/
55-
public class TestRouterAsyncMountTable {
55+
public class TestRouterAsyncMountTable extends TestRouterMountTable {
5656
public static final Logger LOG = LoggerFactory.getLogger(TestRouterAsyncMountTable.class);
5757

58-
private static StateStoreDFSCluster cluster;
59-
private static MiniRouterDFSCluster.RouterContext routerContext;
60-
private static MountTableResolver mountTable;
61-
private static FileSystem routerFs;
62-
6358
@BeforeClass
6459
public static void globalSetUp() throws Exception {
60+
startTime = Time.now();
61+
6562
// Build and start a federated cluster.
6663
cluster = new StateStoreDFSCluster(false, 2);
6764
Configuration conf = new RouterConfigBuilder()
@@ -76,9 +73,15 @@ public static void globalSetUp() throws Exception {
7673
cluster.startRouters();
7774
cluster.waitClusterUp();
7875

76+
// Get the end points.
77+
nnContext0 = cluster.getNamenode("ns0", null);
78+
nnContext1 = cluster.getNamenode("ns1", null);
79+
nnFs0 = nnContext0.getFileSystem();
80+
nnFs1 = nnContext1.getFileSystem();
7981
routerContext = cluster.getRandomRouter();
8082
routerFs = routerContext.getFileSystem();
8183
Router router = routerContext.getRouter();
84+
routerProtocol = routerContext.getClient().getNamenode();
8285
mountTable = (MountTableResolver) router.getSubclusterResolver();
8386
}
8487

0 commit comments

Comments
 (0)