dlmarion commented on code in PR #5439:
URL: https://github.com/apache/accumulo/pull/5439#discussion_r2063514356
##########
minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java:
##########
@@ -838,7 +838,7 @@ public synchronized void stop() throws IOException,
InterruptedException {
// and not wait for the old locks to be cleaned up.
try {
new ZooZap().zap(getServerContext().getSiteConfiguration(), "-manager",
- "-compaction-coordinators", "-tservers", "-compactors", "-sservers");
+ "-compaction-coordinators", "-tservers", "-compactors", "-sservers",
"--gc", "--monitor");
Review Comment:
mini does not start the monitor. Can leave as-is if it won't cause an error.
##########
server/base/src/main/java/org/apache/accumulo/server/util/ZooZap.java:
##########
@@ -123,34 +169,47 @@ public void zap(SiteConfiguration siteConf, String...
args) {
String managerLockPath = Constants.ZROOT + "/" + iid +
Constants.ZMANAGER_LOCK;
try {
- zapDirectory(zoo, managerLockPath, opts);
+ removeSingletonLock(zoo, managerLockPath, hostPortPredicate, opts);
+ } catch (KeeperException | InterruptedException e) {
+ log.error("Error deleting manager lock", e);
+ }
+ }
+
+ if (opts.zapGc) {
+ String gcLockPath = Constants.ZROOT + "/" + iid + Constants.ZGC_LOCK;
+ try {
+ removeSingletonLock(zoo, gcLockPath, hostPortPredicate, opts);
+ } catch (KeeperException | InterruptedException e) {
+ log.error("Error deleting manager lock", e);
+ }
+ }
+
+ if (opts.zapMonitor) {
+ String monitorLockPath = Constants.ZROOT + "/" + iid +
Constants.ZMONITOR_LOCK;
+ try {
+ removeSingletonLock(zoo, monitorLockPath, hostPortPredicate, opts);
} catch (KeeperException | InterruptedException e) {
- e.printStackTrace();
+ log.error("Error deleting manager lock", e);
Review Comment:
```suggestion
log.error("Error deleting monitor lock", e);
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@accumulo.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
