Skip to content

Commit f954e14

Browse files
fix acceptance test failure.
1 parent 1bbcf4f commit f954e14

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,8 @@ private OzoneManager(OzoneConfiguration conf) throws IOException,
339339

340340
// Load HA related configurations
341341
loadOMHAConfigs(configuration);
342+
InetSocketAddress omNodeRpcAddr = omNodeDetails.getRpcAddress();
343+
omRpcAddressTxt = new Text(omNodeDetails.getRpcAddressString());
342344

343345
scmContainerClient = getScmContainerClient(configuration);
344346
// verifies that the SCM info in the OM Version file is correct.
@@ -375,7 +377,6 @@ private OzoneManager(OzoneConfiguration conf) throws IOException,
375377
}
376378
certClient = new OMCertificateClient(new SecurityConfig(conf),
377379
omStorage.getOmCertSerialId());
378-
delegationTokenMgr = createDelegationTokenSecretManager(configuration);
379380
}
380381
if (secConfig.isBlockTokenEnabled()) {
381382
blockTokenMgr = createBlockTokenSecretManager(configuration);
@@ -410,8 +411,7 @@ private OzoneManager(OzoneConfiguration conf) throws IOException,
410411

411412
metrics = OMMetrics.create();
412413

413-
InetSocketAddress omNodeRpcAddr = omNodeDetails.getRpcAddress();
414-
omRpcAddressTxt = new Text(omNodeDetails.getRpcAddressString());
414+
// Start Om Rpc Server.
415415
omRpcServer = getRpcServer(conf);
416416
omRpcAddress = updateRPCListenAddress(configuration,
417417
OZONE_OM_ADDRESS_KEY, omNodeRpcAddr, omRpcServer);
@@ -438,6 +438,7 @@ private void instantiateServices() throws IOException {
438438
volumeManager, bucketManager);
439439
if (secConfig.isSecurityEnabled()) {
440440
s3SecretManager = new S3SecretManagerImpl(configuration, metadataManager);
441+
delegationTokenMgr = createDelegationTokenSecretManager(configuration);
441442
}
442443

443444
prefixManager = new PrefixManagerImpl(metadataManager);

0 commit comments

Comments
 (0)