Merge branch '1.8' ACCUMULO-4506 Closes #254
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6128f024 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6128f024 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6128f024 Branch: refs/heads/master Commit: 6128f024d44f75584de86e91bbba6833db4cdab4 Parents: ac460d0 c093b56 Author: Josh Elser <els...@apache.org> Authored: Wed May 3 17:18:06 2017 -0400 Committer: Josh Elser <els...@apache.org> Committed: Wed May 3 17:18:50 2017 -0400 ---------------------------------------------------------------------- .../core/client/impl/ReplicationClient.java | 10 ++++++---- .../org/apache/accumulo/core/conf/Property.java | 2 ++ .../org/apache/accumulo/core/rpc/ThriftUtil.java | 2 +- .../replication/AccumuloReplicaSystem.java | 19 ++++++++++++------- 4 files changed, 21 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/6128f024/core/src/main/java/org/apache/accumulo/core/conf/Property.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/6128f024/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java ---------------------------------------------------------------------- diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java index d930775,7000eb3..d110062 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java @@@ -276,9 -278,11 +278,11 @@@ public class AccumuloReplicaSystem impl final HostAndPort peerTserver = HostAndPort.fromString(peerTserverStr); + final long timeout = localConf.getTimeInMillis(Property.REPLICATION_RPC_TIMEOUT); + // We have a tserver on the remote -- send the data its way. Status finalStatus; - final long sizeLimit = conf.getMemoryInBytes(Property.REPLICATION_MAX_UNIT_SIZE); + final long sizeLimit = conf.getAsBytes(Property.REPLICATION_MAX_UNIT_SIZE); try { if (p.getName().endsWith(RFILE_SUFFIX)) { span = Trace.start("RFile replication");
