Merge branch 'master' of git@github.com:voldemort/voldemort

voldemort · Oct 23, 2009 · 8667c2e · 8667c2e
2 parents 5e36e0d + bf68264
commit 8667c2e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/src/java/voldemort/store/routed/RoutedStore.java b/src/java/voldemort/store/routed/RoutedStore.java
@@ -694,7 +694,11 @@ public void run() {
                     } catch(UnreachableStoreException e) {
                         markUnavailable(node, e);
                         failures.add(e);
-                    } catch(Exception e) {
+                    } catch (ObsoleteVersionException e) {
+                        // Do not log ObsoleteVersionException
+                        failures.add(e);
+                    }
+                    catch(Exception e) {
                         logger.warn("Error in PUT on node " + node.getId() + "(" + node.getHost()
                                     + ")", e);
                         failures.add(e);

diff --git a/src/java/voldemort/store/stats/StatTrackingStore.java b/src/java/voldemort/store/stats/StatTrackingStore.java
@@ -24,6 +24,7 @@
 import voldemort.annotations.jmx.JmxOperation;
 import voldemort.store.DelegatingStore;
 import voldemort.store.Store;
+import voldemort.versioning.ObsoleteVersionException;
 import voldemort.versioning.Version;
 import voldemort.versioning.Versioned;
 
@@ -87,6 +88,9 @@ public void put(K key, Versioned<V> value) throws VoldemortException {
         long start = System.nanoTime();
         try {
             super.put(key, value);
+        } catch (ObsoleteVersionException e) {
+            stats.recordTime(Tracked.OBSOLETE, System.nanoTime() - start);
+            throw e;
         } catch(VoldemortException e) {
             stats.recordTime(Tracked.EXCEPTION, System.nanoTime() - start);
             throw e;
@@ -159,6 +163,12 @@ public float getDeleteThroughput() {
         return stats.getThroughput(Tracked.DELETE);
     }
 
+    @JmxGetter(name = "numberOfObsoleteVersions",
+            description = "Number of ObsoleteVersionExceptions since the last reset.")
+    public long getNumberOfObsoleteVersions() {
+        return stats.getCount(Tracked.OBSOLETE);
+    }
+
     @JmxGetter(name = "numberOfExceptions", description = "The number of exceptions since the last reset.")
     public long getNumberOfExceptions() {
         return stats.getCount(Tracked.EXCEPTION);

diff --git a/src/java/voldemort/store/stats/Tracked.java b/src/java/voldemort/store/stats/Tracked.java
@@ -5,7 +5,8 @@ public enum Tracked {
     GET_ALL("getAll"),
     PUT("put"),
     DELETE("delete"),
-    EXCEPTION("exception");
+    EXCEPTION("exception"),
+    OBSOLETE("obsolete");
 
     private final String name;