diff options
author | Håkon Hallingstad <hakon@verizonmedia.com> | 2020-09-28 13:52:23 +0200 |
---|---|---|
committer | Håkon Hallingstad <hakon@verizonmedia.com> | 2020-09-28 13:52:23 +0200 |
commit | c888ea9295ea84216a920d9ceca3883f75f1ce32 (patch) | |
tree | b0159a8a379f12c6cd3a570143761e66e9c933a7 /zkfacade | |
parent | 4fd2db62039bf5fed95dcb71bd3ff59267812c7c (diff) |
More info -> attempt renames
Diffstat (limited to 'zkfacade')
4 files changed, 21 insertions, 21 deletions
diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/Lock.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/Lock.java index 6e3b79ec5ce..60e497683a6 100644 --- a/zkfacade/src/main/java/com/yahoo/vespa/curator/Lock.java +++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/Lock.java @@ -35,7 +35,7 @@ public class Lock implements Mutex { /** Take the lock with the given timeout. This may be called multiple times from the same thread - each matched by a close */ public void acquire(Duration timeout) throws UncheckedTimeoutException { - ThreadLockStats threadLockStats = ThreadLockStats.getCurrentThreadLockInfo(); + ThreadLockStats threadLockStats = ThreadLockStats.getCurrentThreadLockStats(); threadLockStats.invokingAcquire(lockPath, timeout); final boolean acquired; @@ -56,7 +56,7 @@ public class Lock implements Mutex { @Override public void close() { - ThreadLockStats.getCurrentThreadLockInfo().lockReleased(lockPath); + ThreadLockStats.getCurrentThreadLockStats().lockReleased(lockPath); try { mutex.release(); } diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/stats/ThreadLockStats.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/stats/ThreadLockStats.java index 117844e17ee..077c3e2fd3d 100644 --- a/zkfacade/src/main/java/com/yahoo/vespa/curator/stats/ThreadLockStats.java +++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/stats/ThreadLockStats.java @@ -33,14 +33,14 @@ public class ThreadLockStats { public static Map<String, LockCounters> getLockCountersByPath() { return Map.copyOf(countersByLockPath); } - public static List<ThreadLockStats> getThreadLockInfos() { return List.copyOf(locks.values()); } + public static List<ThreadLockStats> getThreadLockStats() { return List.copyOf(locks.values()); } - public static List<LockAttempt> getLockInfoSamples() { + public static List<LockAttempt> getLockAttemptSamples() { return COMPLETED_LOCK_ATTEMPT_SAMPLES.asList(); } /** Returns the per-thread singleton ThreadLockStats. */ - public static ThreadLockStats getCurrentThreadLockInfo() { + public static ThreadLockStats getCurrentThreadLockStats() { return locks.computeIfAbsent(Thread.currentThread(), ThreadLockStats::new); } @@ -89,7 +89,7 @@ public class ThreadLockStats { public void acquireFailed(String lockPath) { LockCounters lockCounters = getLockCounters(lockPath); lockCounters.acquireFailedCount.incrementAndGet(); - removeLastLockInfo(lockCounters, LockAttempt::acquireFailed); + removeLastLockAttempt(lockCounters, LockAttempt::acquireFailed); } /** Mutable method (see class doc) */ @@ -100,7 +100,7 @@ public class ThreadLockStats { } lockCounters.acquireTimedOutCount.incrementAndGet(); - removeLastLockInfo(lockCounters, LockAttempt::timedOut); + removeLastLockAttempt(lockCounters, LockAttempt::timedOut); } /** Mutable method (see class doc) */ @@ -117,14 +117,14 @@ public class ThreadLockStats { public void lockReleased(String lockPath) { LockCounters lockCounters = getLockCounters(lockPath); lockCounters.locksReleasedCount.incrementAndGet(); - removeLastLockInfo(lockCounters, LockAttempt::released); + removeLastLockAttempt(lockCounters, LockAttempt::released); } private LockCounters getLockCounters(String lockPath) { return countersByLockPath.computeIfAbsent(lockPath, __ -> new LockCounters()); } - private void removeLastLockInfo(LockCounters lockCounters, Consumer<LockAttempt> completeLockInfo) { + private void removeLastLockAttempt(LockCounters lockCounters, Consumer<LockAttempt> completeLockAttempt) { lockCounters.inCriticalRegionCount.decrementAndGet(); if (lockAttempts.isEmpty()) { @@ -133,7 +133,7 @@ public class ThreadLockStats { } LockAttempt lockAttempt = lockAttempts.pollLast(); - completeLockInfo.accept(lockAttempt); + completeLockAttempt.accept(lockAttempt); COMPLETED_LOCK_ATTEMPT_SAMPLES.maybeSample(lockAttempt); } } diff --git a/zkfacade/src/test/java/com/yahoo/vespa/curator/stats/LockAttemptSamplesTest.java b/zkfacade/src/test/java/com/yahoo/vespa/curator/stats/LockAttemptSamplesTest.java index 6f877631b7b..14dbbad56ba 100644 --- a/zkfacade/src/test/java/com/yahoo/vespa/curator/stats/LockAttemptSamplesTest.java +++ b/zkfacade/src/test/java/com/yahoo/vespa/curator/stats/LockAttemptSamplesTest.java @@ -40,16 +40,16 @@ public class LockAttemptSamplesTest { // new path, expels "2" assertTrue(maybeSample("4", 6)); - Map<String, LockAttempt> lockInfos = samples.asList().stream().collect(Collectors.toMap( - lockInfo -> lockInfo.getLockPath(), - lockInfo -> lockInfo)); - assertEquals(2, lockInfos.size()); + Map<String, LockAttempt> lockAttempts = samples.asList().stream().collect(Collectors.toMap( + lockAttempt -> lockAttempt.getLockPath(), + lockAttempt -> lockAttempt)); + assertEquals(2, lockAttempts.size()); - assertTrue(lockInfos.containsKey("1")); - assertEquals(Duration.ofSeconds(11), lockInfos.get("1").getStableTotalDuration()); + assertTrue(lockAttempts.containsKey("1")); + assertEquals(Duration.ofSeconds(11), lockAttempts.get("1").getStableTotalDuration()); - assertTrue(lockInfos.containsKey("4")); - assertEquals(Duration.ofSeconds(6), lockInfos.get("4").getStableTotalDuration()); + assertTrue(lockAttempts.containsKey("4")); + assertEquals(Duration.ofSeconds(6), lockAttempts.get("4").getStableTotalDuration()); } private boolean maybeSample(String lockPath, int secondsDuration) { diff --git a/zkfacade/src/test/java/com/yahoo/vespa/curator/stats/LockTest.java b/zkfacade/src/test/java/com/yahoo/vespa/curator/stats/LockTest.java index 477fe650bb5..92911b0dadf 100644 --- a/zkfacade/src/test/java/com/yahoo/vespa/curator/stats/LockTest.java +++ b/zkfacade/src/test/java/com/yahoo/vespa/curator/stats/LockTest.java @@ -51,7 +51,7 @@ public class LockTest { expectedCounters.acquireFailedCount.set(1); assertEquals(Map.of(lockPath, expectedCounters), ThreadLockStats.getLockCountersByPath()); - List<LockAttempt> slowLockAttempts = ThreadLockStats.getLockInfoSamples(); + List<LockAttempt> slowLockAttempts = ThreadLockStats.getLockAttemptSamples(); assertEquals(1, slowLockAttempts.size()); LockAttempt slowLockAttempt = slowLockAttempts.get(0); assertEquals(acquireTimeout, slowLockAttempt.getAcquireTimeout()); @@ -61,7 +61,7 @@ public class LockTest { assertEquals(LockAttempt.LockState.ACQUIRE_FAILED, slowLockAttempt.getLockState()); assertTrue(slowLockAttempt.getTimeTerminalStateWasReached().isPresent()); - List<ThreadLockStats> threadLockStatsList = ThreadLockStats.getThreadLockInfos(); + List<ThreadLockStats> threadLockStatsList = ThreadLockStats.getThreadLockStats(); assertEquals(1, threadLockStatsList.size()); ThreadLockStats threadLockStats = threadLockStatsList.get(0); assertEquals(0, threadLockStats.getLockAttempts().size()); @@ -125,7 +125,7 @@ public class LockTest { lock.acquire(acquireTimeout); lock2.acquire(acquireTimeout); - List<ThreadLockStats> threadLockStats = ThreadLockStats.getThreadLockInfos(); + List<ThreadLockStats> threadLockStats = ThreadLockStats.getThreadLockStats(); assertEquals(1, threadLockStats.size()); List<LockAttempt> lockAttempts = threadLockStats.get(0).getLockAttempts(); assertEquals(2, lockAttempts.size()); |