umamaheswararao commented on a change in pull request #4058:
URL: https://github.com/apache/hadoop/pull/4058#discussion_r823332317
##########
File path:
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/sps/ExternalStoragePolicySatisfier.java
##########
@@ -96,20 +96,28 @@ private static void secureLogin(Configuration conf)
socAddr.getHostName());
}
- private static NameNodeConnector getNameNodeConnector(Configuration conf)
- throws IOException, InterruptedException {
+ public static NameNodeConnector getNameNodeConnector(Configuration conf,
boolean forTest)
+ throws InterruptedException {
final Collection<URI> namenodes = DFSUtil.getInternalNsRpcUris(conf);
final Path externalSPSPathId = HdfsServerConstants.MOVER_ID_PATH;
+ String serverName = ExternalStoragePolicySatisfier.class.getSimpleName();
while (true) {
try {
final List<NameNodeConnector> nncs = NameNodeConnector
.newNameNodeConnectors(namenodes,
- ExternalStoragePolicySatisfier.class.getSimpleName(),
+ serverName,
externalSPSPathId, conf,
NameNodeConnector.DEFAULT_MAX_IDLE_ITERATIONS);
return nncs.get(0);
} catch (IOException e) {
LOG.warn("Failed to connect with namenode", e);
+ if (e.getMessage().equals("Another " + serverName + " is running.")) {
Review comment:
It's quite some time I looked at this code. Thanks a lot for working on
these improvements.
How about using ExitUtil class to terminate. That class has static methods
to disable exit. That you can use it from tests.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
