Author: liyin Date: Sat May 25 18:18:29 2013 New Revision: 1486350 URL: http://svn.apache.org/r1486350 Log: [0.89-fb] [HBASE-8228] Revert temporary diffs that were introduced to instrument snapshot
Author: aaiyer Summary: Revert temporary diffs that were introduced to instrument snapshot revert 1st diff e137cf15335aca2d4f33e6bc20141d83adfbcfba revert 770ebd720932584f30d84583685b544df80d1ba7 revert 9f768c7173734dd47d18d1887f3360f035927d3f Test Plan: unit tests Reviewers: rshroff Reviewed By: rshroff CC: hbase-eng@ Differential Revision: https://phabricator.fb.com/D824880 Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/MemStore.java hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=1486350&r1=1486349&r2=1486350&view=diff ============================================================================== --- hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java (original) +++ hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java Sat May 25 18:18:29 2013 @@ -1382,8 +1382,6 @@ public class HRegion implements HeapSize // rows then) status.setStatus("Obtaining lock to block concurrent updates"); long t0, t1; - long t01 = 0, t02 = 0, t03 = 0, t04 = 0, t05 = 0; - StringBuilder sb = new StringBuilder(); this.updatesLock.writeLock().lock(); t0 = EnvironmentEdgeManager.currentTimeMillis(); status.setStatus("Preparing to flush by snapshotting stores"); @@ -1391,41 +1389,23 @@ public class HRegion implements HeapSize //copy the array of per column family memstore values List<StoreFlusher> storeFlushers = new ArrayList<StoreFlusher>( stores.size()); - t01 = EnvironmentEdgeManager.currentTimeMillis(); - sb.append("setStatus : " + (t01-t0) + ", "); try { sequenceId = (wal == null)? myseqid : wal.startCacheFlush(this.regionInfo.getRegionName()); - t02 = EnvironmentEdgeManager.currentTimeMillis(); - sb.append("startCacheFlush : " + (t02-t01) + ", "); completeSequenceId = this.getCompleteCacheFlushSequenceId(sequenceId); - t03 = EnvironmentEdgeManager.currentTimeMillis(); - sb.append("getCompleteCacheFlushSeqId : " + (t03-t02) + ", ["); - long tmp0, tmp1; for (Store s : stores.values()) { - tmp0 = EnvironmentEdgeManager.currentTimeMillis(); storeFlushers.add(s.getStoreFlusher(completeSequenceId)); - tmp1 = EnvironmentEdgeManager.currentTimeMillis(); - sb.append("getFlusher : " + s.getColumnFamilyName() + " : " + (tmp1-tmp0)); } - t04 = EnvironmentEdgeManager.currentTimeMillis(); - sb.append("] all getStoreFlusher : " + (t04-t03) + ", ["); // prepare flush (take a snapshot) for (StoreFlusher flusher : storeFlushers) { - tmp0 = EnvironmentEdgeManager.currentTimeMillis(); flusher.prepare(); - tmp1 = EnvironmentEdgeManager.currentTimeMillis(); - sb.append("prepare : " + flusher.toString() + " : " + (tmp1-tmp0)); } - t05 = EnvironmentEdgeManager.currentTimeMillis(); - sb.append("] all prepare() : " + (t05-t04) + " ms. "); } finally { this.updatesLock.writeLock().unlock(); t1 = EnvironmentEdgeManager.currentTimeMillis(); LOG.debug("Finished snapshotting. Held region-wide updates lock for " - + (t1-t0) + " ms." - + sb.toString()); + + (t1-t0) + " ms."); } status.setStatus("Flushing stores"); Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/MemStore.java URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/MemStore.java?rev=1486350&r1=1486349&r2=1486350&view=diff ============================================================================== --- hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/MemStore.java (original) +++ hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/MemStore.java Sat May 25 18:18:29 2013 @@ -40,7 +40,6 @@ import org.apache.hadoop.hbase.io.HeapSi import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.ClassSize; import org.apache.hadoop.hbase.util.CollectionBackedScanner; -import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; /** * The MemStore holds in-memory modifications to the Store. Modifications @@ -125,10 +124,7 @@ public class MemStore implements HeapSiz * To get the snapshot made by this method, use {@link #getSnapshot()} */ void snapshot() { - long t0 = 0, t1 = 0, t2 = 0; - t0 = EnvironmentEdgeManager.currentTimeMillis(); this.lock.writeLock().lock(); - t1 = EnvironmentEdgeManager.currentTimeMillis(); try { // If snapshot currently has entries, then flusher failed or didn't call // cleanup. Log a warning. @@ -149,9 +145,6 @@ public class MemStore implements HeapSiz } } finally { this.lock.writeLock().unlock(); - t2 = EnvironmentEdgeManager.currentTimeMillis(); - LOG.debug("Snapshotting " + this.toString() + " took " - + (t2-t1) + " ms. To grab the writeLock : " + (t1 - t0)); } } Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java?rev=1486350&r1=1486349&r2=1486350&view=diff ============================================================================== --- hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java (original) +++ hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java Sat May 25 18:18:29 2013 @@ -605,9 +605,7 @@ public class HLog implements Syncable { int oldNumEntries; long t0 = 0; long t1 = 0; - long startWLock, endWLock; this.cacheFlushLock.writeLock().lock(); - startWLock = EnvironmentEdgeManager.currentTimeMillis(); try { synchronized (updateLock) { t0 = EnvironmentEdgeManager.currentTimeMillis(); @@ -636,10 +634,6 @@ public class HLog implements Syncable { } } finally { this.cacheFlushLock.writeLock().unlock(); - endWLock = EnvironmentEdgeManager.currentTimeMillis(); - LOG.debug("While rolling held cacheFlushLock.writeLock() for " - + (endWLock - startWLock) + " ms. From " - + startWLock + " to " + endWLock); } Path oldFile = null; @@ -1361,10 +1355,7 @@ public class HLog implements Syncable { * @see #abortCacheFlush() */ public long startCacheFlush(final byte [] regionName) { - long startRLock, endRLock, obSeqT; - startRLock = EnvironmentEdgeManager.currentTimeMillis(); this.cacheFlushLock.readLock().lock(); - endRLock = EnvironmentEdgeManager.currentTimeMillis(); if (this.firstSeqWrittenInSnapshotMemstore.containsKey(regionName)) { LOG.warn("Requested a startCacheFlush while firstSeqWrittenInSnapshotMemstore still" + " contains " + Bytes.toString(regionName) + " . Did the previous flush fail?" @@ -1375,13 +1366,7 @@ public class HLog implements Syncable { this.firstSeqWrittenInSnapshotMemstore.put(regionName, seq); } } - long num = obtainSeqNum(); - obSeqT = EnvironmentEdgeManager.currentTimeMillis(); - LOG.debug("Trying to get cacheFlushLock.readLock for startCacheFlush took " - + (obSeqT - startRLock) + " ms. startRLock = " - + startRLock + " endRLock = " - + endRLock + " obSeqT = " + obSeqT); - return num; + return obtainSeqNum(); } /**
