You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/10/23 15:39:47 UTC
[1/2] git commit: ACCUMULO-1451 fix endless false major compaction
Updated Branches:
refs/heads/master 941e3cb1a -> 2407376fc
ACCUMULO-1451 fix endless false major compaction
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a0e02445
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a0e02445
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a0e02445
Branch: refs/heads/master
Commit: a0e024451bdaea6f22706f3a38944778a94e539b
Parents: 86669f7
Author: Eric Newton <er...@gmail.com>
Authored: Wed Oct 23 09:40:02 2013 -0400
Committer: Eric Newton <er...@gmail.com>
Committed: Wed Oct 23 09:40:02 2013 -0400
----------------------------------------------------------------------
core/src/main/java/org/apache/accumulo/core/conf/Property.java | 4 ++--
proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java | 2 +-
.../server/tabletserver/TabletServerResourceManager.java | 1 -
.../tabletserver/compaction/DefaultCompactionStrategy.java | 3 ++-
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a0e02445/core/src/main/java/org/apache/accumulo/core/conf/Property.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/Property.java b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
index c42395f..a25e70e 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@ -578,13 +578,13 @@ public enum Property {
try {
Class<? extends T> clazz = AccumuloVFSClassLoader.loadClass(clazzName, base);
instance = clazz.newInstance();
- log.info("Loaded class : " + clazzName);
+ log.debug("Loaded class : " + clazzName, new Throwable());
} catch (Exception e) {
log.warn("Failed to load class ", e);
}
if (instance == null) {
- log.info("Using " + defaultInstance.getClass().getName());
+ log.info("Using default class " + defaultInstance.getClass().getName());
instance = defaultInstance;
}
return instance;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a0e02445/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
----------------------------------------------------------------------
diff --git a/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java b/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
index 8b1ab8b..61ec05c 100644
--- a/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
+++ b/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
@@ -1508,6 +1508,6 @@ public class SimpleTest {
@AfterClass
public static void tearDownMiniCluster() throws Exception {
accumulo.stop();
- folder.delete();
+ //folder.delete();
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a0e02445/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServerResourceManager.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServerResourceManager.java b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServerResourceManager.java
index cf2e1a5..cc456c6 100644
--- a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServerResourceManager.java
+++ b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServerResourceManager.java
@@ -48,7 +48,6 @@ import org.apache.accumulo.server.fs.FileRef;
import org.apache.accumulo.server.fs.VolumeManager;
import org.apache.accumulo.server.tabletserver.FileManager.ScanFileManager;
import org.apache.accumulo.server.tabletserver.Tablet.MinorCompactionReason;
-import org.apache.accumulo.server.tabletserver.compaction.CompactionPlan;
import org.apache.accumulo.server.tabletserver.compaction.CompactionStrategy;
import org.apache.accumulo.server.tabletserver.compaction.DefaultCompactionStrategy;
import org.apache.accumulo.server.tabletserver.compaction.MajorCompactionReason;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a0e02445/server/src/main/java/org/apache/accumulo/server/tabletserver/compaction/DefaultCompactionStrategy.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/tabletserver/compaction/DefaultCompactionStrategy.java b/server/src/main/java/org/apache/accumulo/server/tabletserver/compaction/DefaultCompactionStrategy.java
index 7d5f65d..c088d26 100644
--- a/server/src/main/java/org/apache/accumulo/server/tabletserver/compaction/DefaultCompactionStrategy.java
+++ b/server/src/main/java/org/apache/accumulo/server/tabletserver/compaction/DefaultCompactionStrategy.java
@@ -32,7 +32,8 @@ public class DefaultCompactionStrategy extends CompactionStrategy {
@Override
public boolean shouldCompact(MajorCompactionRequest request) throws IOException {
- return getCompactionPlan(request) != null;
+ CompactionPlan plan = getCompactionPlan(request);
+ return plan != null && !plan.inputFiles.isEmpty();
}
@Override
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/accumulo
Posted by ec...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2407376f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2407376f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2407376f
Branch: refs/heads/master
Commit: 2407376fc69e169c44ba9645cd2d7e0435e09ebf
Parents: a0e0244 941e3cb
Author: Eric Newton <er...@gmail.com>
Authored: Wed Oct 23 09:40:07 2013 -0400
Committer: Eric Newton <er...@gmail.com>
Committed: Wed Oct 23 09:40:07 2013 -0400
----------------------------------------------------------------------
bin/tool.sh | 5 +-
.../core/client/impl/OfflineScanner.java | 14 +-
.../core/client/mapred/AbstractInputFormat.java | 143 +++----------------
.../client/mapreduce/AbstractInputFormat.java | 138 +++---------------
.../mapreduce/lib/util/InputConfigurator.java | 116 ++++++++++++++-
.../simple/mapreduce/UniqueColumns.java | 7 +-
6 files changed, 173 insertions(+), 250 deletions(-)
----------------------------------------------------------------------