ACCUMULO-3839 Perform sanity check on the proper replacement pair element. The sanity check is meant to warn if a volume being replaced is still listed in instance.volumes. The opposite is nonsensical.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/63be7d36 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/63be7d36 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/63be7d36 Branch: refs/heads/1.7 Commit: 63be7d366ce04ef89a1d6ff3bf4af8406b3a60d5 Parents: c4eff0c Author: Josh Elser <els...@apache.org> Authored: Wed May 20 22:03:40 2015 -0400 Committer: Josh Elser <els...@apache.org> Committed: Wed May 20 22:05:45 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/63be7d36/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java ---------------------------------------------------------------------- diff --git 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 index fd46ab7..fcc22c5 100644 --- 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 @@ -533,7 +533,7 @@ public class Initialize { Path versionPath = new Path(aBasePath, ServerConstants.VERSION_DIR); for (Pair<Path,Path> 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."); }
