This is an automated email from the ASF dual-hosted git repository.
vivekratnavel pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 53bbabf HDDS-5275. Datanode Report Publisher publishes one extra
report after DN shutdown (#2283)
53bbabf is described below
commit 53bbabfe42ff5a239436136c9483273af2fc9eb4
Author: Vivek Ratnavel Subramanian <[email protected]>
AuthorDate: Wed May 26 12:30:22 2021 -0700
HDDS-5275. Datanode Report Publisher publishes one extra report after DN
shutdown (#2283)
---
.../hadoop/ozone/container/common/report/ReportPublisher.java | 4 ++--
.../ozone/container/common/report/TestReportPublisher.java | 9 +++++++--
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/report/ReportPublisher.java
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/report/ReportPublisher.java
index 5d181ec..e6b4106 100644
---
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/report/ReportPublisher.java
+++
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/report/ReportPublisher.java
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with this
* work for additional information regarding copyright ownership. The ASF
@@ -67,9 +67,9 @@ public abstract class ReportPublisher<T extends
GeneratedMessage>
@Override
public void run() {
- publishReport();
if (!executor.isShutdown() &&
(context.getState() != DatanodeStates.SHUTDOWN)) {
+ publishReport();
executor.schedule(this,
getReportFrequency(), TimeUnit.MILLISECONDS);
}
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/report/TestReportPublisher.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/report/TestReportPublisher.java
index aa1337f..291ab6e 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/report/TestReportPublisher.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/report/TestReportPublisher.java
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with this
* work for additional information regarding copyright ownership. The ASF
@@ -107,6 +107,9 @@ public class TestReportPublisher {
Thread.sleep(100);
Assert.assertEquals(2, ((DummyReportPublisher) publisher).getReportCount);
executorService.shutdown();
+ // After executor shutdown, no new reports should be published
+ Thread.sleep(100);
+ Assert.assertEquals(2, ((DummyReportPublisher) publisher).getReportCount);
}
@Test
@@ -122,7 +125,9 @@ public class TestReportPublisher {
executorService.shutdown();
Assert.assertEquals(1, ((DummyReportPublisher) publisher).getReportCount);
verify(dummyContext, times(1)).addReport(null);
-
+ // After executor shutdown, no new reports should be published
+ Thread.sleep(100);
+ Assert.assertEquals(1, ((DummyReportPublisher) publisher).getReportCount);
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
