accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ktur...@apache.org
Subject [1/2] accumulo git commit: ACCUMULO-3002 Ensure instance.volumes is not set during upgrade
Date Mon, 12 Jan 2015 21:21:28 GMT
Repository: accumulo
Updated Branches:
  refs/heads/master 51fbfaf0a -> a542e45c2


ACCUMULO-3002 Ensure instance.volumes is not set during upgrade


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/99011d32
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/99011d32
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/99011d32

Branch: refs/heads/master
Commit: 99011d3234c0649e2ae163e9ca3c6a449ffcdd0d
Parents: 14f9f00
Author: Keith Turner <kturner@apache.org>
Authored: Mon Jan 12 15:58:32 2015 -0500
Committer: Keith Turner <kturner@apache.org>
Committed: Mon Jan 12 15:58:32 2015 -0500

----------------------------------------------------------------------
 .../src/main/java/org/apache/accumulo/master/Master.java       | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/99011d32/server/master/src/main/java/org/apache/accumulo/master/Master.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/Master.java b/server/master/src/main/java/org/apache/accumulo/master/Master.java
index cacfe26..168c270 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/Master.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java
@@ -285,6 +285,12 @@ public class Master implements LiveTServerSet.Listener, TableObserver,
CurrentSt
             "Access to Fate should not have been initialized prior to the Master transitioning
to active. Please save all logs and file a bug.");
       }
       Accumulo.abortIfFateTransactions();
+
+      if (serverConfig.getConfiguration().get(Property.INSTANCE_VOLUMES).trim().length()
> 0) {
+        throw new IllegalStateException("Do not set property " + Property.INSTANCE_VOLUMES.getKey()
+            + " until after upgrade. Kill all Accumulo processes, unset property, and try
again.");
+      }
+
       try {
         log.info("Upgrading zookeeper");
 


Mime
View raw message