Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 87A20DDA3 for ; Wed, 29 May 2013 21:52:22 +0000 (UTC) Received: (qmail 66496 invoked by uid 500); 29 May 2013 21:52:22 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 66450 invoked by uid 500); 29 May 2013 21:52:22 -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 66443 invoked by uid 99); 29 May 2013 21:52:22 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 May 2013 21:52:22 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 May 2013 21:52:18 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7551D2388900; Wed, 29 May 2013 21:51:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1487650 - in /accumulo/trunk: ./ assemble/ conf/examples/1GB/native-standalone/ conf/examples/1GB/standalone/ conf/examples/2GB/native-standalone/ conf/examples/2GB/standalone/ conf/examples/3GB/native-standalone/ conf/examples/3GB/standal... Date: Wed, 29 May 2013 21:51:56 -0000 To: commits@accumulo.apache.org From: kturner@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130529215157.7551D2388900@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kturner Date: Wed May 29 21:51:56 2013 New Revision: 1487650 URL: http://svn.apache.org/r1487650 Log: ACCUMULO-1470 updated documentation for logger.dir.walog Modified: accumulo/trunk/ (props changed) accumulo/trunk/assemble/ (props changed) accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-site.xml accumulo/trunk/conf/examples/1GB/standalone/accumulo-site.xml accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-site.xml accumulo/trunk/conf/examples/2GB/standalone/accumulo-site.xml accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-site.xml accumulo/trunk/conf/examples/3GB/standalone/accumulo-site.xml accumulo/trunk/conf/examples/512MB/native-standalone/accumulo-site.xml accumulo/trunk/conf/examples/512MB/standalone/accumulo-site.xml accumulo/trunk/conf/examples/vfs-classloader/accumulo-site.xml accumulo/trunk/core/ (props changed) accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Property.java accumulo/trunk/examples/ (props changed) accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed) accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed) accumulo/trunk/pom.xml (props changed) accumulo/trunk/proxy/README (props changed) accumulo/trunk/server/ (props changed) accumulo/trunk/src/ (props changed) Propchange: accumulo/trunk/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5:r1484971-1484975,1484977-1484982,1484986-1485411,1485413-1485414,1485416-1485661,1485663-1487649 Propchange: accumulo/trunk/assemble/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/assemble:r1484971-1484975,1484977-1484982,1484986-1485411,1485413-1485414,1485416-1485661,1485663-1487649 Modified: accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-site.xml URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-site.xml?rev=1487650&r1=1487649&r2=1487650&view=diff ============================================================================== --- accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-site.xml (original) +++ accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-site.xml Wed May 29 21:51:56 2013 @@ -30,7 +30,9 @@ logger.dir.walog walogs - The directory used to store write-ahead logs on the local filesystem. It is possible to specify a comma-separated list of directories. + The property only needs to be set if upgrading from 1.4 which used to store write-ahead logs on the local + filesystem. In 1.5 write-ahead logs are stored in DFS. When 1.5 is started for the first time it will copy any 1.4 + write ahead logs into DFS. It is possible to specify a comma-separated list of directories. Modified: accumulo/trunk/conf/examples/1GB/standalone/accumulo-site.xml URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/1GB/standalone/accumulo-site.xml?rev=1487650&r1=1487649&r2=1487650&view=diff ============================================================================== --- accumulo/trunk/conf/examples/1GB/standalone/accumulo-site.xml (original) +++ accumulo/trunk/conf/examples/1GB/standalone/accumulo-site.xml Wed May 29 21:51:56 2013 @@ -30,7 +30,9 @@ logger.dir.walog walogs - The directory used to store write-ahead logs on the local filesystem. It is possible to specify a comma-separated list of directories. + The property only needs to be set if upgrading from 1.4 which used to store write-ahead logs on the local + filesystem. In 1.5 write-ahead logs are stored in DFS. When 1.5 is started for the first time it will copy any 1.4 + write ahead logs into DFS. It is possible to specify a comma-separated list of directories. Modified: accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-site.xml URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-site.xml?rev=1487650&r1=1487649&r2=1487650&view=diff ============================================================================== --- accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-site.xml (original) +++ accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-site.xml Wed May 29 21:51:56 2013 @@ -30,7 +30,9 @@ logger.dir.walog walogs - The directory used to store write-ahead logs on the local filesystem. It is possible to specify a comma-separated list of directories. + The property only needs to be set if upgrading from 1.4 which used to store write-ahead logs on the local + filesystem. In 1.5 write-ahead logs are stored in DFS. When 1.5 is started for the first time it will copy any 1.4 + write ahead logs into DFS. It is possible to specify a comma-separated list of directories. Modified: accumulo/trunk/conf/examples/2GB/standalone/accumulo-site.xml URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/2GB/standalone/accumulo-site.xml?rev=1487650&r1=1487649&r2=1487650&view=diff ============================================================================== --- accumulo/trunk/conf/examples/2GB/standalone/accumulo-site.xml (original) +++ accumulo/trunk/conf/examples/2GB/standalone/accumulo-site.xml Wed May 29 21:51:56 2013 @@ -37,7 +37,10 @@ logger.dir.walog walogs - The directory used to store write-ahead logs on the local filesystem. It is possible to specify a comma-separated list of directories. + The property only needs to be set if upgrading from 1.4 which used to store write-ahead logs on the local + filesystem. In 1.5 write-ahead logs are stored in DFS. When 1.5 is started for the first time it will copy any 1.4 + write ahead logs into DFS. It is possible to specify a comma-separated list of directories. + Modified: accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-site.xml URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-site.xml?rev=1487650&r1=1487649&r2=1487650&view=diff ============================================================================== --- accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-site.xml (original) +++ accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-site.xml Wed May 29 21:51:56 2013 @@ -30,7 +30,9 @@ logger.dir.walog walogs - The directory used to store write-ahead logs on the local filesystem. It is possible to specify a comma-separated list of directories. + The property only needs to be set if upgrading from 1.4 which used to store write-ahead logs on the local + filesystem. In 1.5 write-ahead logs are stored in DFS. When 1.5 is started for the first time it will copy any 1.4 + write ahead logs into DFS. It is possible to specify a comma-separated list of directories. Modified: accumulo/trunk/conf/examples/3GB/standalone/accumulo-site.xml URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/3GB/standalone/accumulo-site.xml?rev=1487650&r1=1487649&r2=1487650&view=diff ============================================================================== --- accumulo/trunk/conf/examples/3GB/standalone/accumulo-site.xml (original) +++ accumulo/trunk/conf/examples/3GB/standalone/accumulo-site.xml Wed May 29 21:51:56 2013 @@ -30,7 +30,9 @@ logger.dir.walog walogs - The directory used to store write-ahead logs on the local filesystem. It is possible to specify a comma-separated list of directories. + The property only needs to be set if upgrading from 1.4 which used to store write-ahead logs on the local + filesystem. In 1.5 write-ahead logs are stored in DFS. When 1.5 is started for the first time it will copy any 1.4 + write ahead logs into DFS. It is possible to specify a comma-separated list of directories. Modified: accumulo/trunk/conf/examples/512MB/native-standalone/accumulo-site.xml URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/512MB/native-standalone/accumulo-site.xml?rev=1487650&r1=1487649&r2=1487650&view=diff ============================================================================== --- accumulo/trunk/conf/examples/512MB/native-standalone/accumulo-site.xml (original) +++ accumulo/trunk/conf/examples/512MB/native-standalone/accumulo-site.xml Wed May 29 21:51:56 2013 @@ -30,7 +30,9 @@ logger.dir.walog walogs - The directory used to store write-ahead logs on the local filesystem. It is possible to specify a comma-separated list of directories. + The property only needs to be set if upgrading from 1.4 which used to store write-ahead logs on the local + filesystem. In 1.5 write-ahead logs are stored in DFS. When 1.5 is started for the first time it will copy any 1.4 + write ahead logs into DFS. It is possible to specify a comma-separated list of directories. Modified: accumulo/trunk/conf/examples/512MB/standalone/accumulo-site.xml URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/512MB/standalone/accumulo-site.xml?rev=1487650&r1=1487649&r2=1487650&view=diff ============================================================================== --- accumulo/trunk/conf/examples/512MB/standalone/accumulo-site.xml (original) +++ accumulo/trunk/conf/examples/512MB/standalone/accumulo-site.xml Wed May 29 21:51:56 2013 @@ -30,9 +30,9 @@ logger.dir.walog walogs - The directory used to store write-ahead logs on the - local filesystem. It is possible to specify a comma-separated list - of directories. + The property only needs to be set if upgrading from 1.4 which used to store write-ahead logs on the local + filesystem. In 1.5 write-ahead logs are stored in DFS. When 1.5 is started for the first time it will copy any 1.4 + write ahead logs into DFS. It is possible to specify a comma-separated list of directories. Modified: accumulo/trunk/conf/examples/vfs-classloader/accumulo-site.xml URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/vfs-classloader/accumulo-site.xml?rev=1487650&r1=1487649&r2=1487650&view=diff ============================================================================== --- accumulo/trunk/conf/examples/vfs-classloader/accumulo-site.xml (original) +++ accumulo/trunk/conf/examples/vfs-classloader/accumulo-site.xml Wed May 29 21:51:56 2013 @@ -30,7 +30,9 @@ logger.dir.walog walogs - The directory used to store write-ahead logs on the local filesystem. It is possible to specify a comma-separated list of directories. + The property only needs to be set if upgrading from 1.4 which used to store write-ahead logs on the local + filesystem. In 1.5 write-ahead logs are stored in DFS. When 1.5 is started for the first time it will copy any 1.4 + write ahead logs into DFS. It is possible to specify a comma-separated list of directories. Propchange: accumulo/trunk/core/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/core:r1484971-1484975,1484977-1484982,1484986-1485411,1485413-1485414,1485416-1485661,1485663-1487649 Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Property.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Property.java?rev=1487650&r1=1487649&r2=1487650&view=diff ============================================================================== --- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Property.java (original) +++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Property.java Wed May 29 21:51:56 2013 @@ -204,8 +204,10 @@ public enum Property { // properties that are specific to logger server behavior LOGGER_PREFIX("logger.", null, PropertyType.PREFIX, "Properties in this category affect the behavior of the write-ahead logger servers"), LOGGER_DIR("logger.dir.walog", "walogs", PropertyType.PATH, - "The directory used to store write-ahead logs on the local filesystem. It is possible to specify a comma-separated list of directories."), - + "The property only needs to be set if upgrading from 1.4 which used to store write-ahead logs on the local filesystem. In 1.5 write-ahead logs are " + + "stored in DFS. When 1.5 is started for the first time it will copy any 1.4 write ahead logs into DFS. It is possible to specify a " + + "comma-separated list of directories."), + // accumulo garbage collector properties GC_PREFIX("gc.", null, PropertyType.PREFIX, "Properties in this category affect the behavior of the accumulo garbage collector."), GC_CYCLE_START("gc.cycle.start", "30s", PropertyType.TIMEDURATION, "Time to wait before attempting to garbage collect any old files."), Propchange: accumulo/trunk/examples/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/examples:r1484971-1484975,1484977-1484982,1484986-1485411,1485413-1485414,1485416-1485661,1485663-1487649 Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1484971-1484975,1484977-1484982,1484986-1485411,1485413-1485414,1485416-1485661,1485663-1487649 Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1484971-1484975,1484977-1484982,1484986-1485411,1485413-1485414,1485416-1485661,1485663-1487649 Propchange: accumulo/trunk/pom.xml ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/pom.xml:r1484971-1484975,1484977-1484982,1484986-1485411,1485413-1485414,1485416-1485661,1485663-1487649 Propchange: accumulo/trunk/proxy/README ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/proxy/README:r1484971-1484975,1484977-1484982,1484986-1485411,1485413-1485414,1485416-1485661,1485663-1487649 Propchange: accumulo/trunk/server/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/server:r1484971-1484975,1484977-1484982,1484986-1485411,1485413-1485414,1485416-1485661,1485663-1487649 Propchange: accumulo/trunk/src/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/src:r1484971-1484975,1484977-1484982,1484986-1485411,1485413-1485414,1485416-1485661,1485663-1487649