diff options
| author | Håkon Hallingstad <hakon@verizonmedia.com> | 2020-10-08 14:09:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-08 14:09:34 +0200 |
| commit | c93bdaf18df6ab5f1d524d9a9e63644c86ec5675 (patch) | |
| tree | b8c14d647ad4f84a009c7895cff0d6271af3f767 /node-repository/src | |
| parent | c683ff8478cf8e07448349bdd94a5b0aa54cb678 (diff) | |
| parent | 9adf6437f47fafee1dc64cb8c4c2ffeef12a309a (diff) | |
Merge pull request #14780 from vespa-engine/hakonhall/avoid-metrics-on-reentry-of-lock
Avoid metrics on reentry of lock
Diffstat (limited to 'node-repository/src')
3 files changed, 3 insertions, 0 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporter.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporter.java index 1cf1bb91d0c..160e448aeab 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporter.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporter.java @@ -244,6 +244,7 @@ public class MetricsReporter extends NodeRepositoryMaintainer { metric.set("lockAttempt.locked", lockMetrics.getAndResetAcquireSucceededCount(), context); metric.set("lockAttempt.release", lockMetrics.getAndResetReleaseCount(), context); metric.set("lockAttempt.releaseFailed", lockMetrics.getAndResetReleaseFailedCount(), context); + metric.set("lockAttempt.reentry", lockMetrics.getAndResetReentryCount(), context); setLockLatencyMetrics("acquire", lockMetrics.getAndResetAcquireLatencyMetrics(), context); setLockLatencyMetrics("locked", lockMetrics.getAndResetLockedLatencyMetrics(), context); diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/LocksResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/LocksResponse.java index 9b498677827..e84a43cd1aa 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/LocksResponse.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/LocksResponse.java @@ -61,6 +61,7 @@ public class LocksResponse extends HttpResponse { lockPathCursor.setLong("lockedCount", lockMetrics.getCumulativeAcquireSucceededCount()); lockPathCursor.setLong("releaseCount", lockMetrics.getCumulativeReleaseCount()); lockPathCursor.setLong("releaseFailedCount", lockMetrics.getCumulativeReleaseFailedCount()); + lockPathCursor.setLong("reentryCount", lockMetrics.getCumulativeReentryCount()); setLatency(lockPathCursor, "acquire", lockMetrics.getAcquireLatencyMetrics()); setLatency(lockPathCursor, "locked", lockMetrics.getLockedLatencyMetrics()); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporterTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporterTest.java index 4d79726fd19..5d5c447ef74 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporterTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporterTest.java @@ -159,6 +159,7 @@ public class MetricsReporterTest { verifyAndRemoveIntegerMetricSum(metric, "lockAttempt.locked", 3); verifyAndRemoveIntegerMetricSum(metric, "lockAttempt.release", 3); verifyAndRemoveIntegerMetricSum(metric, "lockAttempt.releaseFailed", 0); + verifyAndRemoveIntegerMetricSum(metric, "lockAttempt.reentry", 0); metric.remove("lockAttempt.acquireLatency"); metric.remove("lockAttempt.acquireMaxActiveLatency"); metric.remove("lockAttempt.acquireHz"); |