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:11:27 UTC
svn commit: r1233091 - in /incubator/accumulo/trunk: ./ src/core/
src/core/src/main/java/org/apache/accumulo/core/client/impl/ src/server/
src/server/src/main/java/org/apache/accumulo/server/tabletserver/
test/system/randomwalk/conf/modules/
Author: kturner
Date: Wed Jan 18 22:11:27 2012
New Revision: 1233091
URL: http://svn.apache.org/viewvc?rev=1233091&view=rev
Log:
ACCUMULO-318 ACCUMULO-314 merged changes from 1.4
Modified:
incubator/accumulo/trunk/ (props changed)
incubator/accumulo/trunk/src/core/ (props changed)
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
incubator/accumulo/trunk/src/server/ (props changed)
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
incubator/accumulo/trunk/test/system/randomwalk/conf/modules/All.xml
incubator/accumulo/trunk/test/system/randomwalk/conf/modules/LongClean.xml
incubator/accumulo/trunk/test/system/randomwalk/conf/modules/LongDirty.xml
incubator/accumulo/trunk/test/system/randomwalk/conf/modules/ShortClean.xml
incubator/accumulo/trunk/test/system/randomwalk/conf/modules/ShortDirty.xml
Propchange: incubator/accumulo/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 18 22:11:27 2012
@@ -1,3 +1,3 @@
/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611,1228195,1230180,1230736,1231043
/incubator/accumulo/branches/1.3.5rc:1209938
-/incubator/accumulo/branches/1.4:1201902-1233034
+/incubator/accumulo/branches/1.4:1201902-1233090
Propchange: incubator/accumulo/trunk/src/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 18 22:11:27 2012
@@ -1,3 +1,3 @@
/incubator/accumulo/branches/1.3.5rc/src/core:1209938
/incubator/accumulo/branches/1.3/src/core:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215
-/incubator/accumulo/branches/1.4/src/core:1201902-1233034
+/incubator/accumulo/branches/1.4/src/core:1201902-1233090
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java?rev=1233091&r1=1233090&r2=1233091&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java Wed Jan 18 22:11:27 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) {
Propchange: incubator/accumulo/trunk/src/server/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 18 22:11:27 2012
@@ -1,3 +1,3 @@
/incubator/accumulo/branches/1.3.5rc/src/server:1209938
/incubator/accumulo/branches/1.3/src/server:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611
-/incubator/accumulo/branches/1.4/src/server:1201902-1233034
+/incubator/accumulo/branches/1.4/src/server:1201902-1233090
Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java?rev=1233091&r1=1233090&r2=1233091&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java (original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java Wed Jan 18 22:11:27 2012
@@ -2744,8 +2744,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;
Modified: incubator/accumulo/trunk/test/system/randomwalk/conf/modules/All.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/randomwalk/conf/modules/All.xml?rev=1233091&r1=1233090&r2=1233091&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/randomwalk/conf/modules/All.xml (original)
+++ incubator/accumulo/trunk/test/system/randomwalk/conf/modules/All.xml Wed Jan 18 22:11:27 2012
@@ -30,6 +30,7 @@
<edge id="Shard.xml" weight="1"/>
<edge id="Concurrent.xml" weight="1"/>
<edge id="Security.xml" weight="1"/>
+ <edge id="Bulk.xml" weight="1"/>
</node>
<node id="Sequential.xml">
@@ -52,4 +53,8 @@
<edge id="dummy.ToAll" weight="1"/>
</node>
+<node id="Bulk.xml">
+ <edge id="dummy.ToAll" weight="1"/>
+</node>
+
</module>
Modified: incubator/accumulo/trunk/test/system/randomwalk/conf/modules/LongClean.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/randomwalk/conf/modules/LongClean.xml?rev=1233091&r1=1233090&r2=1233091&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/randomwalk/conf/modules/LongClean.xml (original)
+++ incubator/accumulo/trunk/test/system/randomwalk/conf/modules/LongClean.xml Wed Jan 18 22:11:27 2012
@@ -30,6 +30,7 @@
<edge id="Shard.xml" weight="1"/>
<edge id="Concurrent.xml" weight="1"/>
<edge id="Security.xml" weight="1"/>
+ <edge id="Bulk.xml" weight="1"/>
</node>
<node id="Sequential.xml" maxSec="3600" teardown="true">
@@ -52,4 +53,8 @@
<edge id="dummy.ToAll" weight="1"/>
</node>
+<node id="Bulk.xml" maxSec="3600" teardown="true">
+ <edge id="dummy.ToAll" weight="1"/>
+</node>
+
</module>
Modified: incubator/accumulo/trunk/test/system/randomwalk/conf/modules/LongDirty.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/randomwalk/conf/modules/LongDirty.xml?rev=1233091&r1=1233090&r2=1233091&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/randomwalk/conf/modules/LongDirty.xml (original)
+++ incubator/accumulo/trunk/test/system/randomwalk/conf/modules/LongDirty.xml Wed Jan 18 22:11:27 2012
@@ -30,6 +30,7 @@
<edge id="Shard.xml" weight="1"/>
<edge id="Concurrent.xml" weight="1"/>
<edge id="Security.xml" weight="1"/>
+ <edge id="Bulk.xml" weight="1"/>
</node>
<node id="Sequential.xml" maxSec="3600" teardown="false">
@@ -52,4 +53,8 @@
<edge id="dummy.ToAll" weight="1"/>
</node>
+<node id="Bulk.xml" maxSec="3600" teardown="false">
+ <edge id="dummy.ToAll" weight="1"/>
+</node>
+
</module>
Modified: incubator/accumulo/trunk/test/system/randomwalk/conf/modules/ShortClean.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/randomwalk/conf/modules/ShortClean.xml?rev=1233091&r1=1233090&r2=1233091&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/randomwalk/conf/modules/ShortClean.xml (original)
+++ incubator/accumulo/trunk/test/system/randomwalk/conf/modules/ShortClean.xml Wed Jan 18 22:11:27 2012
@@ -30,6 +30,7 @@
<edge id="Shard.xml" weight="1"/>
<edge id="Concurrent.xml" weight="1"/>
<edge id="Security.xml" weight="1"/>
+ <edge id="Bulk.xml" weight="1"/>
</node>
<node id="Sequential.xml" maxSec="300" teardown="true">
@@ -52,4 +53,8 @@
<edge id="dummy.ToAll" weight="1"/>
</node>
+<node id="Bulk.xml" maxSec="300" teardown="true">
+ <edge id="dummy.ToAll" weight="1"/>
+</node>
+
</module>
Modified: incubator/accumulo/trunk/test/system/randomwalk/conf/modules/ShortDirty.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/randomwalk/conf/modules/ShortDirty.xml?rev=1233091&r1=1233090&r2=1233091&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/randomwalk/conf/modules/ShortDirty.xml (original)
+++ incubator/accumulo/trunk/test/system/randomwalk/conf/modules/ShortDirty.xml Wed Jan 18 22:11:27 2012
@@ -30,6 +30,7 @@
<edge id="Shard.xml" weight="1"/>
<edge id="Concurrent.xml" weight="1"/>
<edge id="Security.xml" weight="1"/>
+ <edge id="Bulk.xml" weight="1"/>
</node>
<node id="Sequential.xml" maxSec="300" teardown="false">
@@ -52,4 +53,8 @@
<edge id="dummy.ToAll" weight="1"/>
</node>
+<node id="Bulk.xml" maxSec="300" teardown="false">
+ <edge id="dummy.ToAll" weight="1"/>
+</node>
+
</module>