This is an automated email from the ASF dual-hosted git repository. dlmarion pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 3787f1b49d Pauses bulk imports into tablets w/ too many files (#5104) add 867d0eb6a6 Backport removal of problem reports to 3.1 (#5118) add be9fa22956 Moved getLock() to AbstractServer, added ServiceLock verification thread (#5145) add 96c4582794 Merge branch '2.1' into 3.1 new 5b9910f5d4 Merge branch '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: .../java/org/apache/accumulo/core/Constants.java | 2 - .../org/apache/accumulo/core/conf/Property.java | 5 + .../org/apache/accumulo/core/lock/ServiceLock.java | 23 ++ .../apache/accumulo/core/logging/TabletLogger.java | 13 + .../core/metadata/schema/MetadataSchema.java | 16 - .../org/apache/accumulo/server/AbstractServer.java | 70 ++++- .../accumulo/server/compaction/FileCompactor.java | 12 +- .../org/apache/accumulo/server/fs/FileManager.java | 15 +- .../accumulo/server/init/ZooKeeperInitializer.java | 2 - .../accumulo/server/problems/ProblemReport.java | 252 ---------------- .../server/problems/ProblemReportingIterator.java | 24 +- .../accumulo/server/problems/ProblemReports.java | 323 --------------------- .../accumulo/server/problems/ProblemType.java | 23 -- .../server/problems/ProblemReportTest.java | 205 ------------- .../problems/ProblemReportingIteratorTest.java | 2 +- .../org/apache/accumulo/compactor/Compactor.java | 4 + .../apache/accumulo/gc/SimpleGarbageCollector.java | 7 +- .../java/org/apache/accumulo/manager/Manager.java | 6 + .../accumulo/manager/tableOps/delete/CleanUp.java | 8 - .../accumulo/manager/upgrade/Upgrader11to12.java | 147 ++++++++++ .../manager/upgrade/Upgrader11to12Test.java | 2 + .../java/org/apache/accumulo/monitor/Monitor.java | 26 +- .../monitor/rest/problems/ProblemDetail.java | 42 --- .../rest/problems/ProblemDetailInformation.java | 69 ----- .../monitor/rest/problems/ProblemSummary.java | 42 --- .../rest/problems/ProblemSummaryInformation.java | 62 ---- .../monitor/rest/problems/ProblemsResource.java | 185 ------------ .../monitor/rest/status/StatusInformation.java | 6 +- .../monitor/rest/status/StatusResource.java | 3 +- .../accumulo/monitor/resources/js/functions.js | 40 +-- .../apache/accumulo/monitor/resources/js/navbar.js | 34 --- .../accumulo/monitor/resources/js/problems.js | 167 ----------- .../apache/accumulo/monitor/templates/navbar.ftl | 8 - .../apache/accumulo/monitor/templates/problems.ftl | 71 ----- .../apache/accumulo/tserver/AssignmentHandler.java | 19 +- .../org/apache/accumulo/tserver/TabletServer.java | 1 + .../accumulo/tserver/tablet/MinorCompactor.java | 15 - .../org/apache/accumulo/tserver/tablet/Tablet.java | 5 - .../test/functional/HalfDeadServerWatcherIT.java | 225 ++++++++++++++ .../apache/accumulo/test/lock/ServiceLockIT.java | 24 +- 40 files changed, 550 insertions(+), 1655 deletions(-) delete mode 100644 server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java delete mode 100644 server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java delete mode 100644 server/base/src/main/java/org/apache/accumulo/server/problems/ProblemType.java delete mode 100644 server/base/src/test/java/org/apache/accumulo/server/problems/ProblemReportTest.java delete mode 100644 server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemDetail.java delete mode 100644 server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemDetailInformation.java delete mode 100644 server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemSummary.java delete mode 100644 server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemSummaryInformation.java delete mode 100644 server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemsResource.java delete mode 100644 server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/problems.js delete mode 100644 server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/problems.ftl create mode 100644 test/src/main/java/org/apache/accumulo/test/functional/HalfDeadServerWatcherIT.java