From 31cbdfd7ba9e7ff2ae5f99f3f0f1a7831cd88147 Mon Sep 17 00:00:00 2001
From: Jonathan Ellis <jbellis@apache.org>
Date: Tue, 11 Mar 2014 23:18:54 -0500
Subject: [PATCH] Fix accounting in FileCacheService to allow re-using RAR
 Patch by Benedict Elliott Smith; reviewed by jbellis for CASSANDRA-6838

---
 CHANGES.txt                                                 | 1 +
 src/java/org/apache/cassandra/service/FileCacheService.java | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 91037d1212..d8a348d5fc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,7 @@
 2.0.7
  * Fix saving triggers to schema (CASSANDRA-6789)
  * Fix trigger mutations when base mutation list is immutable (CASSANDRA-6790)
+ * Fix accounting in FileCacheService to allow re-using RAR (CASSANDRA-6838)
 
 
 2.0.6
diff --git a/src/java/org/apache/cassandra/service/FileCacheService.java b/src/java/org/apache/cassandra/service/FileCacheService.java
index c939a6f0f1..d22763bba4 100644
--- a/src/java/org/apache/cassandra/service/FileCacheService.java
+++ b/src/java/org/apache/cassandra/service/FileCacheService.java
@@ -91,7 +91,10 @@ public class FileCacheService
         Queue<RandomAccessReader> instances = getCacheFor(path);
         RandomAccessReader result = instances.poll();
         if (result != null)
+        {
             metrics.hits.mark();
+            memoryUsage.addAndGet(-result.getTotalBufferSize());
+        }
 
         return result;
     }