WFCORE-6894 Extract interfaces from SuspendController appropriate for its consumers #6117

pferraro · 2024-07-24T21:29:21Z

https://issues.redhat.com/browse/WFCORE-6894

Reimplemented SuspendController using CompletableFutures and concurrent data structures
SuspendableActivity interface replaces ServerActivity
- Adds context to suspend/resume methods
- New interface better facilitates non-blocking implementations (e.g. the ability to report exceptions from async operations) and provides more control over suspend process
Extracted SuspendableActivityRegistry interface from SuspendController
- Single purpose interface for use by subsystems needing to register suspendable activity
- Define suspend priority (f.k.a. "execution group") during registration (since this must not change between executions), replaces ServerActivity.getExecutionGroup()
Extracted ServerSuspendController interface from SuspendController for use by suspend/resume/shutdown operations
- New suspend/resume method signature removes the need for temporary OperationListener registration to determine suspend/resume completion/timeout.
Deprecated public methods of SuspendController not exposed by ServerSuspendController interface
Remove usage of deprecated SuspendController methods in wildfly-core

pferraro · 2024-08-01T12:54:47Z

Adding hold label while I experiment with ServerSuspendContoller API changes to better accommodate non-blocking server activity.

… SuspendController directly to operation handlers, rather than referencing via MSC.

…ntation. Reimplement SuspendController to better accommodate non-blocking server activity and simplify timeout behavior. Provide context to activity suspend/remove calls.

Replace GracefulShutdownService with static reference to CompletionStage of final suspend operation.

…create CompletionStage-based replacements.

…y purpose.

server/src/main/java/org/jboss/as/server/ServerService.java

yersan · 2024-09-06T08:50:09Z

server/src/main/java/org/jboss/as/server/ServerService.java

@@ -314,7 +313,6 @@ protected void boot(final BootContext context) throws ConfigurationPersistenceEx
                }
            }
            context.getServiceTarget().addService(SUSPEND_CONTROLLER_CAPABILITY.getCapabilityServiceName(), suspendController)
-                    .addDependency(JBOSS_SERVER_NOTIFICATION_REGISTRY, NotificationHandlerRegistry.class, suspendController.getNotificationHandlerRegistry())


Just in case anyone is also reviewing this. This effectively makes the SuspendController stop waiting for JBOSS_SERVER_NOTIFICATION_REGISTRY, but we are fine with it, since we think NotificationHandlerRegistry is an orphan relationship used in the past.

server/src/main/java/org/jboss/as/server/suspend/CountingRequestCountCallback.java

server/src/main/java/org/jboss/as/server/suspend/ServerActivity.java

server/src/main/java/org/jboss/as/server/suspend/ServerActivityCallback.java

server/src/main/java/org/jboss/as/server/suspend/SuspendController.java

request-controller/src/main/java/org/wildfly/extension/requestcontroller/RequestController.java

request-controller/src/main/java/org/wildfly/extension/requestcontroller/ControlPoint.java

server/src/main/java/org/jboss/as/server/suspend/SuspendController.java

yersan · 2024-09-10T14:52:18Z

server/src/main/java/org/jboss/as/server/logging/ServerLogger.java

+    default void suspendingServer(long timeout, TimeUnit unit) {
+        if (timeout > 0) {
+            ServerLogger.ROOT_LOGGER.suspendingServer(TimeUnit.MILLISECONDS.convert(timeout, unit));
+        } else if (timeout < 0) {
+            ServerLogger.ROOT_LOGGER.suspendingServerWithNoTimeout();
+        } else {
+            ServerLogger.ROOT_LOGGER.suspendingServer();
+        }
+    }


yersan · 2024-09-10T15:36:49Z

Thanks @pferraro

github-actions bot added the deps-ok Dependencies have been checked, and there are no significant changes label Jul 24, 2024

pferraro force-pushed the WFCORE-6894 branch 3 times, most recently from 3973ccb to 6c8f8cb Compare July 29, 2024 14:54

pferraro added the hold Do not merge this PR label Aug 1, 2024

pferraro added 3 commits August 1, 2024 17:16

Fix incorrect javadoc for ServerEnvironment.isStartGracefully().

b0aa167

Remove obsolete NotificationHandlerRegistry dependency.

1204606

WFCORE-6894 Drop deprecate MSC interface from SuspendController. Pass…

da0ab50

… SuspendController directly to operation handlers, rather than referencing via MSC.

pferraro force-pushed the WFCORE-6894 branch from 6c8f8cb to 214ce17 Compare August 2, 2024 20:42

pferraro removed the hold Do not merge this PR label Aug 2, 2024

pferraro force-pushed the WFCORE-6894 branch from 214ce17 to 6fff591 Compare August 2, 2024 22:19

This comment was marked as off-topic.

Sign in to view

pferraro force-pushed the WFCORE-6894 branch from 6fff591 to a66a79b Compare August 3, 2024 13:45

This comment was marked as off-topic.

Sign in to view

pferraro mentioned this pull request Aug 5, 2024

WFLY-19550 Distributed timer service implementation should not schedule timers while server is suspended. wildfly/wildfly#18098

Open

pferraro force-pushed the WFCORE-6894 branch from a66a79b to 99daef7 Compare August 5, 2024 21:42

This comment was marked as off-topic.

Sign in to view

pferraro requested review from bstansberry and yersan and removed request for bstansberry August 6, 2024 14:42

pferraro added 3 commits August 7, 2024 10:21

WFCORE-6894 Extract service interfaces from SuspendController impleme…

c650caa

…ntation. Reimplement SuspendController to better accommodate non-blocking server activity and simplify timeout behavior. Provide context to activity suspend/remove calls.

Replace use of deprecated SuspendController implementation methods.

545e09a

Replace GracefulShutdownService with static reference to CompletionStage of final suspend operation.

Deprecate RequestController methods using ServerActivityListener and …

3e196a3

…create CompletionStage-based replacements.

Deprecate OperationListener.timeout(), as this is no longer serves an…

21f7045

…y purpose.

pferraro force-pushed the WFCORE-6894 branch from 99daef7 to 21f7045 Compare August 7, 2024 14:23

yersan requested changes Sep 6, 2024

View reviewed changes

pferraro added 2 commits September 6, 2024 14:23

Add missing @deprecated(since=...) and misc javadoc fixes.

0b6faae

Restore log messages on suspend.

e9919cf

yersan approved these changes Sep 10, 2024

View reviewed changes

yersan added the ready-for-merge This PR is ready to be merged and fulfills all requirements label Sep 10, 2024

yersan merged commit 386233c into wildfly:main Sep 10, 2024
12 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

WFCORE-6894 Extract interfaces from SuspendController appropriate for its consumers #6117

WFCORE-6894 Extract interfaces from SuspendController appropriate for its consumers #6117

pferraro commented Jul 24, 2024 •

edited

Loading

pferraro commented Aug 1, 2024

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

yersan Sep 6, 2024

yersan Sep 10, 2024

yersan commented Sep 10, 2024

WFCORE-6894 Extract interfaces from SuspendController appropriate for its consumers #6117

WFCORE-6894 Extract interfaces from SuspendController appropriate for its consumers #6117

Conversation

pferraro commented Jul 24, 2024 • edited Loading

pferraro commented Aug 1, 2024

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

yersan Sep 6, 2024

Choose a reason for hiding this comment

yersan Sep 10, 2024

Choose a reason for hiding this comment

yersan commented Sep 10, 2024

pferraro commented Jul 24, 2024 •

edited

Loading