You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2015/05/21 04:28:29 UTC
[1/6] accumulo git commit: ACCUMULO-3839 Perform sanity check on the
proper replacement pair element.
Repository: accumulo
Updated Branches:
refs/heads/1.6 c4eff0c2e -> 63be7d366
refs/heads/1.7 1faee537d -> 25d9b2854
refs/heads/master acf60826e -> 9cd82738e
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.6
Commit: 63be7d366ce04ef89a1d6ff3bf4af8406b3a60d5
Parents: c4eff0c
Author: Josh Elser <el...@apache.org>
Authored: Wed May 20 22:03:40 2015 -0400
Committer: Josh Elser <el...@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.");
}
[5/6] accumulo git commit: Merge branch '1.6' into 1.7
Posted by el...@apache.org.
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/1.7
Commit: 25d9b2854bd53562b67939b7b69c80924eb6e32f
Parents: 1faee53 63be7d3
Author: Josh Elser <el...@apache.org>
Authored: Wed May 20 22:26:24 2015 -0400
Committer: Josh Elser <el...@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));
}
[4/6] accumulo git commit: Merge branch '1.6' into 1.7
Posted by el...@apache.org.
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 <el...@apache.org>
Authored: Wed May 20 22:26:24 2015 -0400
Committer: Josh Elser <el...@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));
}
[6/6] accumulo git commit: Merge branch '1.7'
Posted by el...@apache.org.
Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9cd82738
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9cd82738
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9cd82738
Branch: refs/heads/master
Commit: 9cd82738e5a1b07c709c4407d977955eed58b91f
Parents: acf6082 25d9b28
Author: Josh Elser <el...@apache.org>
Authored: Wed May 20 22:26:29 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Wed May 20 22:26:29 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/9cd82738/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
----------------------------------------------------------------------
[3/6] accumulo git commit: ACCUMULO-3839 Perform sanity check on the
proper replacement pair element.
Posted by el...@apache.org.
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/master
Commit: 63be7d366ce04ef89a1d6ff3bf4af8406b3a60d5
Parents: c4eff0c
Author: Josh Elser <el...@apache.org>
Authored: Wed May 20 22:03:40 2015 -0400
Committer: Josh Elser <el...@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.");
}
[2/6] accumulo git commit: ACCUMULO-3839 Perform sanity check on the
proper replacement pair element.
Posted by el...@apache.org.
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 <el...@apache.org>
Authored: Wed May 20 22:03:40 2015 -0400
Committer: Josh Elser <el...@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.");
}