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 <els...@apache.org>
Authored: Wed May 20 22:26:24 2015 -0400
Committer: Josh Elser <els...@apache.org>
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<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.");
+ 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));
}
