Skip to content

Modified ExternalCompactionUtil.findCompactionCoordinator to use ZooCache #3813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dlmarion merged 2 commits into from
Oct 5, 2023
Merged

Modified ExternalCompactionUtil.findCompactionCoordinator to use ZooCache #3813

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea6f387
Modified ExternalCompactionUtil.findCompactionCoordinator to use ZooC…
dlmarion Oct 4, 2023
09d36d3
Adds UTF_8 arg to String constructor
dlmarion Oct 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions core/src/main/java/org/apache/accumulo/core/util/compaction/ExternalCompactionUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
*/
package org.apache.accumulo.core.util.compaction;

import static java.nio.charset.StandardCharsets.UTF_8;

import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
Expand All @@ -34,8 +36,8 @@
import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException;
import org.apache.accumulo.core.compaction.thrift.CompactorService;
import org.apache.accumulo.core.fate.zookeeper.ServiceLock;
import org.apache.accumulo.core.fate.zookeeper.ZooCache.ZcStat;
import org.apache.accumulo.core.fate.zookeeper.ZooReader;
import org.apache.accumulo.core.fate.zookeeper.ZooSession;
import org.apache.accumulo.core.metadata.schema.ExternalCompactionId;
import org.apache.accumulo.core.rpc.ThriftUtil;
import org.apache.accumulo.core.rpc.clients.ThriftClientTypes;
Expand Down Expand Up @@ -98,17 +100,12 @@ public static String getHostPortString(HostAndPort address) {
*/
public static Optional<HostAndPort> findCompactionCoordinator(ClientContext context) {
final String lockPath = context.getZooKeeperRoot() + Constants.ZCOORDINATOR_LOCK;
try {
var zk = ZooSession.getAnonymousSession(context.getZooKeepers(),
context.getZooKeepersSessionTimeOut());
byte[] address = ServiceLock.getLockData(zk, ServiceLock.path(lockPath));
if (null == address) {
return Optional.empty();
}
return Optional.of(HostAndPort.fromString(new String(address)));
} catch (KeeperException | InterruptedException e) {
throw new RuntimeException(e);
byte[] address =
ServiceLock.getLockData(context.getZooCache(), ServiceLock.path(lockPath), new ZcStat());
if (null == address) {
return Optional.empty();
}
return Optional.of(HostAndPort.fromString(new String(address, UTF_8)));
}

/**
Expand Down