You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by dl...@apache.org on 2016/04/12 15:58:20 UTC
[03/39] accumulo git commit: Merge branch '1.7'
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/173d80e1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/173d80e1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/173d80e1
Branch: refs/heads/ACCUMULO-4173
Commit: 173d80e11c2e6e99f26fd42f1a4c6726fe926ae5
Parents: 1d49030 cd5eb1f
Author: Dave Marion <dl...@apache.org>
Authored: Thu Mar 31 14:54:32 2016 -0400
Committer: Dave Marion <dl...@apache.org>
Committed: Thu Mar 31 14:54:32 2016 -0400
----------------------------------------------------------------------
assemble/conf/templates/accumulo-env.sh | 2 +-
.../apache/accumulo/tserver/TabletServer.java | 26 +++++---------------
.../start/classloader/vfs/ContextManager.java | 7 ++++--
3 files changed, 12 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/173d80e1/assemble/conf/templates/accumulo-env.sh
----------------------------------------------------------------------
diff --cc assemble/conf/templates/accumulo-env.sh
index 205bd6c,42633a7..2ad753a
--- a/assemble/conf/templates/accumulo-env.sh
+++ b/assemble/conf/templates/accumulo-env.sh
@@@ -48,10 -48,8 +48,10 @@@ test -z "$ACCUMULO_TSERVER_OPTS" && exp
test -z "$ACCUMULO_MASTER_OPTS" && export ACCUMULO_MASTER_OPTS="${POLICY} ${masterHigh_masterLow}"
test -z "$ACCUMULO_MONITOR_OPTS" && export ACCUMULO_MONITOR_OPTS="${POLICY} ${monitorHigh_monitorLow}"
test -z "$ACCUMULO_GC_OPTS" && export ACCUMULO_GC_OPTS="${gcHigh_gcLow}"
+test -z "$ACCUMULO_SHELL_OPTS" && export ACCUMULO_SHELL_OPTS="${shellHigh_shellLow}"
- test -z "$ACCUMULO_GENERAL_OPTS" && export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75 -Djava.net.preferIPv4Stack=true"
+ test -z "$ACCUMULO_GENERAL_OPTS" && export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75 -Djava.net.preferIPv4Stack=true -XX:+CMSClassUnloadingEnabled"
test -z "$ACCUMULO_OTHER_OPTS" && export ACCUMULO_OTHER_OPTS="${otherHigh_otherLow}"
+test -z "${ACCUMULO_PID_DIR}" && export ACCUMULO_PID_DIR="${ACCUMULO_HOME}/run"
# what do when the JVM runs out of heap memory
export ACCUMULO_KILL_CMD='kill -9 %p'
http://git-wip-us.apache.org/repos/asf/accumulo/blob/173d80e1/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
----------------------------------------------------------------------
diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index d19dfa9,eabf51d..b044b3e
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@@ -2753,25 -2782,10 +2753,11 @@@ public class TabletServer extends Accum
Runnable contextCleaner = new Runnable() {
@Override
public void run() {
- ArrayList<KeyExtent> extents;
-
- synchronized (onlineTablets) {
- extents = new ArrayList<KeyExtent>(onlineTablets.keySet());
- }
-
- Set<String> tables = new HashSet<String>();
-
- for (KeyExtent keyExtent : extents) {
- tables.add(keyExtent.getTableId());
- }
-
- HashSet<String> contexts = new HashSet<String>();
-
- for (String tableid : tables) {
- String context = getTableConfiguration(new KeyExtent(tableid, null, null)).get(Property.TABLE_CLASSPATH);
- if (!context.equals("")) {
- contexts.add(context);
- }
- Set<String> contextProperties = getConfiguration().getAllPropertiesWithPrefix(Property.VFS_CONTEXT_CLASSPATH_PROPERTY).keySet();
++ Set<String> contextProperties = getServerConfigurationFactory().getConfiguration().getAllPropertiesWithPrefix(Property.VFS_CONTEXT_CLASSPATH_PROPERTY)
++ .keySet();
+ Set<String> configuredContexts = new HashSet<String>();
+ for (String prop : contextProperties) {
+ configuredContexts.add(prop.substring(Property.VFS_CONTEXT_CLASSPATH_PROPERTY.name().length()));
}
try {