From 0091606e2d802e7c59e29745963c50ec0ca54aac Mon Sep 17 00:00:00 2001 From: Arpit Agarwal Date: Mon, 4 Nov 2013 16:00:12 +0000 Subject: [PATCH] HDFS-5448. Fix break caused by previous checkin for HDFS-5448. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1538655 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES_HDFS-2832.txt | 3 +++ .../org/apache/hadoop/hdfs/server/datanode/BPOfferService.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES_HDFS-2832.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES_HDFS-2832.txt index 7448308106..b80fff3fc5 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES_HDFS-2832.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES_HDFS-2832.txt @@ -65,3 +65,6 @@ IMPROVEMENTS: HDFS-5448. Datanode should generate its ID on first registration. (Arpit Agarwal) + HDFS-5448. Fix break caused by previous checkin for HDFS-5448. (Arpit + Agarwal) + diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPOfferService.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPOfferService.java index 084b9de912..5caf54fc6b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPOfferService.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPOfferService.java @@ -331,7 +331,8 @@ private static void checkNSEquality( } } - synchronized DatanodeRegistration createRegistration() { + synchronized DatanodeRegistration createRegistration() + throws IOException { Preconditions.checkState(bpNSInfo != null, "getRegistration() can only be called after initial handshake"); return dn.createBPRegistration(bpNSInfo);