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/09/13 18:26:20 UTC
[4/5] git commit: Merge branch '1.5.1-SNAPSHOT'
Merge branch '1.5.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/886e56a3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/886e56a3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/886e56a3
Branch: refs/heads/master
Commit: 886e56a3aedac70f453d75d3d641455bb8936a35
Parents: 46b4965 4f2516e
Author: Eric Newton <er...@gmail.com>
Authored: Fri Sep 13 11:44:35 2013 -0400
Committer: Eric Newton <er...@gmail.com>
Committed: Fri Sep 13 11:44:35 2013 -0400
----------------------------------------------------------------------
.../accumulo/server/tabletserver/Tablet.java | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/886e56a3/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
----------------------------------------------------------------------
diff --cc server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
index 5fd9453,4439e74..d33b26c
--- a/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
+++ b/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
@@@ -1427,8 -1480,20 +1421,20 @@@ public class Tablet
computeNumEntries();
- datafileManager.removeFilesAfterScanRel(scanFiles);
+ datafileManager.removeFilesAfterScan(scanFiles);
+ // look for hints of a failure on the previous tablet server
+ if (!logEntries.isEmpty() || needsMajorCompaction(MajorCompactionReason.NORMAL)) {
+ // look for any temp files hanging around
+ removeOldTemporaryFiles();
+ }
+
+ // look for hints of a failure on the previous tablet server
+ if (!logEntries.isEmpty() || needsMajorCompaction(MajorCompactionReason.NORMAL)) {
+ // look for any temp files hanging around
+ removeOldTemporaryFiles();
+ }
+
log.log(TLevel.TABLET_HIST, extent + " opened ");
}
Re: [4/5] git commit: Merge branch '1.5.1-SNAPSHOT'
Posted by Keith Turner <ke...@deenlo.com>.
On Fri, Sep 13, 2013 at 12:26 PM, <ec...@apache.org> wrote:
> Merge branch '1.5.1-SNAPSHOT'
>
>
> Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
> Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/886e56a3
> Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/886e56a3
> Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/886e56a3
>
> Branch: refs/heads/master
> Commit: 886e56a3aedac70f453d75d3d641455bb8936a35
> Parents: 46b4965 4f2516e
> Author: Eric Newton <er...@gmail.com>
> Authored: Fri Sep 13 11:44:35 2013 -0400
> Committer: Eric Newton <er...@gmail.com>
> Committed: Fri Sep 13 11:44:35 2013 -0400
>
> ----------------------------------------------------------------------
> .../accumulo/server/tabletserver/Tablet.java | 18 ++++++++++++------
> 1 file changed, 12 insertions(+), 6 deletions(-)
> ----------------------------------------------------------------------
>
>
>
> http://git-wip-us.apache.org/repos/asf/accumulo/blob/886e56a3/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
> ----------------------------------------------------------------------
> diff --cc
> server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
> index 5fd9453,4439e74..d33b26c
> ---
> a/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
> +++
> b/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
> @@@ -1427,8 -1480,20 +1421,20 @@@ public class Tablet
>
> computeNumEntries();
>
> - datafileManager.removeFilesAfterScanRel(scanFiles);
> + datafileManager.removeFilesAfterScan(scanFiles);
>
> + // look for hints of a failure on the previous tablet server
> + if (!logEntries.isEmpty() ||
> needsMajorCompaction(MajorCompactionReason.NORMAL)) {
> + // look for any temp files hanging around
> + removeOldTemporaryFiles();
> + }
> +
> + // look for hints of a failure on the previous tablet server
> + if (!logEntries.isEmpty() ||
> needsMajorCompaction(MajorCompactionReason.NORMAL)) {
> + // look for any temp files hanging around
> + removeOldTemporaryFiles();
> + }
> +
> log.log(TLevel.TABLET_HIST, extent + " opened ");
> }
>
>
>
Why is the code repeated?