Skip to content

Commit 105e188

Browse files
author
Stephen Wu
committed
fix deprecation
Change-Id: I655f331589d3b7fde68792fc485abfcba25afee7
1 parent 4f8fe79 commit 105e188

2 files changed

Lines changed: 32 additions & 31 deletions

File tree

  • hadoop-hdfs-project

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
import org.apache.hadoop.fs.FsServerDefaults;
6767
import org.apache.hadoop.fs.Options;
6868
import org.apache.hadoop.fs.Path;
69+
import org.apache.hadoop.fs.SafeModeAction;
6970
import org.apache.hadoop.fs.RemoteIterator;
7071
import org.apache.hadoop.fs.permission.FsPermission;
7172
import org.apache.hadoop.hdfs.DFSClient;
@@ -99,7 +100,6 @@
99100
import org.apache.hadoop.hdfs.protocol.SnapshottableDirectoryStatus;
100101
import org.apache.hadoop.hdfs.protocol.SnapshotStatus;
101102
import org.apache.hadoop.hdfs.protocol.HdfsConstants.DatanodeReportType;
102-
import org.apache.hadoop.hdfs.protocol.HdfsConstants.SafeModeAction;
103103
import org.apache.hadoop.hdfs.security.token.block.ExportedBlockKeys;
104104
import org.apache.hadoop.hdfs.server.blockmanagement.BlockManager;
105105
import org.apache.hadoop.hdfs.server.blockmanagement.BlockManagerTestUtil;
@@ -1432,27 +1432,27 @@ public void testProxyGetMostRecentCheckpointTxId() throws IOException {
14321432
@Test
14331433
public void testProxySetSafemode() throws Exception {
14341434
boolean routerSafemode =
1435-
routerProtocol.setSafeMode(SafeModeAction.SAFEMODE_GET, false);
1435+
routerProtocol.setSafeMode(HdfsConstants.SafeModeAction.SAFEMODE_GET, false);
14361436
boolean nnSafemode =
1437-
nnProtocol.setSafeMode(SafeModeAction.SAFEMODE_GET, false);
1437+
nnProtocol.setSafeMode(HdfsConstants.SafeModeAction.SAFEMODE_GET, false);
14381438
assertEquals(nnSafemode, routerSafemode);
14391439

14401440
routerSafemode =
1441-
routerProtocol.setSafeMode(SafeModeAction.SAFEMODE_GET, true);
1441+
routerProtocol.setSafeMode(HdfsConstants.SafeModeAction.SAFEMODE_GET, true);
14421442
nnSafemode =
1443-
nnProtocol.setSafeMode(SafeModeAction.SAFEMODE_GET, true);
1443+
nnProtocol.setSafeMode(HdfsConstants.SafeModeAction.SAFEMODE_GET, true);
14441444
assertEquals(nnSafemode, routerSafemode);
14451445

14461446
assertFalse(routerProtocol.setSafeMode(
1447-
SafeModeAction.SAFEMODE_GET, false));
1447+
HdfsConstants.SafeModeAction.SAFEMODE_GET, false));
14481448
assertTrue(routerProtocol.setSafeMode(
1449-
SafeModeAction.SAFEMODE_ENTER, false));
1449+
HdfsConstants.SafeModeAction.SAFEMODE_ENTER, false));
14501450
assertTrue(routerProtocol.setSafeMode(
1451-
SafeModeAction.SAFEMODE_GET, false));
1451+
HdfsConstants.SafeModeAction.SAFEMODE_GET, false));
14521452
assertFalse(routerProtocol.setSafeMode(
1453-
SafeModeAction.SAFEMODE_LEAVE, false));
1453+
HdfsConstants.SafeModeAction.SAFEMODE_LEAVE, false));
14541454
assertFalse(routerProtocol.setSafeMode(
1455-
SafeModeAction.SAFEMODE_GET, false));
1455+
HdfsConstants.SafeModeAction.SAFEMODE_GET, false));
14561456
}
14571457

