Author: stack
Date: Wed Dec 1 21:05:40 2010
New Revision: 1041167
URL: http://svn.apache.org/viewvc?rev=1041167&view=rev
Log:
HBASE-3294 WARN org.apache.hadoop.hbase.regionserver.Store: Not in set
(double-remove?) org.apache.hadoop.hbase.regionserver.storescan...@76607d3d
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/src/main/java/org/apache/hadoop/hbase/catalog/MetaEditor.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
Modified: hbase/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1041167&r1=1041166&r2=1041167&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Wed Dec 1 21:05:40 2010
@@ -729,6 +729,8 @@ Release 0.90.0 - Unreleased
HBASE-3286 Master passes IP and not hostname back to region server
HBASE-3297 If rows in .META. with no HRegionInfo cell, then hbck fails read
of .META.
+ HBASE-3294 WARN org.apache.hadoop.hbase.regionserver.Store: Not in set
+ (double-remove?)
org.apache.hadoop.hbase.regionserver.storescan...@76607d3d
IMPROVEMENTS
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/catalog/MetaEditor.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/catalog/MetaEditor.java?rev=1041167&r1=1041166&r2=1041167&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/catalog/MetaEditor.java
(original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/catalog/MetaEditor.java
Wed Dec 1 21:05:40 2010
@@ -204,8 +204,8 @@ public class MetaEditor {
delete.deleteColumns(HConstants.CATALOG_FAMILY, qualifier);
catalogTracker.waitForMetaServerConnectionDefault().
delete(CatalogTracker.META_REGION, delete);
- LOG.info("Deleted daughter " + daughter.getRegionNameAsString() +
- " " + Bytes.toString(qualifier) + " reference in parent " +
+ LOG.info("Deleted daughter reference " + daughter.getRegionNameAsString() +
+ ", qualifier=" + Bytes.toString(qualifier) + ", from parent " +
parent.getRegionNameAsString());
}
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java?rev=1041167&r1=1041166&r2=1041167&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
(original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
Wed Dec 1 21:05:40 2010
@@ -579,9 +579,8 @@ public class Store implements HeapSize {
* @param o Observer no longer interested in changes in set of Readers.
*/
void deleteChangedReaderObserver(ChangedReadersObserver o) {
- if (!this.changedReaderObservers.remove(o)) {
- LOG.warn("Not in set (double-remove?) " + o);
- }
+ // We don't check if observer present; it may not be (legitimately)
+ this.changedReaderObservers.remove(o);
}
//////////////////////////////////////////////////////////////////////////////
