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 85641182A5 for ; Thu, 21 May 2015 02:28:29 +0000 (UTC) Received: (qmail 64509 invoked by uid 500); 21 May 2015 02:28:29 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 64405 invoked by uid 500); 21 May 2015 02:28:29 -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 64316 invoked by uid 99); 21 May 2015 02:28:29 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 May 2015 02:28:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2E43AE4422; Thu, 21 May 2015 02:28:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Thu, 21 May 2015 02:28:32 -0000 Message-Id: <98758bb776494e4a851425af283f754b@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [4/6] accumulo git commit: Merge branch '1.6' into 1.7 Merge branch '1.6' into 1.7 Conflicts: server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/25d9b285 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/25d9b285 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/25d9b285 Branch: refs/heads/master Commit: 25d9b2854bd53562b67939b7b69c80924eb6e32f Parents: 1faee53 63be7d3 Author: Josh Elser Authored: Wed May 20 22:26:24 2015 -0400 Committer: Josh Elser Committed: Wed May 20 22:26:24 2015 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/accumulo/server/init/Initialize.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/25d9b285/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java ---------------------------------------------------------------------- diff --cc server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java index c6f1dd8,fcc22c5..9b9dac9 --- a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java +++ b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java @@@ -701,13 -532,14 +701,13 @@@ public class Initialize implements Keyw Path iidPath = new Path(aBasePath, ServerConstants.INSTANCE_ID_DIR); Path versionPath = new Path(aBasePath, ServerConstants.VERSION_DIR); + UUID uuid = UUID.fromString(ZooUtil.getInstanceIDFromHdfs(iidPath, SiteConfiguration.getInstance())); for (Pair replacementVolume : ServerConstants.getVolumeReplacements()) { - if (aBasePath.equals(replacementVolume.getSecond())) + if (aBasePath.equals(replacementVolume.getFirst())) - log.error(aBasePath + " is set to be replaced in " + Property.INSTANCE_VOLUMES_REPLACEMENTS + " and should not appear in " + - Property.INSTANCE_VOLUMES + ". It is highly recommended that this property be removed as data could still be written to this volume."); + log.error(aBasePath + " is set to be replaced in " + Property.INSTANCE_VOLUMES_REPLACEMENTS + " and should not appear in " + Property.INSTANCE_VOLUMES + + ". It is highly recommended that this property be removed as data could still be written to this volume."); } - UUID uuid = UUID.fromString(ZooUtil.getInstanceIDFromHdfs(iidPath, ServerConfiguration.getSiteConfiguration())); - if (ServerConstants.DATA_VERSION != Accumulo.getAccumuloPersistentVersion(versionPath.getFileSystem(CachedConfiguration.getInstance()), versionPath)) { throw new IOException("Accumulo " + Constants.VERSION + " cannot initialize data version " + Accumulo.getAccumuloPersistentVersion(fs)); }