14581458
@Test
@@ -1797,18 +1797,18 @@ public void testGetCurrentTXIDandRollEdits() throws IOException {
17971797
@Test
17981798
public void testSaveNamespace() throws IOException {
17991799
cluster.getCluster().getFileSystem(0)
1800-
.setSafeMode(HdfsConstants.SafeModeAction.SAFEMODE_ENTER);
1800+
.setSafeMode(SafeModeAction.ENTER);
18011801
cluster.getCluster().getFileSystem(1)
1802-
.setSafeMode(HdfsConstants.SafeModeAction.SAFEMODE_ENTER);
1802+
.setSafeMode(SafeModeAction.ENTER);
18031803

18041804
Boolean saveNamespace = routerProtocol.saveNamespace(0, 0);
18051805

18061806
assertTrue(saveNamespace);
18071807

18081808
cluster.getCluster().getFileSystem(0)
1809-
.setSafeMode(HdfsConstants.SafeModeAction.SAFEMODE_LEAVE);
1809+
.setSafeMode(SafeModeAction.LEAVE);
18101810
cluster.getCluster().getFileSystem(1)
1811-
.setSafeMode(HdfsConstants.SafeModeAction.SAFEMODE_LEAVE);
1811+
.setSafeMode(SafeModeAction.LEAVE);
18121812
}
18131813

18141814
/*

‎hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestSaveNamespace.java‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
import org.apache.hadoop.conf.Configuration;
4848
import org.apache.hadoop.fs.FileSystem;
4949
import org.apache.hadoop.fs.Path;
50+
import org.apache.hadoop.fs.SafeModeAction;
5051
import org.apache.hadoop.fs.permission.FsAction;
5152
import org.apache.hadoop.fs.permission.FsPermission;
5253
import org.apache.hadoop.fs.permission.PermissionStatus;
@@ -55,7 +56,7 @@
5556
import org.apache.hadoop.hdfs.DistributedFileSystem;
5657
import org.apache.hadoop.hdfs.HdfsConfiguration;
5758
import org.apache.hadoop.hdfs.MiniDFSCluster;
58-
import org.apache.hadoop.hdfs.protocol.HdfsConstants.SafeModeAction;
59+
import org.apache.hadoop.hdfs.protocol.HdfsConstants;
5960
import org.apache.hadoop.hdfs.server.blockmanagement.BlockIdManager;
6061
import org.apache.hadoop.hdfs.server.common.HdfsServerConstants.NamenodeRole;
6162
import org.apache.hadoop.hdfs.server.common.Storage.StorageDirectory;
@@ -212,7 +213,7 @@ private void saveNamespaceWithInjectedFault(Fault fault) throws Exception {
212213
doAnEdit(fsn, 1);
213214

214215
// Save namespace - this may fail, depending on fault injected
215-
fsn.setSafeMode(SafeModeAction.SAFEMODE_ENTER);
216+
fsn.setSafeMode(HdfsConstants.SafeModeAction.SAFEMODE_ENTER);
216217
try {
217218
fsn.saveNamespace(0, 0);
218219
if (shouldFail) {
@@ -226,7 +227,7 @@ private void saveNamespaceWithInjectedFault(Fault fault) throws Exception {
226227
}
227228
}
228229

229-
fsn.setSafeMode(SafeModeAction.SAFEMODE_LEAVE);
230+
fsn.setSafeMode(HdfsConstants.SafeModeAction.SAFEMODE_LEAVE);
230231
// Should still be able to perform edits
231232
doAnEdit(fsn, 2);
232233

@@ -281,7 +282,7 @@ public void testReinsertnamedirsInSavenamespace() throws Exception {
281282

282283
try {
283284
doAnEdit(fsn, 1);
284-
fsn.setSafeMode(SafeModeAction.SAFEMODE_ENTER);
285+
fsn.setSafeMode(HdfsConstants.SafeModeAction.SAFEMODE_ENTER);
285286

286287
// Save namespace - should mark the first storage dir as faulty
287288
// since it's not traversable.
@@ -420,7 +421,7 @@ public void doTestFailedSaveNamespace(boolean restoreStorageAfterFailure)
420421
doAnEdit(fsn, 1);
421422

422423
// Save namespace
423-
fsn.setSafeMode(SafeModeAction.SAFEMODE_ENTER);
424+
fsn.setSafeMode(HdfsConstants.SafeModeAction.SAFEMODE_ENTER);
424425
try {
425426
fsn.saveNamespace(0, 0);
426427
fail("saveNamespace did not fail even when all directories failed!");
@@ -469,7 +470,7 @@ public void testSaveWhileEditsRolled() throws Exception {
469470
doAnEdit(fsn, 2);
470471

471472
// Save namespace
472-
fsn.setSafeMode(SafeModeAction.SAFEMODE_ENTER);
473+
fsn.setSafeMode(HdfsConstants.SafeModeAction.SAFEMODE_ENTER);
473474
fsn.saveNamespace(0, 0);
474475

475476
// Now shut down and restart the NN
@@ -503,7 +504,7 @@ public void testTxIdPersistence() throws Exception {
503504
doAnEdit(fsn, 1);
504505
assertEquals(2, fsn.getEditLog().getLastWrittenTxId());
505506

506-
fsn.setSafeMode(SafeModeAction.SAFEMODE_ENTER);
507+
fsn.setSafeMode(HdfsConstants.SafeModeAction.SAFEMODE_ENTER);
507508
fsn.saveNamespace(0, 0);
508509

509510
// 2 more txns: END the first segment, BEGIN a new one
@@ -560,7 +561,7 @@ public void testCancelSaveNamespace() throws Exception {
560561
final Canceler canceler = new Canceler();
561562

562563
// Save namespace
563-
fsn.setSafeMode(SafeModeAction.SAFEMODE_ENTER);
564+
fsn.setSafeMode(HdfsConstants.SafeModeAction.SAFEMODE_ENTER);
564565
try {
565566
Future<Void> saverFuture = pool.submit(new Callable<Void>() {
566567
@Override
@@ -628,9 +629,9 @@ public void testSaveNamespaceWithRenamedLease() throws Exception {
628629
out = fs.create(new Path("/test-source/foo")); // don't close
629630
fs.rename(new Path("/test-source/"), new Path("/test-target/"));
630631

631-
fs.setSafeMode(SafeModeAction.SAFEMODE_ENTER);
632+
fs.setSafeMode(SafeModeAction.ENTER);
632633
cluster.getNameNodeRpc().saveNamespace(0, 0);
633-
fs.setSafeMode(SafeModeAction.SAFEMODE_LEAVE);
634+
fs.setSafeMode(SafeModeAction.LEAVE);
634635
} finally {
635636
IOUtils.cleanupWithLogger(LOG, out, fs);
636637
cluster.shutdown();
@@ -646,9 +647,9 @@ public void testSaveNamespaceWithDanglingLease() throws Exception {
646647
try {
647648
cluster.getNamesystem().leaseManager.addLease("me",
648649
INodeId.ROOT_INODE_ID + 1);
649-
fs.setSafeMode(SafeModeAction.SAFEMODE_ENTER);
650+
fs.setSafeMode(SafeModeAction.ENTER);
650651
cluster.getNameNodeRpc().saveNamespace(0, 0);
651-
fs.setSafeMode(SafeModeAction.SAFEMODE_LEAVE);
652+
fs.setSafeMode(SafeModeAction.LEAVE);
652653
} finally {
653654
cluster.shutdown();
654655
}
@@ -678,9 +679,9 @@ public void testSkipSnapshotSection() throws Exception {
678679
file.getFileWithSnapshotFeature().getDiffs() != null);
679680

680681
// saveNamespace
681-
fs.setSafeMode(SafeModeAction.SAFEMODE_ENTER);
682+
fs.setSafeMode(SafeModeAction.ENTER);
682683
cluster.getNameNodeRpc().saveNamespace(0, 0);
683-
fs.setSafeMode(SafeModeAction.SAFEMODE_LEAVE);
684+
fs.setSafeMode(SafeModeAction.LEAVE);
684685

685686
// restart namenode
686687
cluster.restartNameNode(true);
@@ -708,7 +709,7 @@ public void testSaveNamespaceBeforeShutdown() throws Exception {
708709
final FSImage fsimage = cluster.getNameNode().getFSImage();
709710
final long before = fsimage.getStorage().getMostRecentCheckpointTxId();
710711

711-
fs.setSafeMode(SafeModeAction.SAFEMODE_ENTER);
712+
fs.setSafeMode(SafeModeAction.ENTER);
712713
// set the timewindow to 1 hour and tx gap to 1000, which means that if
713714
// there is a checkpoint during the past 1 hour or the tx number happening
714715
// after the latest checkpoint is <= 1000, this saveNamespace request
@@ -723,14 +724,14 @@ public void testSaveNamespaceBeforeShutdown() throws Exception {
723724
// do another checkpoint. this time set the timewindow to 1s
724725
// we should see a new checkpoint
725726
cluster.getNameNodeRpc().saveNamespace(1, 1000);
726-
fs.setSafeMode(SafeModeAction.SAFEMODE_LEAVE);
727+
fs.setSafeMode(SafeModeAction.LEAVE);
727728

728729
after = fsimage.getStorage().getMostRecentCheckpointTxId();
729730
Assert.assertTrue(after > before);
730731

731732
fs.mkdirs(new Path("/foo/bar/baz")); // 3 new tx
732733

733-
fs.setSafeMode(SafeModeAction.SAFEMODE_ENTER);
734+
fs.setSafeMode(SafeModeAction.ENTER);
734735
cluster.getNameNodeRpc().saveNamespace(3600, 5); // 3 + end/start segment
735736
long after2 = fsimage.getStorage().getMostRecentCheckpointTxId();
736737
// no checkpoint should be made

0 commit comments

Comments
 (0)