Skip to content

Remove Custom...Server.java classes and replace with Thrift implementation #6454

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

Open
Amemeda wants to merge 18 commits into
base: main
Choose a base branch
from
Open

Remove Custom...Server.java classes and replace with Thrift implementation #6454

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
0bc22f4
Removing CustomThreadedSelectorServer.java
Amemeda Jun 30, 2026
709390e
Adding CustomThreadedSelectorServer.java back
Amemeda Jul 6, 2026
043854a
Removed CustomThreadedServerSelector.java, replaced implemantation wi…
Amemeda Jul 6, 2026
21d9771
Implementing more ThriftServerEventHandler()
Amemeda Jul 6, 2026
40ec503
1 more implementation of ThriftServerEventHandler()
Amemeda Jul 6, 2026
fd591fb
pr updates, not complete
Amemeda Jul 9, 2026
ab670d8
Deleting CustomNonBlockingServer.java
Amemeda Jul 9, 2026
8fb6937
Deleting ClientInfoProcessorFactory.java and its 1 implementation
Amemeda Jul 10, 2026
d58d25a
Override stop method for THsHaServer implementation
Amemeda Jul 27, 2026
d7ab008
Update CUSTOM_HS_HA server to HS_HA server
Amemeda Jul 28, 2026
353c9bc
Remove Custom from HsHaNestedIT
Amemeda Jul 28, 2026
a53c27d
Merge branch 'main' into cleanup
ctubbsii Aug 1, 2026
4e385e3
Add backwards compatability check for custom_hs_ha
Amemeda Aug 3, 2026
7aecf66
Merge remote-tracking branch 'origin/cleanup' into cleanup
Amemeda Aug 3, 2026
7184a41
Add comment and warning for deprecated CUSTOM_HS_HA server
Amemeda Aug 7, 2026
2b30754
Move logger to top of ThriftServerType.java
Amemeda Aug 7, 2026
146cb80
Format ThriftServerType.java
Amemeda Aug 12, 2026
3f78bab
Merge branch 'main' into cleanup
Amemeda Aug 21, 2026
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
179 changes: 0 additions & 179 deletions server/base/src/main/java/org/apache/accumulo/server/rpc/CustomNonBlockingServer.java
View file
Open in desktop

This file was deleted.

74 changes: 0 additions & 74 deletions server/base/src/main/java/org/apache/accumulo/server/rpc/CustomThreadedSelectorServer.java
View file
Open in desktop

This file was deleted.

28 changes: 22 additions & 6 deletions server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
import org.apache.thrift.TProcessor;
import org.apache.thrift.TProcessorFactory;
import org.apache.thrift.protocol.TProtocolFactory;
import org.apache.thrift.server.THsHaServer;
import org.apache.thrift.server.TThreadPoolServer;
import org.apache.thrift.server.TThreadedSelectorServer;
import org.apache.thrift.transport.TNonblockingServerSocket;
Expand Down Expand Up @@ -190,7 +191,10 @@ private static ServerAddress createThreadedSelectorServer(HostAndPort address,
address = HostAndPort.fromParts(address.getHost(), transport.getPort());
}

return new ServerAddress(new CustomThreadedSelectorServer(options), address);
final TThreadedSelectorServer server = new TThreadedSelectorServer(options);
server.setServerEventHandler(new ThriftServerEventHandler());

return new ServerAddress(server, address);
}

/**
Expand All @@ -207,7 +211,7 @@ private static ServerAddress createNonBlockingServer(HostAndPort address, TProce
.clientTimeout(0).maxFrameSize(Ints.saturatedCast(maxMessageSize));

final TNonblockingServerSocket transport = new TNonblockingServerSocket(args);
final CustomNonBlockingServer.Args options = new CustomNonBlockingServer.Args(transport);
THsHaServer.Args options = new THsHaServer.Args(transport);

options.protocolFactory(protocolFactory);
options.transportFactory(ThriftUtil.transportFactory(maxMessageSize));
Expand All @@ -225,7 +229,10 @@ private static ServerAddress createNonBlockingServer(HostAndPort address, TProce
address = HostAndPort.fromParts(address.getHost(), transport.getPort());
}

return new ServerAddress(new CustomNonBlockingServer(options), address);
final THsHaServer server = new THsHaServer(options);
Comment thread
Amemeda marked this conversation as resolved.
Outdated
server.setServerEventHandler(new ThriftServerEventHandler());

return new ServerAddress(server, address);
}

/**
Expand Down Expand Up @@ -295,6 +302,8 @@ private static ServerAddress createBlockingServer(HostAndPort address, TProcesso
log.info("Blocking Server bound on {}", address);
}

server.setServerEventHandler(new ThriftServerEventHandler());

return new ServerAddress(server, address);
Comment thread
Amemeda marked this conversation as resolved.

}
Expand All @@ -317,7 +326,11 @@ private static TThreadPoolServer createTThreadPoolServer(TServerTransport transp
if (service != null) {
options.executorService(service);
}
return new TThreadPoolServer(options);

final TThreadPoolServer server = new TThreadPoolServer(options);
server.setServerEventHandler(new ThriftServerEventHandler());

return server;
}

/**
Expand Down Expand Up @@ -395,9 +408,11 @@ private static ServerAddress createSslThreadPoolServer(HostAndPort address, TPro

ThreadPoolExecutor pool =
createSelfResizingThreadPool(numThreads, threadTimeOut, conf, timeBetweenThreadChecks);
TThreadPoolServer server = createTThreadPoolServer(transport, processor,
ThriftUtil.transportFactory(), protocolFactory, pool);
server.setServerEventHandler(new ThriftServerEventHandler());
Comment thread
Amemeda marked this conversation as resolved.

return new ServerAddress(createTThreadPoolServer(transport, processor,
ThriftUtil.transportFactory(), protocolFactory, pool), address);
return new ServerAddress(server, address);
}

private static ServerAddress createSaslThreadPoolServer(HostAndPort address, TProcessor processor,
Expand Down Expand Up @@ -495,6 +510,7 @@ private static ServerAddress createSaslThreadPoolServer(HostAndPort address, TPr
final TThreadPoolServer server =
createTThreadPoolServer(transport, processor, ugiTransportFactory, protocolFactory, pool);

server.setServerEventHandler(new ThriftServerEventHandler());
return new ServerAddress(server, address);
}

Expand Down
Loading