From commits-return-23008-archive-asf-public=cust-asf.ponee.io@accumulo.apache.org Thu Jun 13 21:17:29 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id C3EB318064E for ; Thu, 13 Jun 2019 23:17:28 +0200 (CEST) Received: (qmail 89510 invoked by uid 500); 13 Jun 2019 21:17:28 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 89492 invoked by uid 99); 13 Jun 2019 21:17:28 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Jun 2019 21:17:28 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 034EE87AD7; Thu, 13 Jun 2019 21:17:27 +0000 (UTC) Date: Thu, 13 Jun 2019 21:17:27 +0000 To: "commits@accumulo.apache.org" Subject: [accumulo] branch 2.0 updated: Fix #1202 Correct documented vfs cache dir default MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <156046064787.18432.869792159231441549@gitbox.apache.org> From: ctubbsii@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: accumulo X-Git-Refname: refs/heads/2.0 X-Git-Reftype: branch X-Git-Oldrev: de9ba68633a0d7e0ed55ee98533c82ab0b4bb12b X-Git-Newrev: 87639a355251e98c107ef072639bccc6de9cffc4 X-Git-Rev: 87639a355251e98c107ef072639bccc6de9cffc4 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch 2.0 in repository https://gitbox.apache.org/repos/asf/accumulo.git The following commit(s) were added to refs/heads/2.0 by this push: new 87639a3 Fix #1202 Correct documented vfs cache dir default 87639a3 is described below commit 87639a355251e98c107ef072639bccc6de9cffc4 Author: Christopher Tubbs AuthorDate: Thu Jun 13 17:13:59 2019 -0400 Fix #1202 Correct documented vfs cache dir default Update the default value for general.vfs.cache.dir to reflect the actual default used in AccumuloVFSClassLoader. Also update the description to more accurately represent how the value is used as a base directory for a subdirectory which the vfs class loader code uses. --- .../java/org/apache/accumulo/core/conf/Property.java | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) 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 69f9f63..7879ae4 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 @@ -16,7 +16,6 @@ */ package org.apache.accumulo.core.conf; -import java.io.File; import java.lang.annotation.Annotation; import java.util.EnumSet; import java.util.HashMap; @@ -814,6 +813,9 @@ public enum Property { + "constraint."), // VFS ClassLoader properties + + // this property shouldn't be used directly; it exists solely to document the default value + // defined by its use in AccumuloVFSClassLoader when generating the property documentation VFS_CLASSLOADER_SYSTEM_CLASSPATH_PROPERTY( AccumuloVFSClassLoader.VFS_CLASSLOADER_SYSTEM_CLASSPATH_PROPERTY, "", PropertyType.STRING, "Configuration for a system level vfs classloader. Accumulo jar can be" @@ -829,11 +831,16 @@ public enum Property { + " `general.vfs.context.classpath..delegation=post`, where `` is" + " your context name. If delegation is not specified, it defaults to loading" + " from parent classloader first."), - VFS_CLASSLOADER_CACHE_DIR(AccumuloVFSClassLoader.VFS_CACHE_DIR, - File.separator + "tmp" + File.separator + "accumulo-vfs-cache", PropertyType.ABSOLUTEPATH, - "Directory to use for the vfs cache. The cache will keep a soft reference" - + " to all of the classes loaded in the VM. This should be on local disk on" - + " each node with sufficient space."), + + // this property shouldn't be used directly; it exists solely to document the default value + // defined by its use in AccumuloVFSClassLoader when generating the property documentation + VFS_CLASSLOADER_CACHE_DIR(AccumuloVFSClassLoader.VFS_CACHE_DIR, "${java.io.tmpdir}", + PropertyType.ABSOLUTEPATH, + "The base directory to use for the vfs cache. The actual cached files will be located" + + " in a subdirectory, `accumulo-vfs-cache--${user.name}`, where" + + " `` is determined by the JVM's internal management engine." + + " The cache will keep a soft reference to all of the classes loaded in the VM." + + " This should be on local disk on each node with sufficient space."), // General properties for configuring replication REPLICATION_PREFIX("replication.", null, PropertyType.PREFIX,