You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by kt...@apache.org on 2012/01/18 23:07:49 UTC
svn commit: r1233079 - in /incubator/accumulo/branches/1.4/src:
core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
Author: kturner
Date: Wed Jan 18 22:07:49 2012
New Revision: 1233079
URL: http://svn.apache.org/viewvc?rev=1233079&view=rev
Log:
ACCUMULO-314 fixed bug in bugfix that was causing infinite requeuing of major compactions
Modified:
incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java?rev=1233079&r1=1233078&r2=1233079&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java Wed Jan 18 22:07:49 2012
@@ -89,7 +89,7 @@ public class Tables {
}
public static void clearCache(Instance instance) {
- getZooCache(instance).clear();
+ getZooCache(instance).clear(ZooUtil.getRoot(instance) + Constants.ZTABLES);
}
public static String getPrintableTableNameFromId(Map<String,String> tidToNameMap, String tableId) {
Modified: incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java?rev=1233079&r1=1233078&r2=1233079&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java (original)
+++ incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java Wed Jan 18 22:07:49 2012
@@ -2746,8 +2746,10 @@ public class Tablet {
majCStats = majorCompact(reason);
// if there is more work to be done, queue another major compaction
- if (needsMajorCompaction(reason))
- initiateMajorCompaction(reason);
+ synchronized (Tablet.this) {
+ if (reason == MajorCompactionReason.NORMAL && needsMajorCompaction(reason))
+ initiateMajorCompaction(reason);
+ }
} catch (RuntimeException E) {
failed = true;