accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bus...@apache.org
Subject [2/3] accumulo git commit: Merge branch '1.7' into 1.8
Date Thu, 15 Sep 2016 17:18:30 GMT
Merge branch '1.7' into 1.8

 Conflicts:
	server/base/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java


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

Branch: refs/heads/1.8
Commit: 1bf8a6362c685f316d04facb26faa29939cad9ef
Parents: 8c85c32 48733ce
Author: Sean Busbey <busbey@cloudera.com>
Authored: Thu Sep 15 08:41:13 2016 -0700
Committer: Sean Busbey <busbey@cloudera.com>
Committed: Thu Sep 15 08:41:13 2016 -0700

----------------------------------------------------------------------
 .../org/apache/accumulo/core/conf/Property.java |  7 ++++
 .../accumulo/core/conf/SiteConfiguration.java   | 24 ++++++++++++-
 .../accumulo/server/client/HdfsZooInstance.java | 36 +++++++++++++-------
 3 files changed, 53 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/1bf8a636/core/src/main/java/org/apache/accumulo/core/conf/Property.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/conf/Property.java
index cdaebef,96adaeb..34ef953
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@@ -822,9 -800,16 +822,16 @@@ public enum Property 
      return validTableProperties.contains(key) || key.startsWith(Property.TABLE_CONSTRAINT_PREFIX.getKey())
          || key.startsWith(Property.TABLE_ITERATOR_PREFIX.getKey()) || key.startsWith(Property.TABLE_LOCALITY_GROUP_PREFIX.getKey())
          || key.startsWith(Property.TABLE_COMPACTION_STRATEGY_PREFIX.getKey()) || key.startsWith(Property.TABLE_REPLICATION_TARGET.getKey())
 -        || key.startsWith(Property.TABLE_ARBITRARY_PROP_PREFIX.getKey());
 +        || key.startsWith(Property.TABLE_ARBITRARY_PROP_PREFIX.getKey()) || key.startsWith(TABLE_SAMPLER_OPTS.getKey());
    }
  
+   /**
+    * Properties we check the value of within the TabletServer request handling or maintenance
processing loops.
+    */
+   public static final EnumSet<Property> HOT_PATH_PROPERTIES = EnumSet.of(Property.TSERV_CLIENT_TIMEOUT,
Property.TSERV_TOTAL_MUTATION_QUEUE_MAX,
+       Property.TSERV_ARCHIVE_WALOGS, Property.GC_TRASH_IGNORE, Property.TSERV_MAJC_DELAY,
Property.TABLE_MINC_LOGS_MAX, Property.TSERV_MAJC_MAXCONCURRENT,
+       Property.REPLICATION_WORKER_THREADS, Property.TABLE_DURABILITY, Property.INSTANCE_ZK_TIMEOUT,
Property.TABLE_CLASSPATH);
+ 
    private static final EnumSet<Property> fixedProperties = EnumSet.of(Property.TSERV_CLIENTPORT,
Property.TSERV_NATIVEMAP_ENABLED,
        Property.TSERV_SCAN_MAX_OPENFILES, Property.MASTER_CLIENTPORT, Property.GC_PORT);
  

http://git-wip-us.apache.org/repos/asf/accumulo/blob/1bf8a636/server/base/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java
----------------------------------------------------------------------
diff --cc server/base/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java
index e4e73d2,2dacf61..49bf1f4
--- a/server/base/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java
@@@ -23,7 -23,7 +23,8 @@@ import java.nio.ByteBuffer
  import java.util.Collections;
  import java.util.List;
  import java.util.UUID;
 +import java.util.concurrent.TimeUnit;
+ import java.util.concurrent.atomic.AtomicReference;
  
  import org.apache.accumulo.core.Constants;
  import org.apache.accumulo.core.client.AccumuloException;
@@@ -76,9 -76,9 +76,9 @@@ public class HdfsZooInstance implement
      return cachedHdfsZooInstance;
    }
  
-   private static ZooCache zooCache;
+   private final ZooCache zooCache;
    private static String instanceId = null;
 -  private static final Logger log = Logger.getLogger(HdfsZooInstance.class);
 +  private static final Logger log = LoggerFactory.getLogger(HdfsZooInstance.class);
  
    @Override
    public String getRootTabletLocation() {


Mime
View raw message