accumulo-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From GitBox <...@apache.org>
Subject [GitHub] mikewalch closed pull request #632: Remove usage of site file/config terminology
Date Wed, 05 Sep 2018 18:40:49 GMT
mikewalch closed pull request #632: Remove usage of site file/config terminology
URL: https://github.com/apache/accumulo/pull/632
 
 
   

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/core/src/main/java/org/apache/accumulo/core/conf/Property.java b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
index a9a43722fd..23b8f01969 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@ -600,11 +600,11 @@
   TABLE_PREFIX("table.", null, PropertyType.PREFIX,
       "Properties in this category affect tablet server treatment of tablets,"
           + " but can be configured on a per-table basis. Setting these properties in"
-          + " the site file will override the default globally for all tables and not"
+          + " accumulo.properties will override the default globally for all tables and not"
           + " any specific table. However, both the default and the global setting can"
           + " be overridden per table using the table operations API or in the shell,"
           + " which sets the overridden value in zookeeper. Restarting accumulo tablet"
-          + " servers after setting these properties in the site file will cause the"
+          + " servers after setting these properties in accumulo.properties will cause the"
           + " global setting to take effect. However, you must use the API or the shell"
           + " to change properties in zookeeper that are set on a table."),
   TABLE_ARBITRARY_PROP_PREFIX("table.custom.", null, PropertyType.PREFIX,
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
index ea1280904c..b6cf315b40 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
@@ -204,19 +204,20 @@ public Process exec(Class<?> clazz, List<String> jvmArgs,
String... args) throws
     return _exec(clazz, jvmArgs2, args);
   }
 
-  private boolean containsSiteFile(File f) {
+  private boolean containsConfigFile(File f) {
     if (!f.isDirectory()) {
       return false;
     } else {
-      File[] files = f.listFiles(pathname -> pathname.getName().endsWith("site.xml"));
+      File[] files = f.listFiles(pathname -> pathname.getName().endsWith("site.xml")
+          || pathname.getName().equals("accumulo.properties"));
       return files != null && files.length > 0;
     }
   }
 
   private void append(StringBuilder classpathBuilder, URL url) throws URISyntaxException
{
     File file = new File(url.toURI());
-    // do not include dirs containing hadoop or accumulo site files
-    if (!containsSiteFile(file))
+    // do not include dirs containing hadoop or accumulo config files
+    if (!containsConfigFile(file))
       classpathBuilder.append(File.pathSeparator).append(file.getAbsolutePath());
   }
 
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/ConvertConfig.java
b/server/base/src/main/java/org/apache/accumulo/server/util/ConvertConfig.java
index 4e16e28e6c..fff775e1ee 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/ConvertConfig.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/ConvertConfig.java
@@ -77,7 +77,7 @@ public void execute(String[] args) throws Exception {
 
     File xmlFile = new File(opts.xmlPath);
     if (!xmlFile.exists()) {
-      throw new IllegalArgumentException("xml site file does not exist at " + opts.xmlPath);
+      throw new IllegalArgumentException("xml config file does not exist at " + opts.xmlPath);
     }
 
     Path propsPath = Paths.get(opts.propsPath);
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
index ac7fd3f5e7..acb32541fd 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@ -81,7 +81,6 @@
 import org.glassfish.jersey.jackson.JacksonFeature;
 import org.glassfish.jersey.logging.LoggingFeature;
 import org.glassfish.jersey.server.ResourceConfig;
-import org.glassfish.jersey.server.ServerProperties;
 import org.glassfish.jersey.server.mvc.MvcFeature;
 import org.glassfish.jersey.server.mvc.freemarker.FreemarkerMvcFeature;
 import org.glassfish.jersey.servlet.ServletContainer;
diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
b/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
index ee56f8d4c4..f5d74d6e11 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
@@ -63,15 +63,13 @@
   }
 
   /**
-   * Looks for the site configuration file for Accumulo and if it has a property for propertyName
-   * return it otherwise returns defaultValue Should throw an exception if the default configuration
-   * can not be read;
+   * Returns value of property in accumulo.properties file, otherwise default value
    *
    * @param propertyName
    *          Name of the property to pull
    * @param defaultValue
    *          Value to default to if not found.
-   * @return site or default class path String
+   * @return value of property or default
    */
   public static String getAccumuloProperty(String propertyName, String defaultValue) {
     if (accumuloConfigUrl == null) {


 

----------------------------------------------------------------
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

Mime
View raw message