accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dlmar...@apache.org
Subject [2/2] accumulo git commit: Merge branch '1.6' into 1.7
Date Thu, 31 Mar 2016 18:55:56 GMT
Merge branch '1.6' into 1.7


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cd5eb1f1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cd5eb1f1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cd5eb1f1

Branch: refs/heads/1.7
Commit: cd5eb1f124ecc58021f33c73e963160974bd01c2
Parents: 7d06316 f6bfe90
Author: Dave Marion <dlmarion@apache.org>
Authored: Thu Mar 31 14:32:46 2016 -0400
Committer: Dave Marion <dlmarion@apache.org>
Committed: Thu Mar 31 14:32:46 2016 -0400

----------------------------------------------------------------------
 assemble/conf/templates/accumulo-env.sh         |  2 +-
 .../apache/accumulo/tserver/TabletServer.java   | 25 ++++----------------
 .../start/classloader/vfs/ContextManager.java   |  7 ++++--
 3 files changed, 11 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/cd5eb1f1/assemble/conf/templates/accumulo-env.sh
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cd5eb1f1/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 71ad6bc,ac8f2ec..eabf51d
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@@ -2782,31 -3588,16 +2782,16 @@@ 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<Text> tables = new HashSet<Text>();
- 
-         for (KeyExtent keyExtent : extents) {
-           tables.add(keyExtent.getTableId());
-         }
- 
-         HashSet<String> contexts = new HashSet<String>();
- 
-         for (Text tableid : tables) {
-           String context = getTableConfiguration(new KeyExtent(tableid, null, null)).get(Property.TABLE_CLASSPATH);
-           if (!context.equals("")) {
-             contexts.add(context);
-           }
 -        Set<String> contextProperties = getSystemConfiguration().getAllPropertiesWithPrefix(Property.VFS_CONTEXT_CLASSPATH_PROPERTY).keySet();
++        Set<String> contextProperties = 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 {
-           AccumuloVFSClassLoader.getContextManager().removeUnusedContexts(contexts);
+           AccumuloVFSClassLoader.getContextManager().removeUnusedContexts(configuredContexts);
          } catch (IOException e) {
 -          log.warn(e.getMessage(), e);
 +          log.warn("{}", e.getMessage(), e);
          }
        }
      };

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cd5eb1f1/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ContextManager.java
----------------------------------------------------------------------


Mime
View raw message