You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2015/07/02 22:25:28 UTC
[1/8] accumulo git commit: ACCUMULO-3928 getMinCIdleThreshold might
throw an exception if the table is deleted.
Repository: accumulo
Updated Branches:
refs/heads/1.6 985c90680 -> 2fa41d009
refs/heads/1.7 00d83914e -> ba300baaa
refs/heads/master 618003dde -> 978e6210e
ACCUMULO-3928 getMinCIdleThreshold might throw an exception if the table is deleted.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2fa41d00
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2fa41d00
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2fa41d00
Branch: refs/heads/1.6
Commit: 2fa41d0099de0cff0722dff8e1f0340cd63777b3
Parents: 985c906
Author: Josh Elser <el...@apache.org>
Authored: Thu Jul 2 14:05:44 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jul 2 15:26:38 2015 -0400
----------------------------------------------------------------------
.../tabletserver/LargestFirstMemoryManager.java | 24 +++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/2fa41d00/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java b/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
index 1281c33..260685e 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
@@ -22,6 +22,7 @@ import java.util.List;
import java.util.Map.Entry;
import java.util.TreeMap;
+import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.data.KeyExtent;
import org.apache.accumulo.server.conf.ServerConfiguration;
@@ -170,10 +171,27 @@ public class LargestFirstMemoryManager implements MemoryManager {
ingestMemory += memTabletSize;
if (minorCompactingSize == 0 && memTabletSize > 0) {
TabletInfo tabletInfo = new TabletInfo(ts.getExtent(), memTabletSize, idleTime, timeMemoryLoad);
- largestMemTablets.put(timeMemoryLoad, tabletInfo);
- if (idleTime > getMinCIdleThreshold(ts.getExtent())) {
- largestIdleMemTablets.put(timeMemoryLoad, tabletInfo);
+ try {
+ // If the table was deleted, getMinCIdleThreshold will throw an exception
+ if (idleTime > getMinCIdleThreshold(ts.getExtent())) {
+ largestIdleMemTablets.put(timeMemoryLoad, tabletInfo);
+ }
+ } catch (IllegalArgumentException e) {
+ Throwable cause = e.getCause();
+ if (null != cause && cause instanceof TableNotFoundException) {
+ if (log.isTraceEnabled()) {
+ log.trace("Ignoring extent for deleted table: " + ts.getExtent());
+ }
+
+ // The table might have been deleted during the iteration of the tablets
+ // We just want to eat this exception, do nothing with this tablet, and continue
+ continue;
+ }
+
+ throw e;
}
+ // Only place the tablet into largestMemTablets map when the table still exists
+ largestMemTablets.put(timeMemoryLoad, tabletInfo);
}
compactionMemory += minorCompactingSize;
[8/8] accumulo git commit: Merge branch '1.7'
Posted by el...@apache.org.
Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/978e6210
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/978e6210
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/978e6210
Branch: refs/heads/master
Commit: 978e6210e5acbb27d89b64c35cbc58f57873ca1d
Parents: 618003d ba300ba
Author: Josh Elser <el...@apache.org>
Authored: Thu Jul 2 16:07:31 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jul 2 16:07:31 2015 -0400
----------------------------------------------------------------------
.../tabletserver/LargestFirstMemoryManager.java | 24 ++++++++++++++++----
1 file changed, 20 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/978e6210/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
----------------------------------------------------------------------
[6/8] accumulo git commit: ACCUMULO-3928 Use slf4j's fancy variable
replacement
Posted by el...@apache.org.
ACCUMULO-3928 Use slf4j's fancy variable replacement
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ba300baa
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ba300baa
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ba300baa
Branch: refs/heads/master
Commit: ba300baaa4826d21d784d727ba115388013d9fc8
Parents: 6243e6e
Author: Josh Elser <el...@apache.org>
Authored: Thu Jul 2 15:49:09 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jul 2 15:49:09 2015 -0400
----------------------------------------------------------------------
.../server/tabletserver/LargestFirstMemoryManager.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ba300baa/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java b/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
index 865e775..d73c46e 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
@@ -174,7 +174,7 @@ public class LargestFirstMemoryManager implements MemoryManager {
for (TabletState ts : tablets) {
// Make sure that the table still exists
if (!tableExists(instance, ts.getExtent().getTableId().toString())) {
- log.info("Ignoring extent for deleted table: " + ts.getExtent());
+ log.trace("Ignoring extent for deleted table: {}", ts.getExtent());
continue;
}
@@ -193,9 +193,7 @@ public class LargestFirstMemoryManager implements MemoryManager {
} catch (IllegalArgumentException e) {
Throwable cause = e.getCause();
if (null != cause && cause instanceof TableNotFoundException) {
- if (log.isTraceEnabled()) {
- log.trace("Ignoring extent for deleted table: " + ts.getExtent());
- }
+ log.trace("Ignoring extent for deleted table: {}", ts.getExtent());
// The table might have been deleted during the iteration of the tablets
// We just want to eat this exception, do nothing with this tablet, and continue
[4/8] accumulo git commit: Merge branch '1.6' into 1.7
Posted by el...@apache.org.
Merge branch '1.6' into 1.7
Conflicts:
server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6243e6ee
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6243e6ee
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6243e6ee
Branch: refs/heads/1.7
Commit: 6243e6ee0027abd775d4c82692f7787b1b537c2b
Parents: 00d8391 2fa41d0
Author: Josh Elser <el...@apache.org>
Authored: Thu Jul 2 15:47:48 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jul 2 15:47:48 2015 -0400
----------------------------------------------------------------------
.../tabletserver/LargestFirstMemoryManager.java | 24 +++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6243e6ee/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
----------------------------------------------------------------------
diff --cc server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
index a39c8b6,260685e..865e775
--- a/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
@@@ -22,14 -22,12 +22,15 @@@ import java.util.List
import java.util.Map.Entry;
import java.util.TreeMap;
+import org.apache.accumulo.core.client.Instance;
+ import org.apache.accumulo.core.client.TableNotFoundException;
+import org.apache.accumulo.core.client.impl.Tables;
import org.apache.accumulo.core.conf.Property;
-import org.apache.accumulo.core.data.KeyExtent;
+import org.apache.accumulo.core.data.impl.KeyExtent;
import org.apache.accumulo.server.conf.ServerConfiguration;
import org.apache.hadoop.io.Text;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The LargestFirstMemoryManager attempts to keep memory between 80% and 90% full. It adapts over time the point at which it should start a compaction based on
[7/8] accumulo git commit: ACCUMULO-3928 Use slf4j's fancy variable
replacement
Posted by el...@apache.org.
ACCUMULO-3928 Use slf4j's fancy variable replacement
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ba300baa
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ba300baa
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ba300baa
Branch: refs/heads/1.7
Commit: ba300baaa4826d21d784d727ba115388013d9fc8
Parents: 6243e6e
Author: Josh Elser <el...@apache.org>
Authored: Thu Jul 2 15:49:09 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jul 2 15:49:09 2015 -0400
----------------------------------------------------------------------
.../server/tabletserver/LargestFirstMemoryManager.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ba300baa/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java b/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
index 865e775..d73c46e 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
@@ -174,7 +174,7 @@ public class LargestFirstMemoryManager implements MemoryManager {
for (TabletState ts : tablets) {
// Make sure that the table still exists
if (!tableExists(instance, ts.getExtent().getTableId().toString())) {
- log.info("Ignoring extent for deleted table: " + ts.getExtent());
+ log.trace("Ignoring extent for deleted table: {}", ts.getExtent());
continue;
}
@@ -193,9 +193,7 @@ public class LargestFirstMemoryManager implements MemoryManager {
} catch (IllegalArgumentException e) {
Throwable cause = e.getCause();
if (null != cause && cause instanceof TableNotFoundException) {
- if (log.isTraceEnabled()) {
- log.trace("Ignoring extent for deleted table: " + ts.getExtent());
- }
+ log.trace("Ignoring extent for deleted table: {}", ts.getExtent());
// The table might have been deleted during the iteration of the tablets
// We just want to eat this exception, do nothing with this tablet, and continue
[2/8] accumulo git commit: ACCUMULO-3928 getMinCIdleThreshold might
throw an exception if the table is deleted.
Posted by el...@apache.org.
ACCUMULO-3928 getMinCIdleThreshold might throw an exception if the table is deleted.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2fa41d00
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2fa41d00
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2fa41d00
Branch: refs/heads/1.7
Commit: 2fa41d0099de0cff0722dff8e1f0340cd63777b3
Parents: 985c906
Author: Josh Elser <el...@apache.org>
Authored: Thu Jul 2 14:05:44 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jul 2 15:26:38 2015 -0400
----------------------------------------------------------------------
.../tabletserver/LargestFirstMemoryManager.java | 24 +++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/2fa41d00/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java b/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
index 1281c33..260685e 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
@@ -22,6 +22,7 @@ import java.util.List;
import java.util.Map.Entry;
import java.util.TreeMap;
+import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.data.KeyExtent;
import org.apache.accumulo.server.conf.ServerConfiguration;
@@ -170,10 +171,27 @@ public class LargestFirstMemoryManager implements MemoryManager {
ingestMemory += memTabletSize;
if (minorCompactingSize == 0 && memTabletSize > 0) {
TabletInfo tabletInfo = new TabletInfo(ts.getExtent(), memTabletSize, idleTime, timeMemoryLoad);
- largestMemTablets.put(timeMemoryLoad, tabletInfo);
- if (idleTime > getMinCIdleThreshold(ts.getExtent())) {
- largestIdleMemTablets.put(timeMemoryLoad, tabletInfo);
+ try {
+ // If the table was deleted, getMinCIdleThreshold will throw an exception
+ if (idleTime > getMinCIdleThreshold(ts.getExtent())) {
+ largestIdleMemTablets.put(timeMemoryLoad, tabletInfo);
+ }
+ } catch (IllegalArgumentException e) {
+ Throwable cause = e.getCause();
+ if (null != cause && cause instanceof TableNotFoundException) {
+ if (log.isTraceEnabled()) {
+ log.trace("Ignoring extent for deleted table: " + ts.getExtent());
+ }
+
+ // The table might have been deleted during the iteration of the tablets
+ // We just want to eat this exception, do nothing with this tablet, and continue
+ continue;
+ }
+
+ throw e;
}
+ // Only place the tablet into largestMemTablets map when the table still exists
+ largestMemTablets.put(timeMemoryLoad, tabletInfo);
}
compactionMemory += minorCompactingSize;
[3/8] accumulo git commit: ACCUMULO-3928 getMinCIdleThreshold might
throw an exception if the table is deleted.
Posted by el...@apache.org.
ACCUMULO-3928 getMinCIdleThreshold might throw an exception if the table is deleted.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2fa41d00
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2fa41d00
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2fa41d00
Branch: refs/heads/master
Commit: 2fa41d0099de0cff0722dff8e1f0340cd63777b3
Parents: 985c906
Author: Josh Elser <el...@apache.org>
Authored: Thu Jul 2 14:05:44 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jul 2 15:26:38 2015 -0400
----------------------------------------------------------------------
.../tabletserver/LargestFirstMemoryManager.java | 24 +++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/2fa41d00/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java b/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
index 1281c33..260685e 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
@@ -22,6 +22,7 @@ import java.util.List;
import java.util.Map.Entry;
import java.util.TreeMap;
+import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.data.KeyExtent;
import org.apache.accumulo.server.conf.ServerConfiguration;
@@ -170,10 +171,27 @@ public class LargestFirstMemoryManager implements MemoryManager {
ingestMemory += memTabletSize;
if (minorCompactingSize == 0 && memTabletSize > 0) {
TabletInfo tabletInfo = new TabletInfo(ts.getExtent(), memTabletSize, idleTime, timeMemoryLoad);
- largestMemTablets.put(timeMemoryLoad, tabletInfo);
- if (idleTime > getMinCIdleThreshold(ts.getExtent())) {
- largestIdleMemTablets.put(timeMemoryLoad, tabletInfo);
+ try {
+ // If the table was deleted, getMinCIdleThreshold will throw an exception
+ if (idleTime > getMinCIdleThreshold(ts.getExtent())) {
+ largestIdleMemTablets.put(timeMemoryLoad, tabletInfo);
+ }
+ } catch (IllegalArgumentException e) {
+ Throwable cause = e.getCause();
+ if (null != cause && cause instanceof TableNotFoundException) {
+ if (log.isTraceEnabled()) {
+ log.trace("Ignoring extent for deleted table: " + ts.getExtent());
+ }
+
+ // The table might have been deleted during the iteration of the tablets
+ // We just want to eat this exception, do nothing with this tablet, and continue
+ continue;
+ }
+
+ throw e;
}
+ // Only place the tablet into largestMemTablets map when the table still exists
+ largestMemTablets.put(timeMemoryLoad, tabletInfo);
}
compactionMemory += minorCompactingSize;
[5/8] accumulo git commit: Merge branch '1.6' into 1.7
Posted by el...@apache.org.
Merge branch '1.6' into 1.7
Conflicts:
server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6243e6ee
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6243e6ee
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6243e6ee
Branch: refs/heads/master
Commit: 6243e6ee0027abd775d4c82692f7787b1b537c2b
Parents: 00d8391 2fa41d0
Author: Josh Elser <el...@apache.org>
Authored: Thu Jul 2 15:47:48 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jul 2 15:47:48 2015 -0400
----------------------------------------------------------------------
.../tabletserver/LargestFirstMemoryManager.java | 24 +++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6243e6ee/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
----------------------------------------------------------------------
diff --cc server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
index a39c8b6,260685e..865e775
--- a/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
@@@ -22,14 -22,12 +22,15 @@@ import java.util.List
import java.util.Map.Entry;
import java.util.TreeMap;
+import org.apache.accumulo.core.client.Instance;
+ import org.apache.accumulo.core.client.TableNotFoundException;
+import org.apache.accumulo.core.client.impl.Tables;
import org.apache.accumulo.core.conf.Property;
-import org.apache.accumulo.core.data.KeyExtent;
+import org.apache.accumulo.core.data.impl.KeyExtent;
import org.apache.accumulo.server.conf.ServerConfiguration;
import org.apache.hadoop.io.Text;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The LargestFirstMemoryManager attempts to keep memory between 80% and 90% full. It adapts over time the point at which it should start a compaction based on