diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2019-04-11 17:17:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-11 17:17:11 +0200 |
| commit | f65ab7cc05f17c91405dce209c48f0623e3da4c9 (patch) | |
| tree | 7e50df47565b5766427033b0e6e76cdac0f31f7d /controller-server | |
| parent | ba57ce4f60d88b511c0388057c823b126702b0a3 (diff) | |
| parent | f7e0c6cad69dc996c1a6e18d007a01ee79cb5785 (diff) | |
Merge pull request #9096 from vespa-engine/mpolden/deployment-metrics-npe
Verify that deployment still exists before storing metrics
Diffstat (limited to 'controller-server')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainer.java | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainer.java index 787a050e59e..0cf89d798a7 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainer.java @@ -65,15 +65,17 @@ public class DeploymentMetricsMaintainer extends Maintainer { .getDeploymentMetrics(application.id(), deployment.zone()); Instant now = controller().clock().instant(); applications.lockIfPresent(application.id(), locked -> { - DeploymentMetrics newMetrics = locked.get().deployments().get(deployment.zone()).metrics() - .withQueriesPerSecond(collectedMetrics.queriesPerSecond()) - .withWritesPerSecond(collectedMetrics.writesPerSecond()) - .withDocumentCount(collectedMetrics.documentCount()) - .withQueryLatencyMillis(collectedMetrics.queryLatencyMillis()) - .withWriteLatencyMillis(collectedMetrics.writeLatencyMillis()) - .at(now); - applications.store(locked.with(deployment.zone(), newMetrics) - .recordActivityAt(now, deployment.zone())); + Deployment existingDeployment = locked.get().deployments().get(deployment.zone()); + if (existingDeployment == null) return; // Deployment removed since we started collecting metrics + DeploymentMetrics newMetrics = existingDeployment.metrics() + .withQueriesPerSecond(collectedMetrics.queriesPerSecond()) + .withWritesPerSecond(collectedMetrics.writesPerSecond()) + .withDocumentCount(collectedMetrics.documentCount()) + .withQueryLatencyMillis(collectedMetrics.queryLatencyMillis()) + .withWriteLatencyMillis(collectedMetrics.writeLatencyMillis()) + .at(now); + applications.store(locked.with(existingDeployment.zone(), newMetrics) + .recordActivityAt(now, existingDeployment.zone())); }); } } catch (Exception e) { |