[accumulo] branch 1.9 updated: Fix #1338 Reduce verbose logging of merge operations in Master log
This is an automated email from the ASF dual-hosted git repository.
edcoleman pushed a commit to branch 1.9
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/1.9 by this push:
new 626a408 Fix #1338 Reduce verbose logging of merge operations in
Master log
626a408 is described below
commit 626a408141fab77cf53ff0419c7845142709d5bb
Author: EdColeman
AuthorDate: Fri Sep 6 14:57:43 2019 -0400
Fix #1338 Reduce verbose logging of merge operations in Master log
* reduce merge operations logging of extent info at debug level - issue
#1338.
* minor cleanup removed always true param
* address comments, clean-up of MergeStats to use substition.
* code cleanup and logging changes for discussion
* code cleanup and logging changes for discussion
- address review comments
- merge changes m.miller removing unused code in TableGroupWatcher
* Stop logging during merges
* address review comments
* clarify comment after clean-up removed empty else clause.
---
.../java/org/apache/accumulo/master/Master.java| 9 ++-
.../apache/accumulo/master/TabletGroupWatcher.java | 39 +-
.../apache/accumulo/master/state/MergeStats.java | 83 +++---
server/master/src/main/spotbugs/exclude-filter.xml | 5 ++
4 files changed, 74 insertions(+), 62 deletions(-)
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 4e8ef48..47e45b3 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
@@ -872,8 +872,11 @@ public class Master extends AccumuloServerContext
}
// Handle merge transitions
if (mergeInfo.getExtent() != null) {
-log.debug("mergeInfo overlaps: " + extent + " " +
mergeInfo.overlaps(extent));
-if (mergeInfo.overlaps(extent)) {
+
+final boolean overlaps = mergeInfo.overlaps(extent);
+
+if (overlaps) {
+ log.debug("mergeInfo overlaps: {} true", extent);
switch (mergeInfo.getState()) {
case NONE:
case COMPLETE:
@@ -895,6 +898,8 @@ public class Master extends AccumuloServerContext
case MERGING:
return TabletGoalState.UNASSIGNED;
}
+} else {
+ log.trace("mergeInfo overlaps: {} false", extent);
}
}
diff --git
a/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
b/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
index 6c98f72..4880ff4 100644
---
a/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
+++
b/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
@@ -100,7 +100,7 @@ import com.google.common.collect.Iterators;
abstract class TabletGroupWatcher extends Daemon {
// Constants used to make sure assignment logging isn't excessive in
quantity or size
private static final String ASSIGNMENT_BUFFER_SEPARATOR = ", ";
- private static final int ASSINGMENT_BUFFER_MAX_LENGTH = 4096;
+ private static final int ASSIGNMENT_BUFFER_MAX_LENGTH = 4096;
private final Master master;
private final TabletStateStore store;
@@ -194,7 +194,12 @@ abstract class TabletGroupWatcher extends Daemon {
if (tls == null) {
continue;
}
- Master.log.debug(store.name() + " location State: " + tls);
+
+ // this can get spammy during merges
+ if (currentMerges.isEmpty()) {
+Master.log.debug("{} location State: {}", store.name(), tls);
+ }
+
// ignore entries for tables that do not exist in zookeeper
if
(TableManager.getInstance().getTableState(tls.extent.getTableId()) == null)
continue;
@@ -288,9 +293,9 @@ abstract class TabletGroupWatcher extends Daemon {
// Old tablet server is back. Return this tablet to its
previous owner.
if (returnInstance != null) {
assignments.add(new Assignment(tls.extent,
returnInstance));
- } else {
-// leave suspended, don't ask for a new assignment.
}
+ // else - tablet server not back. Don't ask for a new
assignment right now.
+
} else {
// Treat as unassigned, ask for a new assignment.
unassigned.put(tls.extent, server);
@@ -301,7 +306,7 @@ abstract class TabletGroupWatcher extends Daemon {
TServerInstance dest = this.master.migrations.get(tls.extent);
if (dest != null) {
// if destination is still good, assign it
- if (destinations.keySet().contains(dest)) {
+ if
[accumulo] branch 2.0 updated (81027c0 -> 984cd0c)
This is an automated email from the ASF dual-hosted git repository. edcoleman pushed a change to branch 2.0 in repository https://gitbox.apache.org/repos/asf/accumulo.git. from 81027c0 Merge branch '1.9' into 2.0 add 626a408 Fix #1338 Reduce verbose logging of merge operations in Master log add eb5474b Merge branch '1.9' into 2.0 add 984cd0c merge 1.9 into 2.0 No new revisions were added by this update. Summary of changes: .../java/org/apache/accumulo/master/Master.java| 9 -- .../apache/accumulo/master/TabletGroupWatcher.java | 33 ++ .../apache/accumulo/master/state/MergeStats.java | 22 +++ server/master/src/main/spotbugs/exclude-filter.xml | 5 4 files changed, 38 insertions(+), 31 deletions(-)
[accumulo] 01/01: Merge branch '2.0'
This is an automated email from the ASF dual-hosted git repository. edcoleman pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git commit 021869502325285c09c262ff7bba12193885fb8f Merge: 01e780a 984cd0c Author: Ed Coleman AuthorDate: Fri Sep 6 16:00:22 2019 -0400 Merge branch '2.0' .../java/org/apache/accumulo/master/Master.java| 9 -- .../apache/accumulo/master/TabletGroupWatcher.java | 33 ++ .../apache/accumulo/master/state/MergeStats.java | 22 +++ server/master/src/main/spotbugs/exclude-filter.xml | 5 4 files changed, 38 insertions(+), 31 deletions(-)
[accumulo-proxy] branch master updated: Update travis and build tooling
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo-proxy.git
The following commit(s) were added to refs/heads/master by this push:
new 5feb6f4 Update travis and build tooling
5feb6f4 is described below
commit 5feb6f4087b9bfcfbe3245de064ff0a5444da5c7
Author: Christopher Tubbs
AuthorDate: Fri Sep 6 18:20:10 2019 -0400
Update travis and build tooling
---
.travis.yml | 6 +--
pom.xml | 77 ++--
src/main/spotbugs/exclude-filter.xml | 5 +++
3 files changed, 29 insertions(+), 59 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 49a24fa..75af0ad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,10 +22,10 @@ cache:
- $HOME/.m2
install: echo NOOP Skipping pre-fetch of Maven dependencies
jdk:
- - openjdk8
+ - openjdk11
before_script:
- unset _JAVA_OPTIONS
env:
- - BUILD_ARGS="clean verify javadoc:jar" # main build of unit tests and
javadoc
+ - BUILD_CMD="mvn clean verify javadoc:jar" # main build of unit tests and
javadoc
script:
- - mvn $BUILD_ARGS
+ - $BUILD_CMD -B
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
diff --git a/pom.xml b/pom.xml
index 0e52270..bc9c8e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,18 +85,19 @@
https://travis-ci.org/apache/accumulo-proxy
-2.0.0-SNAPSHOT
+2.0.0
contrib/Eclipse-Accumulo-Codestyle.xml
3.1.1
false
+8
1.8
1.8
1.7.26
source-release-tar
src/main/spotbugs/exclude-filter.xml
-3.1.7
+3.1.12
0.12.0
@@ -214,12 +215,12 @@
org.codehaus.mojo
versions-maven-plugin
- 2.5
+ 2.7
org.gaul
modernizer-maven-plugin
- 1.6.0
+ 1.8.0
${maven.compiler.target}
@@ -227,7 +228,7 @@
com.github.spotbugs
spotbugs-maven-plugin
- ${spotbugs.version}
+ ${spotbugs.version}.1
true
Max
@@ -246,12 +247,12 @@
org.apache.maven.plugins
maven-checkstyle-plugin
- 3.0.0
+ 3.1.0
com.github.ekryd.sortpom
sortpom-maven-plugin
- 2.8.0
+ 2.10.0
recommended_2008_06
false
@@ -266,7 +267,7 @@
com.github.koraktor
mavanagaiata
- 0.8.2
+ 0.9.4
true
@@ -289,6 +290,7 @@
org.apache.maven.plugins
maven-compiler-plugin
+ 3.8.1
true
true
@@ -304,6 +306,7 @@
org.apache.maven.plugins
maven-jar-plugin
+ 3.1.2
@@ -340,13 +343,6 @@
org.apache.maven.plugins
- maven-site-plugin
-
-true
-
-
-
- org.apache.maven.plugins
maven-surefire-plugin
${surefire.excludedGroups}
@@ -380,30 +376,6 @@
1.5.0
- org.apache.maven.plugins
- maven-enforcer-plugin
-
-
-
-[${maven.compiler.target},)
-
-
-
-
-
- org.codehaus.mojo
- animal-sniffer-enforcer-rule
- 1.17
-
-
-
-
-
- org.apache.felix
- maven-bundle-plugin
- 3.5.0
-
-
net.revelc.code
apilyzer-maven-plugin
1.2.0
@@ -411,7 +383,7 @@
net.revelc.code.formatter
formatter-maven-plugin
- 2.7.5
+ 2.10.0
${eclipseFormatterStyle}
${maven.compiler.source}
@@ -442,7 +414,7 @@
net.revelc.code
impsort-maven-plugin
- 1.2.0
+ 1.3.0
true
java.,javax.,org.,com.
@@ -495,27 +467,20 @@
maven-enforcer-plugin
-enforce-basic-rules
+
+enforce-maven-version
enforce
validate
-
-
-enforce-java-signatures
-
- enforce
-
-process-test-classes
-
-
-org.codehaus.mojo.signature
-java18
-1.0
-
-
+
+ [3.5.0,)
+
[accumulo-proxy] branch master updated (5feb6f4 -> bb1e646)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/accumulo-proxy.git. from 5feb6f4 Update travis and build tooling add bb1e646 Update build dependencies No new revisions were added by this update. Summary of changes: pom.xml | 25 ++--- 1 file changed, 10 insertions(+), 15 deletions(-)
[accumulo] branch master updated (01e780a -> 0218695)
This is an automated email from the ASF dual-hosted git repository. edcoleman pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git. from 01e780a Merge branch '2.0' add 626a408 Fix #1338 Reduce verbose logging of merge operations in Master log add eb5474b Merge branch '1.9' into 2.0 add 984cd0c merge 1.9 into 2.0 new 0218695 Merge branch '2.0' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../java/org/apache/accumulo/master/Master.java| 9 -- .../apache/accumulo/master/TabletGroupWatcher.java | 33 ++ .../apache/accumulo/master/state/MergeStats.java | 22 +++ server/master/src/main/spotbugs/exclude-filter.xml | 5 4 files changed, 38 insertions(+), 31 deletions(-)
[accumulo] branch 2.0 updated: avoid calling auto-close on Accumulo client (#1353)
This is an automated email from the ASF dual-hosted git repository.
edcoleman pushed a commit to branch 2.0
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/2.0 by this push:
new e37b2e8 avoid calling auto-close on Accumulo client (#1353)
e37b2e8 is described below
commit e37b2e82f1db4270a1a9d25aebc5da31eefe37d1
Author: EdColeman
AuthorDate: Fri Sep 6 20:23:33 2019 -0400
avoid calling auto-close on Accumulo client (#1353)
Restores previous behavior and now passes testing.
---
.../src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git
a/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
b/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
index ae6f0f4..d32832d 100644
---
a/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
+++
b/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
@@ -698,8 +698,9 @@ abstract class TabletGroupWatcher extends Daemon {
targetSystemTable = RootTable.NAME;
}
-try (AccumuloClient client = this.master.getContext();
-BatchWriter bw = client.createBatchWriter(targetSystemTable, new
BatchWriterConfig())) {
+AccumuloClient client = this.master.getContext();
+
+try (BatchWriter bw = client.createBatchWriter(targetSystemTable, new
BatchWriterConfig())) {
long fileCount = 0;
// Make file entries in highest tablet
Scanner scanner = client.createScanner(targetSystemTable,
Authorizations.EMPTY);
[accumulo] 01/01: Merge branch '2.0'
This is an automated email from the ASF dual-hosted git repository. edcoleman pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git commit a4c7dad07cc6961697bfe8f754e44f0b1f4abfbd Merge: 0218695 e37b2e8 Author: Ed Coleman AuthorDate: Fri Sep 6 20:41:18 2019 -0400 Merge branch '2.0' .../src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
[accumulo] branch master updated (0218695 -> a4c7dad)
This is an automated email from the ASF dual-hosted git repository. edcoleman pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git. from 0218695 Merge branch '2.0' add e37b2e8 avoid calling auto-close on Accumulo client (#1353) new a4c7dad Merge branch '2.0' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
