From common-commits-return-97929-archive-asf-public=cust-asf.ponee.io@hadoop.apache.org Tue Jan 21 21:23:12 2020 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 8C217180657 for ; Tue, 21 Jan 2020 22:23:12 +0100 (CET) Received: (qmail 73702 invoked by uid 500); 21 Jan 2020 21:23:11 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 73693 invoked by uid 99); 21 Jan 2020 21:23:11 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Jan 2020 21:23:11 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 8A6B4819D2; Tue, 21 Jan 2020 21:23:11 +0000 (UTC) Date: Tue, 21 Jan 2020 21:23:11 +0000 To: "common-commits@hadoop.apache.org" Subject: [hadoop] branch trunk updated: HDFS-15126. TestDatanodeRegistration#testForcedRegistration fails intermittently. Contributed by Ahmed Hussein. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <157964179076.26586.3537790486564122977@gitbox.apache.org> From: inigoiri@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: hadoop X-Git-Refname: refs/heads/trunk X-Git-Reftype: branch X-Git-Oldrev: f206b736f0b370d212a399937c7a84e432f12eb5 X-Git-Newrev: b657822b98781f042fad5281c20123e803ebae0f X-Git-Rev: b657822b98781f042fad5281c20123e803ebae0f X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. inigoiri pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/hadoop.git The following commit(s) were added to refs/heads/trunk by this push: new b657822 HDFS-15126. TestDatanodeRegistration#testForcedRegistration fails intermittently. Contributed by Ahmed Hussein. b657822 is described below commit b657822b98781f042fad5281c20123e803ebae0f Author: Inigo Goiri AuthorDate: Tue Jan 21 13:22:53 2020 -0800 HDFS-15126. TestDatanodeRegistration#testForcedRegistration fails intermittently. Contributed by Ahmed Hussein. --- .../org/apache/hadoop/hdfs/TestDatanodeRegistration.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDatanodeRegistration.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDatanodeRegistration.java index 37042db..77aeff4 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDatanodeRegistration.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDatanodeRegistration.java @@ -364,14 +364,16 @@ public class TestDatanodeRegistration { waitForHeartbeat(dn, dnd); assertTrue(dnd.isRegistered()); assertSame(lastReg, dn.getDNRegistrationForBP(bpId)); - assertTrue(waitForBlockReport(dn, dnd)); + assertTrue("block report is not processed for DN " + dnd, + waitForBlockReport(dn, dnd)); assertTrue(dnd.isRegistered()); assertSame(lastReg, dn.getDNRegistrationForBP(bpId)); // check that block report is not processed and registration didn't // change. dnd.setForceRegistration(true); - assertFalse(waitForBlockReport(dn, dnd)); + assertFalse("block report is processed for DN " + dnd, + waitForBlockReport(dn, dnd)); assertFalse(dnd.isRegistered()); assertSame(lastReg, dn.getDNRegistrationForBP(bpId)); @@ -382,7 +384,8 @@ public class TestDatanodeRegistration { newReg = dn.getDNRegistrationForBP(bpId); assertNotSame(lastReg, newReg); lastReg = newReg; - assertTrue(waitForBlockReport(dn, dnd)); + assertTrue("block report is not processed for DN " + dnd, + waitForBlockReport(dn, dnd)); assertTrue(dnd.isRegistered()); assertSame(lastReg, dn.getDNRegistrationForBP(bpId)); @@ -447,8 +450,9 @@ public class TestDatanodeRegistration { public Boolean get() { return lastCount != storage.getBlockReportCount(); } - }, 10, 2000); + }, 10, 6000); } catch (TimeoutException te) { + LOG.error("Timeout waiting for block report for {}", dnd); return false; } return true; --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org