Apply skuruppu@'s recommendations

googleapis · Feb 21, 2020 · d6c99a3 · d6c99a3
1 parent 79fc6dc
commit d6c99a3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionPool.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionPool.java
@@ -799,7 +799,6 @@ public ApiFuture<Empty> asyncClose() {
     @Override
     public void close() {
       synchronized (lock) {
-        numSessionsReleased++;
         numSessionsInUse--;
       }
       leakedException = null;
@@ -1030,7 +1029,6 @@ private void closeIdleSessions(Instant currTime) {
           }
           numSessionsToClose -= sessionsToClose.size();
         }
-        numSessionsReleased += sessionsToClose.size();
       }
       for (PooledSession sess : sessionsToClose) {
         logger.log(Level.FINE, "Closing session {0}", sess.getName());
@@ -1525,6 +1523,7 @@ private void releaseSession(PooledSession session, Position position) {
       if (closureFuture != null) {
         return;
       }
+      numSessionsReleased++;
       if (readWaiters.size() == 0 && numSessionsBeingPrepared >= readWriteWaiters.size()) {
         // No pending waiters
         if (shouldPrepareSession()) {

diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolTest.java
@@ -1628,7 +1628,7 @@ public Void call() {
     assertThat(record.getMetrics())
         .containsEntry(MetricRegistryConstants.NUM_ACQUIRED_SESSIONS, 0L);
     assertThat(record.getMetrics())
-        .containsEntry(MetricRegistryConstants.NUM_RELEASED_SESSIONS, 3L);
+        .containsEntry(MetricRegistryConstants.NUM_RELEASED_SESSIONS, 5L);
     assertThat(record.getMetrics()).containsEntry(MetricRegistryConstants.IN_USE_SESSIONS, 0L);
     assertThat(record.getMetrics()).containsEntry(MetricRegistryConstants.MAX_IN_USE_SESSIONS, 2L);
   }