[accumulo] 01/01: Merge branch '2.0'
This is an automated email from the ASF dual-hosted git repository. mmiller pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git commit 4df66ae8642f67f081e46bd9d6295e79c2af040c Merge: 27194c0 d04109d Author: Mike Miller AuthorDate: Tue Sep 3 12:03:19 2019 -0400 Merge branch '2.0' .../main/java/org/apache/accumulo/master/TabletGroupWatcher.java | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-)
[accumulo] branch master updated (27194c0 -> 4df66ae)
This is an automated email from the ASF dual-hosted git repository. mmiller pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git. from 27194c0 Java Collections Improvements in DefaultLoadBalancer (#1319) add d077b46 Removed unused code in TabletGroupWatcher (#1341) add d04109d Merge branch '1.9' into 2.0 new 4df66ae 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: .../main/java/org/apache/accumulo/master/TabletGroupWatcher.java | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-)
[accumulo] 01/01: Merge branch '1.9' into 2.0
This is an automated email from the ASF dual-hosted git repository. mmiller pushed a commit to branch 2.0 in repository https://gitbox.apache.org/repos/asf/accumulo.git commit d04109d06a41a7ae190941380ee7afb36fa2b4ef Merge: 1c19584 d077b46 Author: Mike Miller AuthorDate: Tue Sep 3 11:52:56 2019 -0400 Merge branch '1.9' into 2.0 Conflicts resolved: server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java .../main/java/org/apache/accumulo/master/TabletGroupWatcher.java | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --cc server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java index db00210,6c98f72..b801e3b --- a/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java +++ b/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java @@@ -102,9 -103,9 +102,8 @@@ abstract class TabletGroupWatcher exten private static final int ASSINGMENT_BUFFER_MAX_LENGTH = 4096; private final Master master; - final TabletStateStore store; - final TabletGroupWatcher dependentWatcher; - + private final TabletStateStore store; + private final TabletGroupWatcher dependentWatcher; - final TableStats stats = new TableStats(); private SortedSet lastScanServers = ImmutableSortedSet.of();
[accumulo] branch 2.0 updated (1c19584 -> d04109d)
This is an automated email from the ASF dual-hosted git repository. mmiller pushed a change to branch 2.0 in repository https://gitbox.apache.org/repos/asf/accumulo.git. from 1c19584 Disable FileSystemMonitor checks by default (#1332) add d077b46 Removed unused code in TabletGroupWatcher (#1341) new d04109d Merge branch '1.9' into 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: .../main/java/org/apache/accumulo/master/TabletGroupWatcher.java | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-)
[accumulo] branch 1.9 updated: Removed unused code in TabletGroupWatcher (#1341)
This is an automated email from the ASF dual-hosted git repository.
mmiller 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 d077b46 Removed unused code in TabletGroupWatcher (#1341)
d077b46 is described below
commit d077b4632b664a673a15dd30b8ec7d1d2b93d49a
Author: Mike Miller
AuthorDate: Tue Sep 3 11:48:11 2019 -0400
Removed unused code in TabletGroupWatcher (#1341)
* Also make some local vars private
---
.../org/apache/accumulo/master/TabletGroupWatcher.java | 14 +++---
1 file changed, 3 insertions(+), 11 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 cc236d2..6c98f72 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
@@ -103,10 +103,8 @@ abstract class TabletGroupWatcher extends Daemon {
private static final int ASSINGMENT_BUFFER_MAX_LENGTH = 4096;
private final Master master;
- final TabletStateStore store;
- final TabletGroupWatcher dependentWatcher;
-
- private MasterState masterState;
+ private final TabletStateStore store;
+ private final TabletGroupWatcher dependentWatcher;
final TableStats stats = new TableStats();
private SortedSet lastScanServers = ImmutableSortedSet.of();
@@ -124,11 +122,6 @@ abstract class TabletGroupWatcher extends Daemon {
return stats.getLast();
}
- // returns the master state under which stats were collected
- MasterState statsState() {
-return masterState;
- }
-
TableCounts getStats(String tableId) {
return stats.getLast(tableId);
}
@@ -137,7 +130,7 @@ abstract class TabletGroupWatcher extends Daemon {
* True if the collection of live tservers specified in 'candidates' hasn't
changed since the last
* time an assignment scan was started.
*/
- public synchronized boolean isSameTserversAsLastScan(Set
candidates) {
+ synchronized boolean isSameTserversAsLastScan(Set
candidates) {
return candidates.equals(lastScanServers);
}
@@ -152,7 +145,6 @@ abstract class TabletGroupWatcher extends Daemon {
while (this.master.stillMaster()) {
// slow things down a little, otherwise we spam the logs when there are
many wake-up events
sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
- masterState = master.getMasterState();
int totalUnloaded = 0;
int unloaded = 0;
