You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@accumulo.apache.org by GitBox <gi...@apache.org> on 2018/01/17 19:13:26 UTC
[GitHub] keith-turner closed pull request #358: ACCUMULO-4779 fixed classpath context config performance issue
keith-turner closed pull request #358: ACCUMULO-4779 fixed classpath context config performance issue
URL: https://github.com/apache/accumulo/pull/358
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/server/master/src/main/java/org/apache/accumulo/master/Master.java b/server/master/src/main/java/org/apache/accumulo/master/Master.java
index 6a43e931af..984fb60494 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/Master.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java
@@ -589,12 +589,12 @@ public Master(ServerConfigurationFactory config, VolumeManager fs, String hostna
this.tabletBalancer.init(serverConfig);
try {
- AccumuloVFSClassLoader.getContextManager().setContextConfig(new ContextManager.DefaultContextsConfig(new Iterable<Entry<String,String>>() {
+ AccumuloVFSClassLoader.getContextManager().setContextConfig(new ContextManager.DefaultContextsConfig() {
@Override
- public Iterator<Entry<String,String>> iterator() {
- return getConfiguration().iterator();
+ public String getProperty(String key) {
+ return getConfiguration().get(key);
}
- }));
+ });
} catch (IOException e) {
throw new RuntimeException(e);
}
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index b4cbf03590..0f5eccb285 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@ -2803,12 +2803,12 @@ public void config(String hostname) {
clientAddress = HostAndPort.fromParts(hostname, 0);
try {
- AccumuloVFSClassLoader.getContextManager().setContextConfig(new ContextManager.DefaultContextsConfig(new Iterable<Entry<String,String>>() {
+ AccumuloVFSClassLoader.getContextManager().setContextConfig(new ContextManager.DefaultContextsConfig() {
@Override
- public Iterator<Entry<String,String>> iterator() {
- return getConfiguration().iterator();
+ public String getProperty(String key) {
+ return getConfiguration().get(key);
}
- }));
+ });
} catch (IOException e) {
throw new RuntimeException(e);
}
diff --git a/shell/src/main/java/org/apache/accumulo/shell/Shell.java b/shell/src/main/java/org/apache/accumulo/shell/Shell.java
index 36c843ecef..b5e5afb6ce 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/Shell.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/Shell.java
@@ -545,18 +545,16 @@ public ClassLoader getClassLoader(final CommandLine cl, final Shell shellState)
shellState.getConnector().instanceOperations().getSystemConfiguration().get(Property.VFS_CONTEXT_CLASSPATH_PROPERTY.getKey() + classpath);
try {
- AccumuloVFSClassLoader.getContextManager().setContextConfig(new ContextManager.DefaultContextsConfig(new Iterable<Map.Entry<String,String>>() {
+
+ final Map<String,String> systemConfig = shellState.getConnector().instanceOperations().getSystemConfiguration();
+
+ AccumuloVFSClassLoader.getContextManager().setContextConfig(new ContextManager.DefaultContextsConfig() {
@Override
- public Iterator<Entry<String,String>> iterator() {
- try {
- return shellState.getConnector().instanceOperations().getSystemConfiguration().entrySet().iterator();
- } catch (AccumuloException e) {
- throw new RuntimeException(e);
- } catch (AccumuloSecurityException e) {
- throw new RuntimeException(e);
- }
+ public String getProperty(String key) {
+ return systemConfig.get(key);
}
- }));
+
+ });
} catch (IllegalStateException ise) {}
classloader = AccumuloVFSClassLoader.getContextManager().getClassLoader(classpath);
diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ContextManager.java b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ContextManager.java
index 7145b4a625..a3d51fcff5 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ContextManager.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ContextManager.java
@@ -18,9 +18,7 @@
import java.io.IOException;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import org.apache.commons.vfs2.FileSystemException;
@@ -99,38 +97,30 @@ public int hashCode() {
ContextConfig getContextConfig(String context);
}
- public static class DefaultContextsConfig implements ContextsConfig {
+ public static abstract class DefaultContextsConfig implements ContextsConfig {
- private Iterable<Entry<String,String>> config;
-
- public DefaultContextsConfig(Iterable<Entry<String,String>> config) {
- this.config = config;
- }
+ public abstract String getProperty(String key);
@Override
public ContextConfig getContextConfig(String context) {
String key = AccumuloVFSClassLoader.VFS_CONTEXT_CLASSPATH_PROPERTY + context;
- String uris = null;
- boolean preDelegate = true;
+ String uris = getProperty(key);
- Iterator<Entry<String,String>> iter = config.iterator();
- while (iter.hasNext()) {
- Entry<String,String> entry = iter.next();
- if (entry.getKey().equals(key)) {
- uris = entry.getValue();
- }
-
- if (entry.getKey().equals(key + ".delegation") && entry.getValue().trim().equalsIgnoreCase("post")) {
- preDelegate = false;
- }
+ if (uris == null) {
+ return null;
}
- if (uris != null)
- return new ContextConfig(uris, preDelegate);
+ String delegate = getProperty(key + ".delegation");
+
+ boolean preDelegate = true;
+
+ if (delegate != null && delegate.trim().equalsIgnoreCase("post")) {
+ preDelegate = false;
+ }
- return null;
+ return new ContextConfig(uris, preDelegate);
}
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services