Skip to content

HDDS-5275. Datanode Report Publisher publishes one extra report after DN shutdown #2283

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
vivekratnavel merged 1 commit into from
May 26, 2021
Merged

HDDS-5275. Datanode Report Publisher publishes one extra report after DN shutdown #2283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions ...ervice/src/main/java/org/apache/hadoop/ozone/container/common/report/ReportPublisher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -67,9 +67,9 @@ public ConfigurationSource getConf() {

@Override
public void run() {
publishReport();
if (!executor.isShutdown() &&
(context.getState() != DatanodeStates.SHUTDOWN)) {
publishReport();
executor.schedule(this,
getReportFrequency(), TimeUnit.MILLISECONDS);
}
Expand Down
9 changes: 7 additions & 2 deletions ...ce/src/test/java/org/apache/hadoop/ozone/container/common/report/TestReportPublisher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -107,6 +107,9 @@ public void testScheduledReport() throws InterruptedException {
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
Expand All @@ -122,7 +125,9 @@ public void testPublishReport() throws InterruptedException {
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
Expand Down