You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by kt...@apache.org on 2018/01/17 18:00:48 UTC
[accumulo] 01/01: Merge branch '1.7' into 1.8
This is an automated email from the ASF dual-hosted git repository.
kturner pushed a commit to branch 1.8
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit d73c53773a6beaea3f204704aec0ec54261baf51
Merge: c2a6f8f d99592c
Author: Keith Turner <kt...@apache.org>
AuthorDate: Wed Jan 17 12:41:47 2018 -0500
Merge branch '1.7' into 1.8
.../java/org/apache/accumulo/master/Master.java | 8 ++---
.../apache/accumulo/tserver/TabletMutations.java | 6 ++--
.../org/apache/accumulo/tserver/TabletServer.java | 34 ++++++++++++--------
.../org/apache/accumulo/tserver/log/DfsLogger.java | 8 ++---
.../accumulo/tserver/log/TabletServerLogger.java | 6 ++--
.../accumulo/tserver/tablet/CommitSession.java | 6 ++--
.../accumulo/tserver/tablet/TabletMemory.java | 2 +-
.../main/java/org/apache/accumulo/shell/Shell.java | 18 +++++------
.../start/classloader/vfs/ContextManager.java | 36 ++++++++--------------
9 files changed, 60 insertions(+), 64 deletions(-)
diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index fef942e,852c611..0f28601
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@@ -616,8 -580,11 +616,11 @@@ public class TabletServer extends Accum
if (ss != null) {
long t2 = System.currentTimeMillis();
- log.debug(String.format("ScanSess tid %s %s %,d entries in %.2f secs, nbTimes = [%s] ", TServerUtils.clientAddress.get(), ss.extent.getTableId(),
- ss.entriesReturned, (t2 - ss.startTime) / 1000.0, ss.nbTimes.toString()));
+ if (log.isDebugEnabled()) {
- log.debug(String.format("ScanSess tid %s %s %,d entries in %.2f secs, nbTimes = [%s] ", TServerUtils.clientAddress.get(), ss.extent.getTableId()
- .toString(), ss.entriesReturned, (t2 - ss.startTime) / 1000.0, ss.nbTimes.toString()));
++ log.debug(String.format("ScanSess tid %s %s %,d entries in %.2f secs, nbTimes = [%s] ", TServerUtils.clientAddress.get(), ss.extent.getTableId(),
++ ss.entriesReturned, (t2 - ss.startTime) / 1000.0, ss.nbTimes.toString()));
+ }
+
if (scanMetrics.isEnabled()) {
scanMetrics.add(TabletServerScanMetrics.SCAN, t2 - ss.startTime);
scanMetrics.add(TabletServerScanMetrics.RESULT_SIZE, ss.entriesReturned);
@@@ -2998,10 -3009,9 +3006,10 @@@
Durability durability = getMincEventDurability(tablet.getExtent());
totalMinorCompactions.incrementAndGet();
logger.minorCompactionFinished(tablet, newDatafile, walogSeq, durability);
+ markUnusedWALs();
}
- public void minorCompactionStarted(CommitSession tablet, int lastUpdateSequence, String newMapfileLocation) throws IOException {
+ public void minorCompactionStarted(CommitSession tablet, long lastUpdateSequence, String newMapfileLocation) throws IOException {
Durability durability = getMincEventDurability(tablet.getExtent());
logger.minorCompactionStarted(tablet, lastUpdateSequence, newMapfileLocation, durability);
}
--
To stop receiving notification emails like this one, please contact
"commits@accumulo.apache.org" <co...@accumulo.apache.org>.