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 e0478b44df Merge remote-tracking branch 'upstream/2.1' into 3.1
     add f8fb87291b Enable graceful shutdown of server processes (#5193)
     new 9fee5991fb 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:
 .../accumulo/core/lock/ServiceLockSupport.java     |   30 +-
 ....java => ServerProcessServiceThriftClient.java} |   37 +-
 .../core/rpc/clients/ThriftClientTypes.java        |    3 +
 .../core/util/threads/ThreadPoolNames.java         |    1 +
 core/src/main/scripts/generate-thrift.sh           |    2 +-
 core/src/main/spotbugs/exclude-filter.xml          |    1 +
 .../core/manager/thrift/ManagerClientService.java  | 1271 ++++++++++++++++++++
 .../core/process/thrift/ServerProcessService.java  |  619 ++++++++++
 core/src/main/thrift/manager.thrift                |    9 +
 .../process.thrift}                                |   14 +-
 .../MiniAccumuloClusterControl.java                |   64 +
 .../org/apache/accumulo/server/AbstractServer.java |   66 +-
 .../accumulo/server/manager/LiveTServerSet.java    |   22 +-
 .../accumulo/server/rpc/ThriftProcessorTypes.java  |   41 +-
 .../org/apache/accumulo/server/util/Admin.java     |   33 +
 .../server/zookeeper/DistributedWorkQueue.java     |   26 +-
 .../coordinator/CompactionCoordinator.java         |   73 +-
 .../org/apache/accumulo/compactor/Compactor.java   |  325 ++---
 .../apache/accumulo/gc/SimpleGarbageCollector.java |  221 ++--
 .../java/org/apache/accumulo/manager/Manager.java  |   38 +-
 .../manager/ManagerClientServiceHandler.java       |   12 +
 .../accumulo/manager/recovery/RecoveryManager.java |    4 +-
 .../apache/accumulo/monitor/EmbeddedWebServer.java |    2 +-
 .../java/org/apache/accumulo/monitor/Monitor.java  |   19 +-
 .../org/apache/accumulo/tserver/ScanServer.java    |   55 +-
 .../org/apache/accumulo/tserver/TabletServer.java  |  117 +-
 .../org/apache/accumulo/tserver/log/LogSorter.java |    6 +-
 .../apache/accumulo/tserver/ScanServerTest.java    |    8 +-
 .../accumulo/test/SelfStoppingScanServer.java      |    5 +-
 .../test/compaction/ExternalCompactionTServer.java |    3 +-
 .../compaction/ExternalDoNothingCompactor.java     |    6 +-
 .../TestCompactionCoordinatorForOfflineTable.java  |    3 +-
 .../accumulo/test/fate/FlakyFateManager.java       |    3 +-
 .../test/functional/GracefulShutdownIT.java        |  273 +++++
 .../test/functional/HalfDeadServerWatcherIT.java   |    4 +-
 35 files changed, 3009 insertions(+), 407 deletions(-)
 copy 
core/src/main/java/org/apache/accumulo/core/rpc/clients/{ManagerClient.java => 
ServerProcessServiceThriftClient.java} (60%)
 create mode 100644 
core/src/main/thrift-gen-java/org/apache/accumulo/core/process/thrift/ServerProcessService.java
 copy 
core/src/main/{java/org/apache/accumulo/core/fate/StackOverflowException.java 
=> thrift/process.thrift} (76%)
 create mode 100644 
test/src/main/java/org/apache/accumulo/test/functional/GracefulShutdownIT.java

Reply via email to