hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r1186977 - in /hbase/trunk: ./ src/main/java/org/apache/hadoop/hbase/io/hfile/slab/ src/test/java/org/apache/hadoop/hbase/io/hfile/slab/
Date Thu, 20 Oct 2011 18:22:00 GMT
Author: stack
Date: Thu Oct 20 18:21:59 2011
New Revision: 1186977

URL: http://svn.apache.org/viewvc?rev=1186977&view=rev
Log:
HBASE-4430 Disable TestSlabCache and TestSingleSizedCache temporarily to see if these are
cause of build box failure though all tests pass

Added:
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/SlabItemActionWatcher.java
Removed:
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/SlabItemEvictionWatcher.java
Modified:
    hbase/trunk/CHANGES.txt
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/SingleSizeCache.java
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/SlabCache.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/hfile/slab/TestSlabCache.java

Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1186977&r1=1186976&r2=1186977&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Thu Oct 20 18:21:59 2011
@@ -378,6 +378,9 @@ Release 0.92.0 - Unreleased
    HBASE-4378  [hbck] Does not complain about regions with startkey==endkey.
                (Jonathan Hsieh)
    HBASE-4459  HbaseObjectWritable code is a byte, we will eventually run out of codes
+   HBASE-4430  Disable TestSlabCache and TestSingleSizedCache temporarily to
+               see if these are cause of build box failure though all tests
+               pass (Li Pi)
 
   TESTS
    HBASE-4450  test for number of blocks read: to serve as baseline for expected

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/SingleSizeCache.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/SingleSizeCache.java?rev=1186977&r1=1186976&r2=1186977&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/SingleSizeCache.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/SingleSizeCache.java Thu
Oct 20 18:21:59 2011
@@ -57,7 +57,7 @@ public class SingleSizeCache implements 
   private final int numBlocks;
   private final int blockSize;
   private final CacheStats stats;
-  private final SlabItemEvictionWatcher evictionWatcher;
+  private final SlabItemActionWatcher actionWatcher;
   private final AtomicLong size;
   private final AtomicLong timeSinceLastAccess;
   public final static long CACHE_FIXED_OVERHEAD = ClassSize
@@ -78,12 +78,12 @@ public class SingleSizeCache implements 
    * @param master the SlabCache this SingleSlabCache is assigned to.
    */
   public SingleSizeCache(int blockSize, int numBlocks,
-      SlabItemEvictionWatcher master) {
+      SlabItemActionWatcher master) {
     this.blockSize = blockSize;
     this.numBlocks = numBlocks;
     backingStore = new Slab(blockSize, numBlocks);
     this.stats = new CacheStats();
-    this.evictionWatcher = master;
+    this.actionWatcher = master;
     this.size = new AtomicLong(CACHE_FIXED_OVERHEAD + backingStore.heapSize());
     this.timeSinceLastAccess = new AtomicLong();
 
@@ -121,11 +121,17 @@ public class SingleSizeCache implements 
         storedBlock);
     toBeCached.serialize(storedBlock);
 
