diff options
| author | Jon Marius Venstad <venstad@gmail.com> | 2020-12-10 08:01:50 +0100 |
|---|---|---|
| committer | Jon Marius Venstad <venstad@gmail.com> | 2020-12-10 08:01:50 +0100 |
| commit | 06803b97348d9a4fb56df083cae73e2afbc44438 (patch) | |
| tree | 82fd0d35de85fd05c03df9cd1c041969778664b8 /node-repository | |
| parent | c8f8e85351b70a02b9915b6978dd05e1c2cc55c7 (diff) | |
Rename close to awaitShutdown
Diffstat (limited to 'node-repository')
3 files changed, 4 insertions, 4 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ApplicationMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ApplicationMaintainer.java index 2c3785114de..9ac1ca2b4c1 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ApplicationMaintainer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ApplicationMaintainer.java @@ -101,8 +101,8 @@ public abstract class ApplicationMaintainer extends NodeRepositoryMaintainer { } @Override - public void close() { - super.close(); + public void awaitShutdown() { + super.awaitShutdown(); try { // Give deployments in progress some time to complete this.deploymentExecutor.awaitTermination(1, TimeUnit.MINUTES); diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java index b6e8bc145c5..ac33cc2441c 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java @@ -78,7 +78,7 @@ public class NodeRepositoryMaintenance extends AbstractComponent { @Override public void deconstruct() { maintainers.forEach(Maintainer::shutdown); - maintainers.forEach(Maintainer::close); + maintainers.forEach(Maintainer::awaitShutdown); } private static class DefaultTimes { diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/PeriodicApplicationMaintainerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/PeriodicApplicationMaintainerTest.java index 55a183c8ec1..cd188bc017f 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/PeriodicApplicationMaintainerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/PeriodicApplicationMaintainerTest.java @@ -51,7 +51,7 @@ public class PeriodicApplicationMaintainerTest { @After public void after() { - this.fixture.maintainer.close(); + this.fixture.maintainer.awaitShutdown(); } @Test(timeout = 60_000) |