diff options
| author | Harald Musum <musum@yahoo-inc.com> | 2017-06-07 13:29:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-07 13:29:52 +0200 |
| commit | 1fd84f704b4fd47998e14903039b65eb9467850d (patch) | |
| tree | 480a0baa11138401483ea4a8fba445540eeb0e6e /node-repository | |
| parent | 5784f8061bdef3d876cbfa47e1eec8448bb2df09 (diff) | |
| parent | 4f16a1250494e814db7ca004002b5dbebd0706b8 (diff) | |
Merge pull request #2651 from yahoo/hakon/avoid-activating-without-changes
Avoid activating without changes
Diffstat (limited to 'node-repository')
2 files changed, 5 insertions, 1 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/Maintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/Maintainer.java index 715aaf8680e..3df8187cda8 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/Maintainer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/Maintainer.java @@ -18,7 +18,7 @@ import java.util.logging.Logger; */ public abstract class Maintainer extends AbstractComponent implements Runnable { - protected static final Logger log = Logger.getLogger(Maintainer.class.getName()); + protected final Logger log = Logger.getLogger(this.getClass().getName()); private final NodeRepository nodeRepository; private final Duration interval; diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredEarlyExpirer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredEarlyExpirer.java index 609755656b6..78eb0150fb5 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredEarlyExpirer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredEarlyExpirer.java @@ -60,6 +60,10 @@ public class RetiredEarlyExpirer extends Maintainer { nodesToRemove.add(node); } } + + if (nodesToRemove.isEmpty()) { + continue; + } nodeRepository().setRemovable(application, nodesToRemove); |