accumulo-commits mailing list archives

Merge branch '1.6.1-SNAPSHOT'


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

Branch: refs/heads/master
Commit: 8abe4df6ce69f3d86a3609cbbc35dae882d3b85a
Parents: c8b3e99 3a93bad
Author: Sean Busbey <busbey@cloudera.com>
Authored: Thu Jul 31 11:31:37 2014 -0500
Committer: Sean Busbey <busbey@cloudera.com>
Committed: Thu Jul 31 11:31:37 2014 -0500

----------------------------------------------------------------------
 README                                          | 41 ++++++++++++++-
 .../org/apache/accumulo/server/Accumulo.java    | 23 +++++++--
 .../apache/accumulo/server/ServerConstants.java |  1 +
 .../accumulo/server/util/MetadataTableUtil.java | 52 +++++++++++++++-----
 .../java/org/apache/accumulo/master/Master.java | 38 +++++++++++---
 5 files changed, 131 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/8abe4df6/README
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8abe4df6/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
----------------------------------------------------------------------
diff --cc server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
index 3235559,ca70efe..516121d
--- a/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
@@@ -191,8 -189,23 +191,23 @@@ public class Accumulo 
        log.info(key + " = " + (Property.isSensitive(key) ? "<hidden>" : entry.getValue()));
      }
      
 -    monitorSwappiness();
 +    monitorSwappiness(config.getConfiguration());
    }
+ 
+   /**
+    * Sanity check that the current persistent version is allowed to upgrade to the version
of Accumulo running.
+    * @param dataVersion the version that is persisted in the backing Volumes
+    */
+   public static boolean canUpgradeFromDataVersion(final int dataVersion) {
+     return dataVersion == ServerConstants.DATA_VERSION || dataVersion == ServerConstants.PREV_DATA_VERSION
|| dataVersion == ServerConstants.TWO_DATA_VERSIONS_AGO;
+   }
+ 
+   /**
+    * Does the data version number stored in the backing Volumes indicate we need to upgrade
something?
+    */
+   public static boolean persistentVersionNeedsUpgrade(final int accumuloPersistentVersion)
{
+     return accumuloPersistentVersion == ServerConstants.TWO_DATA_VERSIONS_AGO || accumuloPersistentVersion
== ServerConstants.PREV_DATA_VERSION;
+   }
    
    /**
     * 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8abe4df6/server/base/src/main/java/org/apache/accumulo/server/ServerConstants.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8abe4df6/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
----------------------------------------------------------------------
diff --cc server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
index 88e9ed5,e702af4..c49ccda
--- a/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
@@@ -17,8 -17,8 +17,9 @@@
  package org.apache.accumulo.server.util;
  
  import java.io.IOException;
 +import java.nio.charset.StandardCharsets;
  import java.util.ArrayList;
+ import java.util.Collection;
  import java.util.Collections;
  import java.util.Comparator;
  import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8abe4df6/server/master/src/main/java/org/apache/accumulo/master/Master.java
----------------------------------------------------------------------