-    CacheablePair alreadyCached = backingMap.putIfAbsent(blockName, newEntry);
-
-    if (alreadyCached != null) {
-      backingStore.free(storedBlock);
-      throw new RuntimeException("already cached " + blockName);
+    synchronized (this) {
+      CacheablePair alreadyCached = backingMap.putIfAbsent(blockName, newEntry);
+    
+
+      if (alreadyCached != null) {
+        backingStore.free(storedBlock);
+        throw new RuntimeException("already cached " + blockName);
+      }
+      if (actionWatcher != null) {
+        actionWatcher.onInsertion(blockName, this);
+      }
     }
     newEntry.recentlyAccessed.set(System.nanoTime());
     this.size.addAndGet(newEntry.heapSize());
@@ -198,8 +204,8 @@ public class SingleSizeCache implements 
       // Thread A calls cacheBlock on the same block, and gets
       // "already cached" since the block is still in backingStore
 
-      if (evictionWatcher != null) {
-        evictionWatcher.onEviction(key, this);
+      if (actionWatcher != null) {
+        actionWatcher.onEviction(key, this);
       }
     }
     stats.evicted();

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/SlabCache.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/SlabCache.java?rev=1186977&r1=1186976&r2=1186977&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/SlabCache.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/SlabCache.java Thu Oct
20 18:21:59 2011
@@ -50,7 +50,7 @@ import com.google.common.util.concurrent
  * correct SingleSizeCache.
  *
  **/
-public class SlabCache implements SlabItemEvictionWatcher, BlockCache, HeapSize {
+public class SlabCache implements SlabItemActionWatcher, BlockCache, HeapSize {
 
   private final ConcurrentHashMap<String, SingleSizeCache> backingStore;
   private final TreeMap<Integer, SingleSizeCache> sizer;
@@ -212,34 +212,7 @@ public class SlabCache implements SlabIt
      * twice
      */
     scache.cacheBlock(blockName, cachedItem);
-
-    /*
-     * If an eviction for this value hasn't taken place yet, we want to wait for
-     * it to take place. See HBase-4330.
-     */
-    SingleSizeCache replace;
-    while ((replace = backingStore.putIfAbsent(blockName, scache)) != null) {
-      synchronized (replace) {
-        /*
-         * With the exception of unit tests, this should happen extremely
-         * rarely.
-         */
-        try {
-          replace.wait();
-        } catch (InterruptedException e) {
-          LOG.warn("InterruptedException on the caching thread: " + e);
-        }
-      }
-    }
-
-    /*
-     * Let the eviction threads know that something has been cached, and let
-     * them try their hand at eviction
-     */
-    synchronized (scache) {
-      scache.notifyAll();
-    }
-  }
+  } 
 
   /**
    * We don't care about whether its in memory or not, so we just pass the call
@@ -291,60 +264,14 @@ public class SlabCache implements SlabIt
   }
 
   @Override
-  public void onEviction(String key, Object notifier) {
-    /*
-     * Without the while loop below, the following can occur:
-     *
-     * Invariant: Anything in SingleSizeCache will have a representation in
-     * SlabCache, and vice-versa.
-     *
-     * Start: Key A is in both SingleSizeCache and SlabCache. Invariant is
-     * satisfied
-     *
-     * Thread A: Caches something, starting eviction of Key A in SingleSizeCache
-     *
-     * Thread B: Checks for Key A -> Returns Gets Null, as eviction has begun
-     *
-     * Thread B: Recaches Key A, gets to SingleSizeCache, does not get the
-     * PutIfAbsentLoop yet...
-     *
-     * Thread C: Caches another key, starting the second eviction of Key A.
-     *
-     * Thread A: does its onEviction, removing the entry of Key A from
-     * SlabCache.
-     *
-     * Thread C: does its onEviction, removing the (blank) entry of Key A from
-     * SlabCache:
-     *
-     * Thread B: goes to putifabsent, and puts its entry into SlabCache.
-     *
-     * Result: SlabCache has an entry for A, while SingleSizeCache has no
-     * entries for A. Invariant is violated.
-     *
-     * What the while loop does, is that, at the end, it GUARANTEES that an
-     * onEviction will remove an entry. See HBase-4482.
-     */
-
-    stats.evict();
-    while ((backingStore.remove(key)) == null) {
-      /* With the exception of unit tests, this should happen extremely rarely. */
-      synchronized (notifier) {
-        try {
-          notifier.wait();
-        } catch (InterruptedException e) {
-          LOG.warn("InterruptedException on the evicting thread: " + e);
-        }
-      }
-    }
+  public void onEviction(String key, SingleSizeCache notifier) {
     stats.evicted();
-
-    /*
-     * Now we've evicted something, lets tell the caching threads to try to
-     * cache something.
-     */
-    synchronized (notifier) {
-      notifier.notifyAll();
-    }
+    backingStore.remove(key);
+  }
+  
+  @Override
+  public void onInsertion(String key, SingleSizeCache notifier) {
+    backingStore.put(key, notifier);
   }
 
   /**

Added: hbase/trunk/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/SlabItemActionWatcher.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/SlabItemActionWatcher.java?rev=1186977&view=auto
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/SlabItemActionWatcher.java
(added)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/SlabItemActionWatcher.java
Thu Oct 20 18:21:59 2011
@@ -0,0 +1,43 @@
+/**
+ * Copyright 2011 The Apache Software Foundation
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.hbase.io.hfile.slab;
+
+/**
+ * Interface for objects that want to know when actions occur in a SingleSizeCache.
+ * */
+interface SlabItemActionWatcher {
+
+  /**
+   * This is called as a callback when an item is removed from a SingleSizeCache.
+   *
+   * @param key the key of the item being evicted
+   * @param notifier the object notifying the SlabCache of the eviction.
+   */
+  void onEviction(String key, SingleSizeCache notifier);
+  
+  /**
+   * This is called as a callback when an item is inserted into a SingleSizeCache.
+   *
+   * @param key the key of the item being added
+   * @param notifier the object notifying the SlabCache of the insertion..
+   */
+  void onInsertion(String key, SingleSizeCache notifier);
+}

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/hfile/slab/TestSlabCache.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/hfile/slab/TestSlabCache.java?rev=1186977&r1=1186976&r2=1186977&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/hfile/slab/TestSlabCache.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/hfile/slab/TestSlabCache.java Thu
Oct 20 18:21:59 2011
@@ -59,7 +59,7 @@ public class TestSlabCache {
     cache.shutdown();
   }
 
-  @Ignore @Test
+  @Test
   public void testElementPlacement() {
     assertEquals(cache.getHigherBlock(BLOCK_SIZE).getKey().intValue(),
         (BLOCK_SIZE * 11 / 10));
@@ -67,28 +67,28 @@ public class TestSlabCache {
         .intValue(), (BLOCK_SIZE * 21 / 10));
   }
 
-  @Ignore @Test
+ @Test
   public void testCacheSimple() throws Exception {
     CacheTestUtils.testCacheSimple(cache, BLOCK_SIZE, NUM_QUERIES);
   }
 
-  @Ignore @Test
+  @Test
   public void testCacheMultiThreaded() throws Exception {
     CacheTestUtils.testCacheMultiThreaded(cache, BLOCK_SIZE, NUM_THREADS,
         NUM_QUERIES, 0.80);
   }
 
-  @Ignore @Test
+  @Test
   public void testCacheMultiThreadedSingleKey() throws Exception {
     CacheTestUtils.hammerSingleKey(cache, BLOCK_SIZE, NUM_THREADS, NUM_QUERIES);
   }
 
-  @Ignore @Test
+  @Test
   public void testCacheMultiThreadedEviction() throws Exception {
     CacheTestUtils.hammerEviction(cache, BLOCK_SIZE, 10, NUM_QUERIES);
   }
 
-  @Ignore @Test
+  @Test
   /*Just checks if ranges overlap*/
   public void testStatsArithmetic(){
     SlabStats test = cache.requestStats;
@@ -99,7 +99,7 @@ public class TestSlabCache {
     }
   }
 
-  @Ignore @Test
+  @Test
   public void testHeapSizeChanges(){
     CacheTestUtils.testHeapSizeChanges(cache, BLOCK_SIZE);
   }



Mime
View raw message