Skip to content

HDFS-16627. Improve BPServiceActor#register log to add NameNode address. #4419

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Hexiaoqiao merged 4 commits into from
Jun 11, 2022
Merged

HDFS-16627. Improve BPServiceActor#register log to add NameNode address. #4419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
79606e3
HDFS-16627. improve BPServiceActor#register Log Add NN Addr.
Jun 9, 2022
fdad3bc
Merge branch 'apache:trunk' into HDFS-16627
slfan1989 Jun 9, 2022
1e3aa22
HDFS-16627. Fix CheckStyle.
Jun 9, 2022
1c7aa6a
Merge branch 'apache:trunk' into HDFS-16627
slfan1989 Jun 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions ...ject/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPServiceActor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -816,7 +816,7 @@ void register(NamespaceInfo nsInfo) throws IOException {
// off disk - so update the bpRegistration object from that info
DatanodeRegistration newBpRegistration = bpos.createRegistration();

LOG.info(this + " beginning handshake with NN");
LOG.info("{} beginning handshake with NN: {}.", this, nnAddr);

while (shouldRun()) {
try {
Expand All @@ -826,15 +826,14 @@ void register(NamespaceInfo nsInfo) throws IOException {
bpRegistration = newBpRegistration;
break;
} catch(EOFException e) { // namenode might have just restarted
LOG.info("Problem connecting to server: " + nnAddr + " :"
+ e.getLocalizedMessage());
LOG.info("Problem connecting to server: {} : {}.", nnAddr, e.getLocalizedMessage());
} catch(SocketTimeoutException e) { // namenode is busy
LOG.info("Problem connecting to server: " + nnAddr);
LOG.info("Problem connecting to server: {}.", nnAddr);
} catch(RemoteException e) {
LOG.warn("RemoteException in register", e);
LOG.warn("RemoteException in register to server: {}.", nnAddr, e);
throw e;
} catch(IOException e) {
LOG.warn("Problem connecting to server: " + nnAddr);
LOG.warn("Problem connecting to server: {}.", nnAddr);
}
// Try again in a second
sleepAndLogInterrupts(1000, "connecting to server");
Expand All @@ -844,7 +843,7 @@ void register(NamespaceInfo nsInfo) throws IOException {
throw new IOException("DN shut down before block pool registered");
}

LOG.info(this + " successfully registered with NN");
LOG.info("{} successfully registered with NN: {}.", this, nnAddr);
bpos.registrationSucceeded(this, bpRegistration);

// reset lease id whenever registered to NN.
Expand Down
4 changes: 2 additions & 2 deletions ...adoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDatanodeRegister.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public void setUp() throws IOException {
actor = new BPServiceActor("test", "test", INVALID_ADDR, null, mockBPOS);

fakeNsInfo = mock(NamespaceInfo.class);
// Return a a good software version.
// Return a good software version.
doReturn(VersionInfo.getVersion()).when(fakeNsInfo).getSoftwareVersion();
// Return a good layout version for now.
doReturn(HdfsServerConstants.NAMENODE_LAYOUT_VERSION).when(fakeNsInfo)
Expand Down Expand Up @@ -144,7 +144,7 @@ public void testDNShutdwonBeforeRegister() throws Exception {
DataNode dn = new DataNode(conf, locations, null, null);
BPOfferService bpos = new BPOfferService("test_ns",
Lists.newArrayList("nn0"), Lists.newArrayList(nnADDR),
Collections.<InetSocketAddress>nCopies(1, null), dn);
Collections.nCopies(1, null), dn);
DatanodeProtocolClientSideTranslatorPB fakeDnProt =
mock(DatanodeProtocolClientSideTranslatorPB.class);
when(fakeDnProt.versionRequest()).thenReturn(fakeNsInfo);
Expand Down