Skip to content
Open
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
import org.apache.accumulo.core.manager.balancer.TServerStatusImpl;
import org.apache.accumulo.core.manager.balancer.TabletServerIdImpl;
import org.apache.accumulo.core.manager.state.tables.TableState;
import org.apache.accumulo.core.manager.thrift.FateService;
import org.apache.accumulo.core.manager.thrift.ManagerClientService;
import org.apache.accumulo.core.manager.thrift.ManagerGoalState;
import org.apache.accumulo.core.manager.thrift.ManagerMonitorInfo;
Expand Down Expand Up @@ -326,9 +327,6 @@ synchronized void setManagerState(final ManagerState newState) {

private Future<Void> upgradeMetadataFuture;

private FateServiceHandler fateServiceHandler;
private ManagerClientServiceHandler managerClientHandler;

private int assignedOrHosted(TableId tableId) {
int result = 0;
for (TabletGroupWatcher watcher : watchers) {
Expand Down Expand Up @@ -1239,17 +1237,16 @@ public void run() {
// ACCUMULO-4424 Put up the Thrift servers before getting the lock as a sign of process health
// when a hot-standby
//
// Start the Manager's Fate Service
fateServiceHandler = new FateServiceHandler(this);
managerClientHandler = new ManagerClientServiceHandler(this);
// Start the Manager's Client service
// Ensure that calls before the manager gets the lock fail
ManagerClientService.Iface haProxy =
HighlyAvailableServiceWrapper.service(managerClientHandler, this);
// Start the Manager's Fate Service. Ensure that calls before the manager gets the lock fail
FateService.Iface fateServiceHandler =
HighlyAvailableServiceWrapper.service(new FateServiceHandler(this), this);
// Start the Manager's Client service. Ensure that calls before the manager gets the lock fail
ManagerClientService.Iface managerClientHandler =
HighlyAvailableServiceWrapper.service(new ManagerClientServiceHandler(this), this);

ServerAddress sa;
var processor =
ThriftProcessorTypes.getManagerTProcessor(this, fateServiceHandler, haProxy, getContext());
var processor = ThriftProcessorTypes.getManagerTProcessor(this, fateServiceHandler,
managerClientHandler, getContext());

try {
@SuppressWarnings("deprecation")
Expand Down