This is an automated email from the ASF dual-hosted git repository. dlmarion pushed a change to branch 3.1 in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 867d0eb6a6 Backport removal of problem reports to 3.1 (#5118) add be9fa22956 Moved getLock() to AbstractServer, added ServiceLock verification thread (#5145) new 96c4582794 Merge branch '2.1' into 3.1 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: .../org/apache/accumulo/core/conf/Property.java | 5 + .../org/apache/accumulo/core/lock/ServiceLock.java | 23 +++ .../org/apache/accumulo/server/AbstractServer.java | 70 ++++++- .../coordinator/CompactionCoordinator.java | 5 + .../org/apache/accumulo/compactor/Compactor.java | 6 + .../apache/accumulo/gc/SimpleGarbageCollector.java | 11 +- .../java/org/apache/accumulo/manager/Manager.java | 7 + .../java/org/apache/accumulo/monitor/Monitor.java | 5 + .../org/apache/accumulo/tserver/TabletServer.java | 4 +- .../test/functional/HalfDeadServerWatcherIT.java | 216 +++++++++++++++++++++ .../apache/accumulo/test/lock/ServiceLockIT.java | 24 ++- 11 files changed, 366 insertions(+), 10 deletions(-) create mode 100644 test/src/main/java/org/apache/accumulo/test/functional/HalfDeadServerWatcherIT.java